Changeset 21553 for misc

Timestamp:

07/26/08 21:48:48 (6 months ago)

Author:

putter

Message:

[elf_g] Import improvements from elfX. pmurias++

Location:

misc/elf

Files:

• elf_g (modified) (4 diffs)
• elf_g_src/EmitSimpleP5.pm (modified) (2 diffs)
• elf_g_src/IRx1_FromAST.pm (modified) (1 diff)
• elf_g_src/IRx1_FromAST_create.pl (modified) (2 diffs)
• elf_g_src/PrimitivesP5.pm (modified) (2 diffs)
• elf_g_src/run-tests.result (modified) (19 diffs)

misc/elf/elf_g

@@ -26 +26 @@
 use autobox ARRAY => 'ARRAY', HASH => 'HASH', CODE => 'CODE', INTEGER => 'INTEGER', FLOAT => 'FLOAT', STRING => 'STRING', UNDEF => 'UNDEF';  use encoding 'utf8';
       
-
-# Move to the Regexp prelude once that becomes part of the prelude.
-{ package BacktrackMacrosKludge;
-  sub _let_gen {
-    my($vars) = @_;
-    my $nvars = 1+($vars =~ tr/,//);
-    my $tmpvars = join(",",map{"\$__tmp${_}__"}(0..($nvars-1)));
-    push(@SCRATCH::_let_stack,[$vars,$tmpvars]);
-    "(do{my \$__v__ ; my($tmpvars); { local($vars)=($vars); \$__v__ = do{ ";
-  }
-  sub _let_end {
-    my $e = shift(@SCRATCH::_let_stack) || die "LET(){ }LET pairs didnt match up";
-    my($vars,$tmpvars) = @$e;
-    "}; if(!FAILED(\$__v__)){ ($tmpvars)=($vars); }}; if(!FAILED(\$__v__)){ ($vars)=($tmpvars) }; \$__v__ })"
-  }
-}
 
 # Workaround autobox 2.53 api change. :(
@@ -2026 +2010 @@
 $main::irbuilder->add_constructor("dotty\:methodop", sub {my($m)=@_;
 (do{IRx1::Call->newp($m, $::es_blackboard__expect_term_base, irbuild_ir($m->{"hash"}->{"ident"}), IRx1::Capture->newp($m, (irbuild_ir($m->{"hash"}->{"semilist"}) || [])))})});
+$main::irbuilder->add_constructor("dotty\:\.\^\!", sub {my($m)=@_;
+(do{IRx1::Call->newp($m, $::es_blackboard__expect_term_base, ("\^\!" . irbuild_ir($m->{"hash"}->{"methodop"}->{"hash"}->{"ident"})), IRx1::Capture->newp($m, (irbuild_ir($m->{"hash"}->{"methodop"}->{"hash"}->{"semilist"}) || [])))})});
 $main::irbuilder->add_constructor("dotty\:postcircumfix", sub {my($m)=@_;
 (do{my $s = ($m->match_string());
@@ -2723 +2709 @@
 " . $self->prelude_oo()) . $self->prelude_lexical()) . "\
 \
-\#\ Move\ to\ the\ Regexp\ prelude\ once\ that\ becomes\ part\ of\ the\ prelude\.\
-\{\ package\ BacktrackMacrosKludge\;\
-\ \ sub\ _let_gen\ \{\
-\ \ \ \ my\(\$vars\)\ \=\ \@_\;\
-\ \ \ \ my\ \$nvars\ \=\ 1\+\(\$vars\ \=\~\ tr\/\,\/\/\)\;\
-\ \ \ \ my\ \$tmpvars\ \=\ join\(\"\,\"\,map\{\"\\\$__tmp\$\{_\}__\"\}\(0\.\.\(\$nvars\-1\)\)\)\;\
-\ \ \ \ push\(\@SCRATCH\:\:_let_stack\,\[\$vars\,\$tmpvars\]\)\;\
-\ \ \ \ \"\(do\{my\ \\\$__v__\ \;\ my\(\$tmpvars\)\;\ \{\ local\(\$vars\)\=\(\$vars\)\;\ \\\$__v__\ \=\ do\{\ \"\;\
-\ \ \}\
-\ \ sub\ _let_end\ \{\
-\ \ \ \ my\ \$e\ \=\ shift\(\@SCRATCH\:\:_let_stack\)\ \|\|\ die\ \"LET\(\)\{\ \}LET\ pairs\ didnt\ match\ up\"\;\
-\ \ \ \ my\(\$vars\,\$tmpvars\)\ \=\ \@\$e\;\
-\ \ \ \ \"\}\;\ if\(\!FAILED\(\\\$__v__\)\)\{\ \(\$tmpvars\)\=\(\$vars\)\;\ \}\}\;\ if\(\!FAILED\(\\\$__v__\)\)\{\ \(\$vars\)\=\(\$tmpvars\)\ \}\;\ \\\$__v__\ \}\)\"\
-\ \ \}\
-\}\
-\
 \#\ Workaround\ autobox\ 2\.53\ api\ change\.\ \:\(\
 if\(\!defined\(\&autobox\:\:universal\:\:type\)\)\ \{\
@@ -3679 +3649 @@
 use base "Any";(do{sub perl{my $self=CORE::shift;(do{(("\{" . $self->keys()->map(sub {my($k)=@_;
 (do{(($k->perl() . "\ \=\>\ ") . $self->{$k}->perl())})})->join("\,\ ")) . "\}")})}})
+}
+;
+
+{ package UNDEF;
+use base "Any";(do{sub Str{my $self=CORE::shift;(do{""})}})
 }
 ;

misc/elf/elf_g_src/EmitSimpleP5.pm

@@ -59 +59 @@
 }
 '~self.prelude_oo~self.prelude_lexical~'
-
-# Move to the Regexp prelude once that becomes part of the prelude.
-{ package BacktrackMacrosKludge;
-  sub _let_gen {
-    my($vars) = @_;
-    my $nvars = 1+($vars =~ tr/,//);
-    my $tmpvars = join(",",map{"\$__tmp${_}__"}(0..($nvars-1)));
-    push(@SCRATCH::_let_stack,[$vars,$tmpvars]);
-    "(do{my \$__v__ ; my($tmpvars); { local($vars)=($vars); \$__v__ = do{ ";
-  }
-  sub _let_end {
-    my $e = shift(@SCRATCH::_let_stack) || die "LET(){ }LET pairs didnt match up";
-    my($vars,$tmpvars) = @$e;
-    "}; if(!FAILED(\$__v__)){ ($tmpvars)=($vars); }}; if(!FAILED(\$__v__)){ ($vars)=($tmpvars) }; \$__v__ })"
-  }
-}
 
 # Workaround autobox 2.53 api change. :(
@@ -927 +911 @@
   method cb__Buf ($n) {
     my $s = $n.buf;
-#    $s.re_sub_g('\\(.)','$1');
     '"' ~ quotemeta($s) ~ '"';
   };

misc/elf/elf_g_src/IRx1_FromAST.pm

@@ -138 +138 @@
     });
 
+    $main::irbuilder.add_constructor('dotty:.^!', sub ($m) {
+      IRx1::Call.newp($m,$+blackboard::expect_term_base,'^!'~irbuild_ir($m.{'hash'}{'methodop'}.{'hash'}{'ident'}),IRx1::Capture.newp($m,irbuild_ir($m.{'hash'}{'methodop'}.{'hash'}{'semilist'})||[]));
+    });
+
     $main::irbuilder.add_constructor('dotty:postcircumfix', sub ($m) {
       my $s = ($m.match_string);

misc/elf/elf_g_src/IRx1_FromAST_create.pl

@@ -76 +76 @@
 dotty:methodop
 Call.newp($+blackboard::expect_term_base,$m<ident>,Capture.newp($m<semilist>||[]))
+
+dotty:.^!
+Call.newp($+blackboard::expect_term_base,'^!'~$m<methodop><ident>,Capture.newp($m<methodop><semilist>||[])) # XXX ^! should be expanded.
 
 dotty:postcircumfix
@@ -629 +632 @@
   my %seen;
   for my $para (@paragraphs) {
-    $para =~ /^([\w:]+)\n(.*)/s or die "bug";
+    $para =~ /^(\w+(?::[\S]+)?)\n(.*)/s or die "bug\n$para";
     my($name,$body)=($1,$2);
     die "Saw an AST handler for '$name' twice!\n" if $seen{$name}++;

misc/elf/elf_g_src/PrimitivesP5.pm

@@ -37 +37 @@
 }
 
+class UNDEF {
+    method Str() { "" }
+}
+
 class Regexp { method Str () { ''~self } }
 
@@ -67 +71 @@
   multi prefix:<-> (Num $a) is p5 {'(0-$a)'}
 
-  multi prefix:<++> (Num $a) is p5 {'++ $a'}
-  multi prefix:<--> (Num $a) is p5 {'-- $a'}
+  multi prefix:<++> (Num $a is rw) is p5 {'++ $a'}
+  multi prefix:<--> (Num $a is rw) is p5 {'-- $a'}
 
 
-  multi postfix:<++> (Num $a) is p5 {'$a ++'}
-  multi postfix:<--> (Num $a) is p5 {'$a --'}
+  multi postfix:<++> (Num $a is rw) is p5 {'$a ++'}
+  multi postfix:<--> (Num $a is rw) is p5 {'$a --'}
   multi postfix:<i>  (Num $a) { $a } ;# Need to implement Complex.
 

misc/elf/elf_g_src/run-tests.result

@@ -1 @@
-pugs t/ svn revision: 21444
+pugs t/ svn revision: 21550
 -  80%  10  8 2         ../../../t/01-sanity/01-tap.t
 ok      4               ../../../t/01-sanity/02-counter.t
@@ -186 +186 @@
 X  0%   10  0           ../../../t/examples/golf.t
 X  0%   17  0           ../../../t/general/atoms.t
--C 0%   15  0 15        ../../../t/general/basic.t
 -C 0%   4  0 4          ../../../t/general/config.t
 -d 0%   4  0 4          ../../../t/junction/abc.t
@@ -220 +219 @@
 -  0%   2  0 2          ../../../t/oo/can.t
 -d 0%   5  0 5          ../../../t/oo/class/anonymous.t
--  0%   2  0 2          ../../../t/oo/class/declaration-order.t
 -  0%   1  0 1          ../../../t/oo/class_inclusion_with_inherited_class.t
 -  0%   1  0 1          ../../../t/oo/class_inheritance_become_infinite_loop.t
@@ -231 +229 @@
 -  33%  6  2 0 4!       ../../../t/oo/destruction.t
 X  0%   3  0            ../../../t/oo/global_destruction.t
-X  0%   32  0           ../../../t/oo/inheritance.t
 -d 0%   2  0 2          ../../../t/oo/instantiation.t
 -C 0%   17  0 17        ../../../t/oo/magical_vars.t
@@ -251 +248 @@
 -C 0%   18  0 18        ../../../t/oo/proxy.t
 -  7%   14  1 0 13!     ../../../t/oo/roles/anonymous.t
--C 0%   22  0 22        ../../../t/oo/roles/basic.t
 -C 0%   10  0 10        ../../../t/oo/roles/conflicts.t
 -  66%  3  2 1          ../../../t/oo/roles/instantiation.t
@@ -365 +361 @@
 -  0%   4  0 2 2!       ../../../t/regex/rx_perl5_g.t
 X  0%   2  0            ../../../t/regex/rx_perl5_match.t
--d 0%   1  0 1          ../../../t/regex/smartparse.t
 X  0%   7  0            ../../../t/regex/s_perl5.t
 X  0%   5  0            ../../../t/regex/variable_interpolation.t
@@ -392 +387 @@
 -C 0%   18  0 18        ../../../t/spec/S02-builtin_data_types/capture.t
 -d 0%   4  0 4          ../../../t/spec/S02-builtin_data_types/catch_type_cast_mismatch.t
+-C 0%   10  0 10        ../../../t/spec/S02-builtin_data_types/compact.t
 -C 0%   30  0 30        ../../../t/spec/S02-builtin_data_types/enum.t
 -d 0%   34  0 34        ../../../t/spec/S02-builtin_data_types/flattening.t
 -d 0%   32  0 32        ../../../t/spec/S02-builtin_data_types/hash_ref.t
-X  0%   58  0           ../../../t/spec/S02-builtin_data_types/hash.t
+-C 0%   58  0 58        ../../../t/spec/S02-builtin_data_types/hash.t
 -C 0%   8  0 8          ../../../t/spec/S02-builtin_data_types/infinity.t
 -C 0%   ?  0 ?          ../../../t/spec/S02-builtin_data_types/int-uint.t
@@ -406 +402 @@
 -C 0%   47  0 47        ../../../t/spec/S02-builtin_data_types/num.t
 X  0%   97  0           ../../../t/spec/S02-builtin_data_types/pair.t
-X  0%   87  0           ../../../t/spec/S02-builtin_data_types/range.t
+X  0%   79  0           ../../../t/spec/S02-builtin_data_types/range.t
 -  0%   8  0 2 6!       ../../../t/spec/S02-builtin_data_types/subscripts_and_context.t
 -  7%   13  1 2 10!     ../../../t/spec/S02-builtin_data_types/subtypes.t
@@ -431 +427 @@
 -C 0%   6  0 6          ../../../t/spec/S02-polymorphic_types/subset-range.t
 -d 0%   8  0 8          ../../../t/spec/S02-whitespace_and_comments/minimal-whitespace.t
+-d 0%   1  0 1          ../../../t/spec/S02-whitespace_and_comments/one-pass-parsing.t
 X  0%   52  0           ../../../t/spec/S02-whitespace_and_comments/unicode-whitespace.t
 X  0%   76  0           ../../../t/spec/S02-whitespace_and_comments/unspace.t
@@ -447 +444 @@
 -  31%  35  11 24       ../../../t/spec/S03-operators/numeric-context.t
 -C 0%   5  0 5          ../../../t/spec/S03-operators/p5arrow.t
--d 0%   51  0 51        ../../../t/spec/S03-operators/range.t
+-d 0%   72  0 72        ../../../t/spec/S03-operators/range.t
 X  0%   49  0           ../../../t/spec/S03-operators/reduce-le1arg.t
 X  0%   52  0           ../../../t/spec/S03-operators/reduce-metaop.t
@@ -475 +472 @@
 -C 0%   21  0 21        ../../../t/spec/S05-alternation/longest-alternative.t
 -C 0%   10  0 10        ../../../t/spec/S05-alternation/sequential.t
+ok      13              ../../../t/spec/S05-metasyntax/changed.t
+-C 0%   11  0 11        ../../../t/spec/S05-metasyntax/regex.t
+-  16%  6  1 5          ../../../t/spec/S05-metasyntax/unknown.t
 -C 0%   4  0 4          ../../../t/spec/S05-modifier/continue.t
 ok      10              ../../../t/spec/S05-modifier/ignoreaccent.t
@@ -492 +492 @@
 -C 0%   3  0 3          ../../../t/spec/S06-signature/positional-placeholders.t
 -C 0%   6  0 6          ../../../t/spec/S06-signature/slurpy-placeholders.t
+ok      3               ../../../t/spec/S06-traits/is-copy.t
+-C 0%   6  0 6          ../../../t/spec/S06-traits/is-rw.t
 -C 0%   38  0 38        ../../../t/spec/S09-autovivification/autovivification.t
 -C 0%   24  0 24        ../../../t/spec/S09-subscript_slice/slice.t
@@ -506 +508 @@
 X  0%   9  0            ../../../t/spec/S12-class/attributes.t
 -C 0%   21  0 21        ../../../t/spec/S12-class/basic.t
+-  50%  2  1 1          ../../../t/spec/S12-class/declaration-order.t
 ok      5               ../../../t/spec/S12-class/inheritance-class-methods.t
+-C 0%   32  0 32        ../../../t/spec/S12-class/inheritance.t
 X  0%   2  0            ../../../t/spec/S12-class/instantiate.t
 ok      4               ../../../t/spec/S12-class/is_also_instead.t
@@ -524 +528 @@
 X  0%   10  0           ../../../t/spec/S12-methods/what.t
 X  0%   4  0            ../../../t/spec/S12-role/attributes.t
+-C 0%   18  0 18        ../../../t/spec/S12-role/basic.t
 ok      8               ../../../t/spec/S12-role/composition.t
 -d 0%   11  0 11        ../../../t/spec/S12-role/mixin.t
@@ -562 +567 @@
 -d 0%   33  0 33        ../../../t/spec/S29-array/splice.t
 -  1%   53  1 0 52!     ../../../t/spec/S29-array/unshift.t
-X  0%   6  0            ../../../t/spec/S29-container/cat.t
-X  0%   8  0            ../../../t/spec/S29-container/roundrobin.t
+-d 0%   6  0 6          ../../../t/spec/S29-container/cat.t
+-d 0%   8  0 8          ../../../t/spec/S29-container/roundrobin.t
 -d 0%   9  0 9          ../../../t/spec/S29-container/zip.t
 -  40%  10  4 6         ../../../t/spec/S29-context/die_arg_preservation.t
@@ -612 +617 @@
 X  0%   ?  0            ../../../t/spec/S29-os/system-with-spaces.t
 -  52%  21  11 0 10!    ../../../t/spec/S29-scalar/defined.t
-X  0%   74  0           ../../../t/spec/S29-scalar/undef.t
+-C 0%   74  0 74        ../../../t/spec/S29-scalar/undef.t
 -C 0%   7  0 7          ../../../t/spec/S29-str/append.t
 -C 0%   11  0 11        ../../../t/spec/S29-str/capitalize.t
@@ -719 +724 @@
 -  80%  5  4 1          ../../../t/var/contextual.t
 -  0%   4  0 1 3!       ../../../t/var/default_scalar.t
-ok      3               ../../../t/var/is_copy.t
 -C 0%   9  0 9          ../../../t/var/is_readonly.t
-X  0%   6  0            ../../../t/var/is_rw.t
 -C 0%   15  0 15        ../../../t/var/lazy.t
 -  9%   11  1 4 6!      ../../../t/var/let.t
@@ -803 +806 @@
 -d 0%   1  0 1          ../../../v6/v6-KindaPerl6/t/kp6/41-attr-hash-keys.t
 -C 0%   1  0 1          ../../../v6/v6-KindaPerl6/t/kp6/42-single-rule-grammar.t
--d 0%   1  0 1          ../../../v6/v6-KindaPerl6/t/kp6/43-class-constructor-with-params.t
+-  0%   1  0 0 1!       ../../../v6/v6-KindaPerl6/t/kp6/43-class-constructor-with-params.t
 ok      4               ../../../v6/v6-KindaPerl6/t/kp6/44-map.t
 ok      4               ../../../v6/v6-KindaPerl6/t/kp6/45-for.t
@@ -850 +853 @@
 ok      1               ../../../v6/v6-KindaPerl6/t/kp6/math/02-inf.t
 
-Files: 849.  623 parsed 73%.  367 run 43%.  85 ok 10%.
-Tests: 16953+.  637 ok <3.75%, 16316+ not.
+Files: 852.  632 parsed 74%.  371 run 43%.  86 ok 10%.
+Tests: 16987+.  652 ok <3.83%, 16335+ not.