Perlito5 - js - 0+ overload

fglock · Oct 31, 2014 · 4b51a26 · 4b51a26
1 parent 5946b0f
commit 4b51a26
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/perlito5.pl b/perlito5.pl
diff --git a/src5/lib/Perlito5/Javascript2/Runtime.pm b/src5/lib/Perlito5/Javascript2/Runtime.pm
@@ -662,7 +662,12 @@ p5str = function(o) {
                 // test for overload
                 var meth = p5method_lookup('(""', o._class_._ref_, {});
                 if (meth) {
-                    return p5str(meth([o], 1));
+                    return p5str(meth([o], 0));
+                }
+                // TODO - test the "fallback" flag
+                meth = p5method_lookup('(0+', o._class_._ref_, {});
+                if (meth) {
+                    return p5str(meth([o], 0));
                 }
                 // no overload, strigify the reference instead
                 class_name = o._class_._ref_ + '=';
@@ -706,7 +711,12 @@ p5num = function(o) {
                 // test for overload
                 var meth = p5method_lookup('(0+', o._class_._ref_, {});
                 if (meth) {
-                    return p5num(meth([o], 1));
+                    return p5num(meth([o], 0));
+                }
+                // TODO - test the "fallback" flag
+                meth = p5method_lookup('(""', o._class_._ref_, {});
+                if (meth) {
+                    return p5num(meth([o], 0));
                 }
             }
         }

diff --git a/t5/01-perlito/510-string-overload.t b/t5/01-perlito/510-string-overload.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 use feature ("say");
 
-say "1..2";
+say "1..6";
 
 { package S;
     no strict 'refs';
@@ -22,3 +22,31 @@ $res = $v->$s;
 print "not " if $res ne "123";
 print "ok 2 - method call # $res\n";
 
+# TODO - test if fallback is enabled
+# $res = 0 + $v;
+# print "not " if $res ne "123";
+print "ok 3 - overload fallback # $res # TODO\n";
+
+
+{ package N;
+    no strict 'refs';
+    *{'N::(0+'} = sub { 123 };
+    *{'N::()'} = sub {};    # Make it findable via fetchmethod
+    *{'N::()'} = \"fallback";
+}
+
+$v = bless {}, "N";
+$res = 0 + $v;
+print "not " if $res != 123;
+print "ok 4 - overload # $res\n";
+
+$s = '(0+';
+$res = $v->$s;
+print "not " if $res != 123;
+print "ok 5 - method call # $res\n";
+
+$res = "$v";
+print "not " if $res ne "123";
+print "ok 6 - overload fallback # $res\n";
+
+