Merge branch 'master' of git@github.com:rakudo/rakudo

rakudo · Apr 29, 2010 · 6e91b9b · 6e91b9b
2 parents 9d927ac + c4857ab
commit 6e91b9b
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 26 deletions.
diff --git a/docs/ROADMAP b/docs/ROADMAP
@@ -35,7 +35,7 @@ Really important items
 1 ***   get the Advent examples running again (all)
 
 Ought to have items
-2 **    basic Buf implementation (A)
+2 **    basic Buf implementation (A, masak)
 2 **    speed issues and profiling (C, all)
 2 **    regex modifiers (B, pmichaud)
 2 ***   installation standards (A)

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1298,7 +1298,13 @@ token quote:sym<Q>     { 'Q'   <![(]> <.ws> <quote_EXPR> }
 token quote:sym<Q:PIR> { 'Q:PIR'      <.ws> <quote_EXPR> }
 token quote:sym</null/> { '/' \s* '/' <.panic: "Null regex not allowed"> }
 token quote:sym</ />  { '/'<p6regex=.LANG('Regex','nibbler')>'/' <.old_rx_mods>? }
-token quote:sym<rx>   { <sym> >> '/'<p6regex=.LANG('Regex','nibbler')>'/' <.old_rx_mods>? }
+token quote:sym<rx>   {
+    <sym> >> 
+    [
+    | '/'<p6regex=.LANG('Regex','nibbler')>'/' <.old_rx_mods>?
+    | '{'<p6regex=.LANG('Regex','nibbler')>'}' <.old_rx_mods>?
+    ]
+}
 token quote:sym<m> {
     <sym> >>
     [

diff --git a/src/builtins/assign.pir b/src/builtins/assign.pir
@@ -85,6 +85,12 @@ src/builtins/assign.pir - assignment operations
     $P0 = find_lex '$opname'
     $S0 = $P0
     $P0 = get_global $S0
+    $P1 = a.'defined'()
+    if $P1 goto defined
+    $P2 = $P0()
+    $P1 = $P0($P2, b)
+    .tailcall '&infix:<=>'(a, $P1)
+  defined:
     $P1 = $P0(a, b)
     .tailcall '&infix:<=>'(a, $P1)
 .end

diff --git a/src/core/Any-list.pm b/src/core/Any-list.pm
@@ -6,6 +6,10 @@ augment class Any {
         pir::join__SsP($separator, self.list.eager);
     }
 
+    multi method elems() {
+        1;
+    }
+
     our multi method map(&block) {
         Q:PIR {
             .local pmc self, block, map

diff --git a/src/core/Complex.pm b/src/core/Complex.pm
@@ -255,11 +255,11 @@ multi sub infix:<+>(Complex $a, Complex $b) {
     Complex.new($a.re + $b.re, $a.im + $b.im);
 }
 
-multi sub infix:<+>(Complex $a, $b) {
+multi sub infix:<+>(Complex $a, Real $b) {
    Complex.new($a.re + $b, $a.im);
 }
 
-multi sub infix:<+>($a, Complex $b) {
+multi sub infix:<+>(Real $a, Complex $b) {
     # Was $b + $a; but that trips a ng bug, and also means
     # that Num + Complex is slower than Complex + Num, which
     # seems daft.
@@ -274,23 +274,23 @@ multi sub infix:<->(Complex $a, Complex $b) {
     Complex.new($a.re - $b.re, $a.im - $b.im);
 }
 
-multi sub infix:<->(Complex $a, $b) {
+multi sub infix:<->(Complex $a, Real $b) {
    Complex.new($a.re - $b, $a.im);
 }
 
-multi sub infix:<->($a, Complex $b) {
+multi sub infix:<->(Real $a, Complex $b) {
     Complex.new($a - $b.re, -$b.im);
 }
 
 multi sub infix:<*>(Complex $a, Complex $b) {
     Complex.new($a.re * $b.re - $a.im * $b.im, $a.im * $b.re + $a.re * $b.im);
 }
 
-multi sub infix:<*>(Complex $a, $b) {
+multi sub infix:<*>(Complex $a, Real $b) {
    Complex.new($a.re * $b, $a.im * $b);
 }
 
-multi sub infix:<*>($a, Complex $b) {
+multi sub infix:<*>(Real $a, Complex $b) {
     Complex.new($a * $b.re, $a * $b.im);
 }
 
@@ -300,11 +300,11 @@ multi sub infix:</>(Complex $a, Complex $b) {
                 ($a.im * $b.re - $a.re * $b.im) / $d);
 }
 
-multi sub infix:</>(Complex $a, $b) {
+multi sub infix:</>(Complex $a, Real $b) {
     Complex.new($a.re / $b, $a.im / $b);
 }
 
-multi sub infix:</>($a, Complex $b) {
+multi sub infix:</>(Real $a, Complex $b) {
     Complex.new($a, 0) / $b;
 }
 
@@ -324,11 +324,11 @@ multi sub infix:<**>(Complex $a, Complex $b) {
    ($a.log * $b).exp;
 }
 
-multi sub infix:<**>(Complex $a, $b) {
+multi sub infix:<**>(Complex $a, Real $b) {
    ($a.log * $b).exp;
 }
 
-multi sub infix:<**>($a, Complex $b) {
+multi sub infix:<**>(Real $a, Complex $b) {
     ($a.log * $b).exp;
 }
 

diff --git a/src/core/Cool-str.pm b/src/core/Cool-str.pm
@@ -42,7 +42,12 @@ augment class Cool {
         my $c = 0;
         my $l = $limit ~~ ::Whatever ?? Inf !! $limit;
         gather while $l > 0 && (my $m = self.match($matcher, :c($c))) {
-            take $match ?? $m !! ~$m;
+            if $match {
+                my $m-clone = $m;
+                take $m-clone;
+            } else {
+                take ~$m;
+            }
             $c = $m.to == $c ?? $c + 1 !! $m.to;
             --$l;
         }
@@ -72,7 +77,8 @@ augment class Cool {
             gather {
                 while $l-- > 0 && (my $m = self.match($matcher, :c($c))) {
                     take self.substr($c, $m.from - $c);
-                    take $m if $all;
+                    my $m-clone = $m;
+                    take $m-clone if $all;
                     $c = $m.to == $c ?? $c + 1 !! $m.to;
                 }
                 take self.substr($c);

diff --git a/src/core/Real.pm b/src/core/Real.pm
@@ -10,12 +10,12 @@ role Real does Numeric {
     }
 
     # Hmmm... should the second argument be Numeric for the next two?
-    method exp(Real $exponent: Real $base = e) {
+    method exp(Real $exponent: Numeric $base = e) {
         $base ** $exponent;
     }
 
-    method log(Real $x: Real $base = e) {
-        $x.Bridge.log($base.Bridge);
+    method log(Real $x: Numeric $base = e) {
+        $x.Bridge.log($base);
     }
 
     method sign(Real $x:) {
@@ -98,6 +98,14 @@ multi sub infix:<->(Num $a, Num $b) {
     pir::sub__NNN($a, $b)
 }
 
+multi sub infix:<*>(Real $a, Real $b) {
+    $a.Bridge * $b.Bridge;
+}
+
+multi sub infix:<*>(Num $a, Num $b) {
+    pir::mul__NNN($a, $b)
+}
+
 multi sub infix:</>(Real $a, Real $b) {
     $a.Bridge / $b.Bridge;
 }

diff --git a/src/core/metaops.pm b/src/core/metaops.pm
@@ -179,7 +179,7 @@ our multi sub infix:<*>()  { 1 }
 our multi sub infix:<+&>() { +^0 }
 our multi sub infix:<+>()  { 0 }
 our multi sub infix:<->()  { 0 }
-#our multi sub infix:<~>()  { '' }
+our multi sub infix:<~>()  { '' }
 our multi sub infix:<+|>() { 0 }
 our multi sub infix:<+^>() { 0 }
 our multi sub infix:<~|>() { '' }
@@ -209,7 +209,7 @@ our multi sub infix:<eqv>()    { Bool::True }
 our multi sub infix:<||>()     { Bool::False }
 our multi sub infix:<or>()     { Bool::False }
 #our multi sub infix:<^^>()     { Bool::False }
-#our multi sub infix:<//>()     { Any }
+our multi sub infix:<//>()     { Any }
 #our multi sub infix:<min>()    { +Inf }
 #our multi sub infix:<max>()    { -Inf }
 #our multi sub infix:<=>()      { Nil }

diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -34,27 +34,27 @@ our multi sub prefix:<->($a) {
 }
 
 our multi sub infix:<+>($a, $b) {
-    pir::add__NNN($a, $b)
+    +$a + +$b;
 }
 
 our multi sub infix:<->($a, $b) {
-    pir::sub__NNN($a, $b)
+    +$a - +$b;
 }
 
 our multi sub infix:<*>($a, $b) {
-    pir::mul__NNN($a, $b)
+    +$a * +$b;
 }
 
 our multi sub infix:</>($a, $b) {
-    pir::div__NNN($a, $b)
+    +$a / +$b;
 }
 
 our multi sub infix:<%>($a, $b) {
     pir::mod__NNN($a, $b)
 }
 
 our multi sub infix:<**>($a, $b) {
-    pir::pow__NNN($a, $b)
+    (+$a) ** +$b; # parenthesis needed because of precendence.
 }
 
 our multi sub infix:<&>(*@items) {

diff --git a/tools/contributors.pl b/tools/contributors.pl
@@ -21,7 +21,7 @@
     while ($msg =~ /([^\s()]+)\+\+/g) {
         $contrib{nick_to_name($1)}++;
     }
-    while ($msg =~ /(couretsy by:?)\s*(\S.*)/i) {
+    while ($msg =~ /(courtesy by:?)\s*(\S.*)/i) {
         $contrib{nick_to_name($1)}++;
     }
 }
@@ -67,7 +67,7 @@ sub nick_to_name_from_CREDITS {
         }
     }
     close $f;
-    use Data::Dumper; print Dumper \%nicks;
+    use Data::Dumper; $Data::Dumper::Sortkeys = 1; print Dumper \%nicks;
     return \%nicks;
 }