Changeset 22574

Timestamp:

10/11/08 04:53:26 (6 weeks ago)

Author:

putter

Message:

[elfish/rx_on_re] Update to elf_h. Dust README. Delete obsolete EmitRegexYare?.pm. Fixed a bogus classname.

Location:

misc/elfish/rx_on_re

Files:

• EmitRegexYare.pm (deleted)
• Makefile (modified) (1 diff)
• README (modified) (4 diffs)
• emit5.pm (modified) (3 diffs)
• nodes.pm (modified) (2 diffs)
• nodes_create.pl (modified) (1 diff)

misc/elfish/rx_on_re/Makefile

@@ -2 +2 @@
 check:
         export ELF_STD_RED_RUN=./../../STD_red/STD_red_run
-        ../../elf/elf_g test.pm > tst_1 2> tst_2
+        ../../elf/elf_h test.pm > tst_1 2> tst_2
         diff t_baseline.result tst_1
         @echo ok

misc/elfish/rx_on_re/README

@@ -14 +14 @@
 Milestones:
 
-() Dev environment and regression testing set up.
+(DONE) Dev environment and regression testing set up.
 () P6 version passes t/.
 () P6 version emitting P6 passes t/.
@@ -20 +20 @@
 PLAN
 
-() Makefile - a hyrid p6/p5 build; t/ regression test.
-() Node definitions in p6.
-() Migrate analysis methods to p6, one method at a time.
-() Migrate emitter methods to p6.
+Unclear.
+
+OLD PLAN
+
+(DONE) Makefile - a hyrid p6/p5 build; t/ regression test.
+(DONE) Node definitions in p6.
+(...) Migrate analysis methods to p6, one method at a time.
+(...) Migrate emitter methods to p6.
 () Setup for second translation phase.
 () Migrate emitted code from p5 to p6.
@@ -33 +37 @@
 () Implement ratchet.
 () Flesh out and improve.
-
-ISSUES
-
-() Not sure whether to migrate the p5 grammar or not.  STD.pm doesn't
-currently have one.
-
-
-NOTES
-
-/EmitRegexYare.pm is a leftover from a previous attempt in this direction.
-Bits of it may be of use.
-
 
 BASELINE
@@ -74 +66 @@
 
 Comments from EmitRegexYare.pm.
-# Backtracking api changes from a Filter::Simple to a s/// method.
-# Engine core becomes a prelude.
-# Emitters become p6, emitting p5 source.
-# IR analysis becomes p6.
 # The regexp and regex parsers are temporarily retained, as some of the action logic will need to end up in IRx1_FromAST or elsewhere.
 # And the unicode rules will need to be metaprogrammed in p6.

misc/elfish/rx_on_re/emit5.pm

@@ -14 +14 @@
     "}; if(!FAILED(\$__v__)){ ($tmpvars)=($vars); }}; if(!FAILED(\$__v__)){ ($vars)=($tmpvars) }; \$__v__ })"
   }
+  sub replace_LETs {
+    my($s)=@_;
+    $s =~ s/\bLET\(([^\)]+)\)\{/BacktrackMacrosKludge::_let_gen($1)/eg;
+    $s =~ s/\}LET;/BacktrackMacrosKludge::_let_end().";"/eg;
+    $s;
+  }
 }
 '};
@@ -21 +27 @@
 class EmitRegex {
 
+  method expand_LETs($s) is p5 {' BacktrackMacrosKludge::replace_LETs($s) '}
   method expand_backtrack_macros ($code) {
 
-    $code.re_sub('\bLET\(([^\)]+)\)\{','BacktrackMacrosKludge::_let_gen($1)','eg
-');
-    $code.re_sub('\}LET;','BacktrackMacrosKludge::_let_end().";"','eg');
-
-    $code.re_sub_g('\bFAIL_IF_FAILED\(([^\)]+)\);','return($1) if FAILED($1);');
-    $code.re_sub_g('\bFAIL\(\)','return(undef)');
-    $code.re_sub_g('\bFAILED\(([^\)]+)\)','(!defined($1)||(!ref($1)&&($1<=0)))')
+    $code = $.expand_LETs($code);
+    $code.re_sub('\bFAIL_IF_FAILED\(([^\)]+)\);','return($1) if FAILED($1);','g');
+    $code.re_sub('\bFAIL\(\)','return(undef)','g');
+    $code.re_sub('\bFAILED\(([^\)]+)\)','(!defined($1)||(!ref($1)&&($1<=0)))','g')
 ;
 
-    $code.re_sub_g('\bFAIL_SEQUENCE\(\)','die("fail sequence\\\\n")');
-    $code.re_sub_g('\bFAIL_GROUP\(\)','die("fail group\\\\n")');
-    $code.re_sub_g('\bFAIL_REGEX\(\)','die("fail regex\\\\n")');
-    $code.re_sub_g('\bFAIL_MATCH\(\)','die("fail match\\\\n")');
-
-    $code.re_sub_g('\bTAILCALL\(([^,\)]+),?([^\)]*)\);','\@_=($2);goto \&$1;');
+    $code.re_sub('\bFAIL_SEQUENCE\(\)','die("fail sequence\\\\n")','g');
+    $code.re_sub('\bFAIL_GROUP\(\)','die("fail group\\\\n")','g');
+    $code.re_sub('\bFAIL_REGEX\(\)','die("fail regex\\\\n")','g');
+    $code.re_sub('\bFAIL_MATCH\(\)','die("fail match\\\\n")','g');
+
+    $code.re_sub('\bTAILCALL\(([^,\)]+),?([^\)]*)\);','\@_=($2);goto \&$1;','g');
 
     #print $code;
@@ -1149 +1153 @@
     method RMARE_emit () {
       my $re = self.<text>;
-      $re.re_sub_g('([^\w\s])','\\\\$1');
+      $re.re_sub('([^\w\s])','\\\\$1','g');
       $re = $.RMARE_wrap_re_with_mods($re);
       $.RMARE_eat_regexp($re);

misc/elfish/rx_on_re/nodes.pm

@@ -32 +32 @@
 
   }
-  class Mod_expr is Mod_Base {
+  class Mod_expr is MixinMod {
     has $.match;
     has $.mods;
@@ -48 +48 @@
 
   }
-  class Mod_inline is Mod_Base {
+  class Mod_inline is MixinMod {
     has $.match;
     has $.mods;

misc/elfish/rx_on_re/nodes_create.pl

@@ -100 +100 @@
     
     my $base = 'BaseClass';
-    $base = "${1}_Base" if $name =~ /([^_]+)_/;
+    $base = "Mixin${1}" if $name =~ /([^_]+)_/;
     my $has = join("",map{"has \$.$_;\n        "} @all,'notes');
     my $params = join(',',map{"\$$_"}@all);