Changeset 21540 for misc

Timestamp:

07/25/08 20:42:31 (6 months ago)

Author:

pmurias

Message:

[elfX] undo a accidently comitted not-working-out-of-the-box merge

Location:

misc/elfish/elfX

Files:

• EmitSimpleP5.pm (modified) (2 diffs)
• IRx1_FromAST.pm (modified) (2 diffs)
• IRx1_FromAST_create.pl (modified) (2 diffs)

misc/elfish/elfX/EmitSimpleP5.pm

@@ -619 +619 @@
     }).join(' ');
     'Class::Multimethods::multimethod '~$enc_name~
-    ' => split(/\s+/'~",'"~$sig~"') => "~ $f_emitted ~';';
+    " => split(/\s+/,'"~$sig~"') => "~ $f_emitted ~';';
   };
   method cb__MethodDecl ($n) {
@@ -906 +906 @@
   };
   method cb__Buf ($n) {
-    my $s = $n.buf;
-#    $s.re_sub_g('\\(.)','$1');
-    '"' ~ quotemeta($s) ~ '"';
+    '"' ~ quotemeta($n.buf) ~ '"';
   };
   method cb__Rx ($n) {

misc/elfish/elfX/IRx1_FromAST.pm

@@ -245 +245 @@
     $main::irbuilder.add_constructor('quote:q', sub ($m) {
       my $s = irbuild_ir($m.{'hash'}{'text'});
-$s.re_sub_g('\\\\([\\\\\'])','$1');
+$s.re_gsub(rx:P5/(?<!\\)\\\\/,"\\");
 IRx1::Buf.newp($m,$s);
     });
@@ -253 +253 @@
 $s.re_gsub(rx:P5/(?<!\\)\\n/,"\n");
 $s.re_gsub(rx:P5/(?<!\\)\\t/,"\t");
-$s.re_sub_g('\\\\(.)','$1');
+$s.re_gsub(rx:P5/(?<!\\)\\\\/,"\\");
 IRx1::Buf.newp($m,$s);
     });

misc/elfish/elfX/IRx1_FromAST_create.pl

@@ -170 +170 @@
 quote:q
 my $s = $m<text>;
-$s.re_sub_g('\\\\([\\\\\'])','$1');
+$s =~ s/(?<!\\)\\\\/\\/g;
 Buf.newp($s)
 
@@ -177 +177 @@
 $s =~ s/(?<!\\)\\n/\n/g;
 $s =~ s/(?<!\\)\\t/\t/g;
-$s.re_sub_g('\\\\(.)','$1');
+$s =~ s/(?<!\\)\\\\/\\/g;
 Buf.newp($s)