Changeset 6569

Timestamp:

08/29/05 22:59:00 (3 years ago)

Author:

iblech

Message:

* pugs::hack: Minor cosmetic fixes.
* t/var/refs_point_to_containers.t: Fixed a test (but it could be said that the

test was correct, I don't think that has been specced yet).

* t/rules/*: Fixed the skip_rest_unless_p5style_regexes_are_available_guards.
* PIL2JS: $/[0] etc. works!

• PIL: (Hack) Subs named /^{&PIL2JS::Internals::Hacks::init_foobar/ are run at INIT time.}
• Prelude::JS::Rules: $/ := $match, .[] for Match objects

* PIL2JS: PIL2JS.js: (HacK) All things which .isa(Num) are .isa(Int) .isa(Rat)

now, too.

Files:

• lib/pugs/hack.pod (modified) (2 diffs)
• perl5/PIL2JS/lib/PIL.pm (modified) (1 diff)
• perl5/PIL2JS/lib6/Prelude/JS/Operators.pm (modified) (1 diff)
• perl5/PIL2JS/lib6/Prelude/JS/Rules.pm (modified) (3 diffs)
• perl5/PIL2JS/libjs/PIL2JS.js (modified) (2 diffs)
• perl5/PIL2JS/pil2js.pl (modified) (1 diff)
• perl5/PIL2JS/runjs.pl (modified) (1 diff)
• t/rules/perl5.t (modified) (1 diff)
• t/rules/rules_refs.t (modified) (1 diff)
• t/rules/rx_perl5_escape.t (modified) (1 diff)
• t/rules/rx_perl5_g.t (modified) (1 diff)
• t/rules/rx_perl5_match.t (modified) (1 diff)
• t/rules/s_perl5.t (modified) (2 diffs)
• t/rules/variable_interpolation.t (modified) (1 diff)
• t/var/refs_point_to_containers.t (modified) (1 diff)

lib/pugs/hack.pod

@@ -260 +260 @@
 =back
 
-
 =head2 Editing
 
 There is a F<util/perl6.vim> Vim syntax file.  There is no emacs mode yet,
 but perl-mode works better than cperl-mode.
-
 
 =head2 Testing
@@ -294 +292 @@
 =over
 
-=item *
-
-L<http://www-users.cs.york.ac.uk/~ndm/hoogle/> A cross index of
-standard Haskell libraries. It is searchable by type signature, name,
-etc.
-
-=item *
-
-L<http://rt.openfoundry.org/Foundry/Project/Source/index.html/pugs/browse/>
-Browsable Pugs vcs.  You sometimes get a blank page the first time you
-access a URL (a timeout) - just click again.
-
-=item *
-
-L<http://svn.perl.org/perl6/pugs/trunk/> Mirror of Pugs vcs head.
-Usually faster and more reliable than the openfoundry browser.
+=item L<http://www-users.cs.york.ac.uk/~ndm/hoogle/>
+
+A cross index of standard Haskell libraries.  It is searchable by type
+signature, name, etc.
+
+=item L<http://rt.openfoundry.org/Foundry/Project/Source/index.html/pugs/browse/>
+
+Browsable Pugs VCS.  You sometimes get a blank page the first time you access a
+URL (a timeout) - just click again.
+
+=item L<http://svn.perl.org/perl6/pugs/trunk/>
+
+Mirror of Pugs VCS head.  Usually faster and more reliable than the OpenFoundry
+browser, but doesn't show diffs between revisions.
+
+=item L<http://m19s28.vlinux.de/cgi-bin/pugs-smokeserv.pl>
+
+Pugs Smoke Reports Server.  List of recently uploaded smoke reports sorted by
+the runcore used (normal Haskell backend, PIL2JS, PIL-Run, PIR, etc.), see
+F<util/smokeserv/README> for more information.
 
 =back

perl5/PIL2JS/lib/PIL.pm

@@ -223 +223 @@
     join("\n", map {
       my $name = $_->{pSubName};
-      $name =~ /^(?:__init_|__export_)/ && $name !~ /import$/
-        ? sprintf("PIL2JS.cps2normal(%s.FETCH(), [PIL2JS.Context.Void]);", PIL::name_mangle $name)
+      $name =~ /^(?:__init_|__export_|&PIL2JS::Internals::Hacks::init)/ && $name !~ /import$/
+        ? sprintf("PIL2JS.cps2normal(%s.FETCH(), [PIL2JS.Context.Void]);", PIL::name_mangle($name))
         : ();
     } @{ $fixed_tree->{"pilGlob" } })  .

perl5/PIL2JS/lib6/Prelude/JS/Operators.pm

@@ -51 +51 @@
   \}";
 
-  # XXX! HACK! See the end of Prelude::JS for explanation.
+  # XXX! minor hack. See the end of Prelude::JS for explanation.
   my $args  = $arity == 1  ?? '?$__a = $CALLER::_' :: '$__a, $__b';
   my $c     = $type eq "S" ?? "~"                  :: "+";

perl5/PIL2JS/lib6/Prelude/JS/Rules.pm

@@ -43 +43 @@
     if !@ret {
         my $m  = $new_match(?0);
-        #my $m = Match.new(0,"",[],undef,undef);
-        # $/ = $m;
+        $/    := $m;
     } elsif $global {
         # XXX - unfinished
@@ -52 +51 @@
         my @m_as_array = @ret;
         my $to = $from + $m_as_str.chars;
-        my $m  = $new_match(?1, $from, $to, $m_as_str, @m_as_array, []); # $/ = $m;
+        my $m  = $new_match(?1, $from, $to, $m_as_str, @m_as_array, []);
+        $/    := $m;
     }
   };
@@ -72 +72 @@
 }
 
+# Needs PIL2 and MMD to be done without hacks
+sub PIL2JS::Internals::Hacks::postcircumfix_for_match_objects (
+  Match $match, Int *@idxs
+) is primitive {
+  $match.subpos[*@idxs];
+}
+
+sub PIL2JS::Internals::Hacks::init_match_postcircumfix_method () is primitive {
+  JS::inline('(function () {
+    PIL2JS.addmethod(
+      _3amain_3a_3aMatch,
+      "postcircumfix:[]",
+      _26PIL2JS_3a_3aInternals_3a_3aHacks_3a_3apostcircumfix_for_match_objects
+    );
+  })')();
+}
+
 # $0 etc. are aliases for $/[0] etc.

perl5/PIL2JS/libjs/PIL2JS.js

@@ -672 +672 @@
 var _24main_3a_3a_3fPUGS_BACKEND = new PIL2JS.Box.Constant("BACKEND_JAVASCRIPT");
 var _24main_3a_3a_           = new PIL2JS.Box(undefined);
+// $/ -- XXX WRONG needs to be lexical
+var _24main_3a_3a_2f         = new PIL2JS.Box(undefined);
 // Stub for $?CALLER::CALLER::POSITION, so Test.pm doesn't die on a failed
 // test.
@@ -960 +962 @@
       type == cmptype                      ||
       type == "Array" && cmptype == "List" ||
+      // Hacks:
+      type == "Num"   && cmptype == "Int"  ||
+      type == "Num"   && cmptype == "Rat"  ||
       type == "Any"
     ));

perl5/PIL2JS/pil2js.pl

@@ -12 +12 @@
     require BSD::Resource;
     import BSD::Resource;
-    setrlimit(RLIMIT_CPU(), 35, 45) or die "Couldn't setrlimit: $!\n";
+    setrlimit(RLIMIT_CPU(), 43, 45) or die "Couldn't setrlimit: $!\n";
     warn "*** Limited CPU resources.\n";
   }

perl5/PIL2JS/runjs.pl

@@ -15 +15 @@
     require BSD::Resource;
     import BSD::Resource;
-    setrlimit(RLIMIT_CPU(), 35, 45) or die "Couldn't setrlimit: $!\n";
+    setrlimit(RLIMIT_CPU(), 43, 45) or die "Couldn't setrlimit: $!\n";
     warn "*** Limited CPU resources.\n";
   }

t/rules/perl5.t

@@ -6 +6 @@
 plan 882;
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/rules/rules_refs.t

@@ -12 +12 @@
 =cut
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/rules/rx_perl5_escape.t

@@ -6 +6 @@
 plan 1;
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/rules/rx_perl5_g.t

@@ -6 +6 @@
 plan 4;
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/rules/rx_perl5_match.t

@@ -21 +21 @@
 =cut
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/rules/s_perl5.t

@@ -14 +14 @@
 =cut
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;
@@ -22 +22 @@
 $foo ~~ s:perl5{f}{b}; 
 is($foo, "boo", 'substitute regexp works');
+unless $foo eq "boo" {
+  skip_rest "Skipping test which depend on a previous failed test";
+}
 
 my $bar = "barrrr"; 

t/rules/variable_interpolation.t

@@ -6 +6 @@
 plan 5;
 
-if(!eval('("a" ~~ rx:P5/a/)')) {
+unless "a" ~~ rx:P5/a/ {
   skip_rest "skipped tests - P5 regex support appears to be missing";
   exit;

t/var/refs_point_to_containers.t

@@ -51 +51 @@
 {
   my $arrayref = [1,2,3];
-  my $test  = sub (@array) {
+  my $test  = sub (@array is rw) {
     is @array[1], 2, "automatically dereffed arrays";