Changeset 5591

Timestamp:

07/14/05 15:24:51 (3 years ago)

Author:

iblech

svk:copy_cache_prev:

7591

Message:

examples/eval.p6:
* fail_s are catched now
* Switched to P5-regex, as PGE is currently borked.
* Made ^D/Z work and updated the banner message.

Files:

• examples/eval.p6 (modified) (5 diffs)

examples/eval.p6

@@ -3 +3 @@
 
 # Todo list:
-# - ^Z should exit.
 # - There must be a cleaner way of presenting .perl without a leading \.
 # - Need to implement :{e,E,d,D,h,r,l}.
@@ -12 +11 @@
 }
 
-say "^Z doesn't work, please use :q for now.";
+# We'd like to not pollute the eval's environment with our vars ($line, etc.).
+sub clean_eval ($___str) { eval $___str }
 
-my $EOF = chr(26);
+say "Welcome to Pugs -- $?PUGS_VERSION";
+say "Type :h for help.";
 
 loop (;;) {
@@ -21 +22 @@
     print "pugs> ";
     my $line = =$*IN;
-    chomp($line);
+
+    # Quit and EOF.
+    quit() unless defined $line;
+    $line .= chomp;
+    # Skip empty lines.
+    next   if $line eq "";
     
     given ($line) {
-        when ""         { } # XXX should simply move to the next iteration of the outer loop
-        when $EOF       { quit(); }
-        when /^\: (.) \s+/ {
+        when rx:P5/^\:(.)/ {
             given ($0) {
                 when "e" {
@@ -55 +59 @@
         }
         default {
-            my $ret = eval $_;
-            if ($!) {
-                say $!;
-            } else {
-                #say $ret.perl;
-                say $ret.perl.substr(1, $ret.perl.chars - 1); # XXX NASTY HACK
-            }
+            # We need to .perl the result right here to make prettyprinting of
+            # junctions work.
+            my $ret = clean_eval $line;
+            say chomp $! and next if $!;
+
+            # We've to .perl in a second pass (and in a try {...} block) to
+            # catch "fail_"s.
+            $ret    = try { $ret.perl };
+            say chomp $! and next if $!;
+            say substr($ret, 0, 1) eq "\\" ?? substr($ret, 1) :: $ret;   # XXX NASTY HACK
+            #" #--vim
         }
     }
@@ -76 +84 @@
 This simplistic program will keep reading from standard input and evaluating whatever is
 typed.
-
-=end