Closes #888 (lucky number?)

ooc-lang · Jul 8, 2015 · 2cdd92e · vendethiel · Jul 8, 2015 · fasterthanlime
1 parent 36ae73b
commit 2cdd92e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 19 deletions.
diff --git a/source/rock/middle/BinaryOp.ooc b/source/rock/middle/BinaryOp.ooc
@@ -612,7 +612,7 @@ BinaryOp: class extends Expression {
             // If the left side is an immutable function, fail immediately.
             l := lRef as FuncType
             if (!(l isClosure)) {
-            token module params errorHandler onError(InvalidBinaryOverload new(token,
+            token module params errorHandler onError(InvalidOperatorUse new(token,
                 "%s is an immutable function. You must not reassign it. (Perhaps you want to use a first-class function instead?)" format(left toString())))
             }
         }
@@ -752,20 +752,8 @@ BinaryOp: class extends Expression {
             args add(0, fDecl owner getThisDecl())
         }
 
-        if(args getSize() != 2) {
-            match (symbol) {
-                case "-" || "+" || "-=" || "+=" =>
-                    if (args getSize() == 1) {
-                        // correct, but not the right overload type - skip
-                        return 0
-                    } else {
-                        token module params errorHandler onError(InvalidBinaryOverload new(op token,
-                            "Overloads for '%s' operator require 1 or 2 arguments, not %d" format(symbol, args getSize())))
-                    }
-                case =>
-                    token module params errorHandler onError(InvalidBinaryOverload new(op token,
-                        "Overloads for '%s' operator require 2 arguments, not %d" format(symbol, args getSize())))
-            }
+        if (args size < 2) {
+            return 0 // not the right overload type -- skip
         }
 
         opLeft  := args get(0)
@@ -804,10 +792,6 @@ BinaryOp: class extends Expression {
 
 }
 
-InvalidBinaryOverload: class extends Error {
-    init: super func ~tokenMessage
-}
-
 InvalidOperatorUse: class extends Error {
     init: super func ~tokenMessage
 }
diff --git a/source/rock/middle/OperatorDecl.ooc b/source/rock/middle/OperatorDecl.ooc
@@ -103,6 +103,31 @@ OperatorDecl: class extends Expression {
             }
         }
 
+        if (symbol != "as") {
+            numArgs := fDecl args size
+            if (fDecl owner) {
+                numArgs += 1
+            }
+
+            if(numArgs != 2) {
+                match (symbol) {
+                    case "-" || "+" =>
+                        if (numArgs != 1) {
+                            res throwError(InvalidOperatorOverload new(token,
+                                "Overloading '%s' requires 1 or 2 arguments, not %d" format(symbol, numArgs)))
+                        }
+                    case "[]=" =>
+                        if (numArgs != 3) {
+                            res throwError(InvalidOperatorOverload new(token,
+                                "Overloading '%s' requires 3 arguments, not %d" format(symbol, numArgs)))
+                        }
+                    case =>
+                        res throwError(InvalidOperatorOverload new(token,
+                            "Overloading '%s' requires 2 arguments, not %d" format(symbol, numArgs)))
+                }
+            }
+        }
+
         Response OK
     }
 
@@ -164,6 +189,7 @@ InvalidOperatorOverload: class extends Error {
     init: super func ~tokenMessage
 }
 
+
 OverloadStatus: enum {
     TRYAGAIN // operator usage waiting for something else to resolve
     REPLACED // operator usage was replaced with a call to an overload

diff --git a/test/compiler/operators/check-on-definition.ooc b/test/compiler/operators/check-on-definition.ooc
@@ -0,0 +1,11 @@
+
+//! shouldfail
+
+Vec2: class {
+    x, y: Int
+
+    operator * -> This {
+        this
+    }
+}
+
diff --git a/test/compiler/operators/overload-order.ooc b/test/compiler/operators/overload-order.ooc
@@ -1,4 +1,6 @@
 
+use sam-assert
+
 Point2D: class {
     x, y: Int
     init: func(=x, =y)