Changeset 22589 for misc

Timestamp:

10/12/08 18:11:36 (3 months ago)

Author:

putter

Message:

[elfish/STD_blue] Update for elf_h.
[elf_h] eval_perl5 restored for rx_on_re (commit forgotten recently).

Location:

misc

Files:

• elf/elf_h (modified) (2 diffs)
• elf/elf_h_src/EmitSimpleP5.pm (modified) (1 diff)
• elfish/STD_blue/Elfx.pm (deleted)
• elfish/STD_blue/IRx1_FromAST2_create.pl (modified) (5 diffs)
• elfish/STD_blue/Makefile (modified) (1 diff)
• elfish/STD_blue/STD_blue_run (modified) (1 diff)

misc/elf/elf_h

@@ -288 +288 @@
       $res
     }
+  }
+  sub eval_perl5{
+    my($p5,$env)=@_;
+    eval_runtime_code($p5,$env);
   }
   sub die{croak @_}
@@ -3228 +3232 @@
 \ \ \ \ \}\
 \ \ \}\
+\ \ sub\ eval_perl5\{\
+\ \ \ \ my\(\$p5\,\$env\)\=\@_\;\
+\ \ \ \ eval_runtime_code\(\$p5\,\$env\)\;\
+\ \ \}\
 \ \ sub\ die\{croak\ \@_\}\
 \ \ sub\ exit\{CORE\:\:exit\(\@_\)\}\

misc/elf/elf_h_src/EmitSimpleP5.pm

@@ -321 +321 @@
       $res
     }
+  }
+  sub eval_perl5{
+    my($p5,$env)=@_;
+    eval_runtime_code($p5,$env);
   }
   sub die{croak @_}

misc/elfish/STD_blue/IRx1_FromAST2_create.pl

@@ -69 +69 @@
     my $rule = $m.rule;
     my $constructor = $.constructors{$rule};
-    if ($constructor) {
+    if $constructor {
       $constructor.($m);
     } else {
-      die "Unknown rule: "~$rule~"\nIt needs to be added to ast_handlers.\n";
+      my $g = $rule.re_groups('\A([^:]+):');
+      if $g { $constructor = $.constructors{$g[0]} }
+      if $constructor {
+        $constructor.($m);
+      } else {
+        die "Unknown rule: "~$rule~"\nIt needs to be added to ast_handlers.\n";
+      }
     }
   };
@@ -106 +112 @@
   }
 };
-
-
-if not($*ast2ir_0) { $*ast2ir_0 = IRx1_Build2.new.init; }
-$*ast2ir_1 = IRx1_Build2.new.init;
 
 END_CODE
@@ -132 +134 @@
       };
 
-      method init {
-
-  END
+  END
+  my $init = "";
 
   my %seen;
@@ -142 +143 @@
     die "Saw an AST handler for '$name' twice!\n" if $seen{$name}++;
 
-    $body =~ s{\s*=~\s*s/((?:[^\\\/]|\\.)*)/((?:[^\\\/]|\\.)*)/g;}{.re_gsub(rx:P5/$1/,"$2");}g;
-
     $body =~ s/\bir\(/irbuild_ir\(/g;
     $body =~ s/(\$m(?:<\w+>)+)/irbuild_ir($1)/g;
     $body =~ s/\$o((?:<\w+>)+)/\$m$1/g;
-    $body =~ s/<(\w+)>/.{'hash'}{'$1'}/g;
+    $body =~ s/<(\w+)>/.hash{'$1'}/g;
     $body =~ s/([A-Z]\w+\.new\w*)\(/IRx1::$1(\$m,/g;
     $body =~ s/\*text\*/(\$m.match_string)/g;
@@ -154 +153 @@
       $body = unindent(<<'      END',"  ").$body;
         my $key;
-        for $m.{'hash'}.keys {
+        for $m.hash.keys {
           if $_ ne 'match' {
             if $key {
-              die("Unexpectedly more than 1 field in NAME - dont know which to choose\n")
+              die("Unexpectedly more than 1 field - dont know which to choose\n")
             }
             $key = $_;
           }
         }
-        my $one = irbuild_ir($m.{'hash'}{$key});
+        my $one = irbuild_ir($m.hash{$key});
       END
-        $body =~ s/NAME/$name/;
     }
 
+    my $fname = $name;
+    $fname =~ s/(\W)/"_".ord($1)/eg;
     $code .= "\n".unindent(<<"    END","    ");
-      \$.add_constructor('$name', sub (\$m) {
+      my \$construct_$fname = sub (\$m) {
         $body;
-      });
+      };
     END
+    $init .= "".unindent(<<"    END","    ");
+      \$.add_constructor('$name', \$construct_$fname);
+    END
 
   }
   $code .= unindent(<<"  END");
+    method init {
+
+  END
+  $code .= unindent(<<"  END");
+      $init
       self;
     }; # end init
-  }
+  };
+
+  END
+  $code .= unindent(<<'  END');
+
+  if not($*ast2ir_0) { $*ast2ir_0 = IRx1_Build.new.init; }
+  $*ast2ir_1 = IRx1_Build.new.init;
+
   END
   open(F,">$file") or die $!; print F $code; close F;

misc/elfish/STD_blue/Makefile

@@ -1 +1 @@
 
 elfx::
-        ELF_STD_RED_RUN=../../STD_red/STD_red_run ../../elf/elf_g -x -o ./elfx -I ../../elf/elf_g_src Elfx.pm
+        ../../elf/elf_h -x -o ./elfx -I ../../elf/elf_h_src -e 'use Elf_wo_main' IRx1_FromAST2.pm Parser2.pm -e elf_main

misc/elfish/STD_blue/STD_blue_run

@@ -144 +144 @@
   sub to_dump0 {
     my($o)=@_;
+    local $seen{$o} = $seen{$o};
     if($seen{$o}++ > $max_repetition) { return "LOOP:$o"->to_dump0 }
     my $f = $o->{_from};