closes #149; quit overloading +

gkz · Jul 12, 2012 · ff9f887 · ff9f887
1 parent bc95d4c
commit ff9f887
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 43 deletions.
diff --git a/lib/ast.js b/lib/ast.js
@@ -1483,15 +1483,6 @@ exports.Binary = Binary = (function(superclass){
     switch (op) {
     case 'of':
       return new Of(first, second);
-    case '+':
-      if (first instanceof Arr) {
-        first.items.push(Splat(second));
-        return first;
-      }
-      if (second instanceof Arr || second instanceof While && (second = Arr([Splat(second)]))) {
-        second.items.unshift(Splat(first));
-        return second;
-      }
     }
     __this.op = op;
     __this.first = first;
@@ -1744,7 +1735,6 @@ exports.Assign = Assign = (function(superclass){
     switch (this.op) {
     case '=':
     case ':=':
-    case '+=':
       return this.right.isArray();
     case '/=':
       return this.right.isMatcher();
@@ -1806,7 +1796,7 @@ exports.Assign = Assign = (function(superclass){
     if (op === '<?=' || op === '>?=') {
       return this.compileMinMax(o, left, right);
     }
-    if (op === '**=' || op === '+=' && (right instanceof Arr || right instanceof While) || op === '*=' && right.isString() || (op === '-=' || op === '/=') && right.isMatcher()) {
+    if (op === '**=' || op === '*=' && right.isString() || (op === '-=' || op === '/=') && right.isMatcher()) {
       __ref = Chain(left).cacheReference(o), left = __ref[0], reft = __ref[1];
       right = Binary(op.slice(0, -1), reft, right);
       op = ':=';

diff --git a/src/ast.co b/src/ast.co
@@ -263,7 +263,7 @@ class exports.Block extends Node
     code = @compileWithDeclarations o
     # Wrap everything in a safety closure unless requested not to.
     bare or code = "(function(){\n#code\n}).call(this);\n"
-    ([prefix]) + code
+    [prefix] + code
 
   # Compile to a function body.
   compileWithDeclarations: (o) ->
@@ -368,7 +368,7 @@ class exports.Index extends Node
 
   children: [\key]
 
-  show: -> ([\? if @soak]) + @symbol
+  show: -> [\? if @soak] + @symbol
 
   isComplex: -> @key.isComplex!
 
@@ -578,7 +578,7 @@ class exports.Call extends Node
 
   children: [\args]
 
-  show: -> ([@new]) + ([@method]) + ([\? if @soak])
+  show: -> [@new] + [@method] + [\? if @soak]
 
   compile: (o) ->
     code  = (@method or '') + \(
@@ -798,7 +798,7 @@ class exports.Unary extends Node
 
   children: [\it]
 
-  show: -> ([\@ if @post]) + @op
+  show: -> [\@ if @post] + @op
 
   isCallable: -> @op of <[ do new delete ]>
 
@@ -884,14 +884,6 @@ class exports.Binary extends Node
   (op, first, second) ~>
     switch op
     case \of then return new Of first, second
-    case \+
-      if first instanceof Arr
-        first.items.push Splat second
-        return first
-      if second instanceof Arr
-      or second instanceof While and second = Arr [Splat second]
-        second.items.unshift Splat first
-        return second
     import {op, first, second}
 
   children: <[ first second ]>
@@ -1043,8 +1035,8 @@ class exports.Assign extends Node
   ::delegate <[ isCallable isRegex ]> -> @op of <[ = := ]> and @right[it]!
 
   isArray: -> switch @op
-    case \= \:= \+= then @right.isArray!
-    case \/=        then @right.isMatcher!
+    case \= \:= then @right.isArray!
+    case \/=    then @right.isMatcher!
 
   isString: -> switch @op
     case \= \:= \+= \*= then @right.isString!
@@ -1077,7 +1069,6 @@ class exports.Assign extends Node
     {op, right} = this
     return @compileMinMax o, left, right if op of <[ <?= >?= ]>
     if op is \**=
-    or op is \+= and right instanceof [Arr, While]
     or op is \*= and right.isString!
     or op of <[ -= /= ]> and right.isMatcher!
       [left, reft] = Chain(left)cacheReference o

diff --git a/test/literal.co b/test/literal.co
@@ -95,7 +95,7 @@ a = [] <<<
 a +=
   4
   5
-eq '0,1,2,3,4,5' ''+a
+eq '0,1,2,34,5' a
 
 eq '0,1' ''+ do ->
   return

diff --git a/test/operator.co b/test/operator.co
@@ -428,22 +428,7 @@ eq '8,9' ''+ -~[7 8]
 
 
 ### Overloaded
-a = [0 1]
-b = ''
-
-#### Concat
-eq '0,1,2' String a + [2]
-eq '3,4,5' String [3 4] + {0: 5, length: 1}
-eq '0,1' ''+ b += [0 1]
-ok b instanceof a..
-
-x = [6]
-y = [7 to 10]
-[[] ...x, []] += y
-eq '6,8,9' ''+ x
-
-x += for i til 2 then i
-eq '6,8,9,0,1' ''+ x
+a = b = [0 1]
 
 #### Join
 eq '0==1' a * \==
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ a = [] <<< @@
     a +=
-    eq '0,1,2,3,4,5' ''+a
+    eq '0,1,2,34,5' a
     eq '0,1' ''+ do ->
       return
@@ Expand Down @@