Changeset 24135

Timestamp:

12/02/08 02:19:53 (5 weeks ago)

Author:

putter

Message:

[elfish/rx_on_re] Setting up to run rx_on_re/t/ through STD_blue. It doesn't yet run, as elfblue can't yet compile the rx_on_re source files (unlike elf_h).
[elfish/STD_blue] elfblue now uses STD_blue for eval(), and is still compiled in a single fast (STD_red-based) step.

Location:

misc/elfish

Files:

• STD_blue/Makefile (modified) (1 diff)
• rx_on_re/Makefile (modified) (1 diff)
• rx_on_re/test.pm (modified) (1 diff)

misc/elfish/STD_blue/Makefile

@@ -2 +2 @@
 ELF=../../elf/elf_h
 ELFDIR=../../elf/elf_h_src
-ELFBLUECOMP0=-I ../../elf/elf_h_src -e 'use Elf_wo_main' IRx1_FromAST2.pm Parser2.pm -e elf_main
-ELFBLUECOMP=-I . ${ELFBLUECOMP0}
+ELFBLUEDEV=-I ../../elf/elf_h_src -e 'use Elf_wo_main' IRx1_FromAST2.pm -e '$$*ast2ir_0=$$*ast2ir_1; $$*parser0=undef' Parser2.pm -e elf_main
+ELFBLUECOMP=-I . -I ../../elf/elf_h_src -e 'use Elf_wo_main' IRx1_FromAST2.pm Parser2.pm -e elf_main
 TMP=deleteme
 
 elfblue:: have_parser_cache
         ./IRx1_FromAST2_create.pl
-        ../../elf/elf_h -x -o ./elfblue ${ELFBLUECOMP0}
+        ../../elf/elf_h -x -o ./elfblue ${ELFBLUEDEV}
 
 does_gimme5_memory_problem_still_exist:

misc/elfish/rx_on_re/Makefile

@@ -1 +1 @@
 
 check:
-        export ELF_STD_RED_RUN=./../../STD_red/STD_red_run
         ../../elf/elf_h test.pm > tst_1 2> tst_2
         diff t_baseline.result tst_1
         @echo ok
+
+check_blue:
+        ELF_STD_BLUE_RUN=../STD_blue/STD_blue_run ../STD_blue/elfblue test.pm --test-blue > tst_1 2> tst_2
+        diff t_baseline.result tst_1
+
 
 old_create_baseline:

misc/elfish/rx_on_re/test.pm

@@ -19 +19 @@
     }
 
+   my $test_target = &Regexp::ModuleA::test_target;
+   my $test_target6 = &Regexp::ModuleA::test_target6;
+
+   if($ARGV[-1] eq "--test-blue") {
+     shift;
+     my $env = undef; #{package main; sub{my$s=eval($_[0]);Carp::carp($@)if$@;$s}};
+     $test_target =
+       sub {
+         my($mods,$re)=@_;
+         my $code = "m:P5/(?$mods)$re/";
+         print STDERR $code,"\n";
+         my $o = GLOBAL::eval($code,$env);
+         sub{my($s)=@_;$o->match($s)}
+       };
+     $test_target6 =
+       sub {
+         my($mods,$re)=@_;
+         my $code = "m/$mods"."::$re/";
+         print STDERR $code,"\n";
+         my $o = GLOBAL::eval($code,$env);
+         sub{my($s)=@_;$o->match($s)}
+       };
+   }
+
    print "re_tests\n\n";
    require "./t/re_tests.pl";
-   Pkg_re_tests::test(&Regexp::ModuleA::test_target);
+   Pkg_re_tests::test($test_target);
 
    print "\n\n";
    print "rx_tests\n\n";
    require "./t/rx.pl";
-   Pkg_re_tests::test6(&Regexp::ModuleA::test_target6);
+   Pkg_re_tests::test6($test_target6);
 '}
 test();