Fixed error message in case of indexing an undeclared variable, closes …

…#261
ooc-lang · May 13, 2011 · f579a94 · f579a94
1 parent bb1b111
commit f579a94
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/source/rock/middle/ArrayAccess.ooc b/source/rock/middle/ArrayAccess.ooc
@@ -49,6 +49,12 @@ ArrayAccess: class extends Expression {
     resolve: func (trail: Trail, res: Resolver) -> Response {
 
         if(res fatal && type == null) {
+            if (array instanceOf?(VariableAccess)) {
+                if (!array isResolved()) {
+                    res wholeAgain(this, "Reference to undeclared variable.")
+                    return Response OK
+                }
+            }
             res throwError(InvalidArrayAccess new(token, "Trying to index something that isn't an array, nor has an overload for the []/[]= operators"))
         }
 
@@ -237,6 +243,7 @@ ArrayAccess: class extends Expression {
 
     }
 
+    isResolved: func -> Bool { array isResolved() && type != null }
     getScore: func (op: OperatorDecl, reqType: Type, assign: BinaryOp, res: Resolver) -> Int {
 
         if(!(op getSymbol() equals?(assign != null ? "[]=" : "[]"))) {

diff --git a/source/rock/middle/BinaryOp.ooc b/source/rock/middle/BinaryOp.ooc
@@ -139,6 +139,14 @@ BinaryOp: class extends Expression {
         }
 
         if(type == OpType ass) {
+            if (!left isResolved()) {
+                res wholeAgain(this, "Can't resolve '%s'. (maybe you forgot to declare a variable?)" format(left toString()))
+                return Response OK
+            } elseif (!right isResolved()) {
+                res wholeAgain(this, "Can't resolve %s. (maybe you forgot to declare a variable?" format(left toString()))
+                return Response OK
+            }
+
             if(left getType() == null || !left isResolved()) {
                 res wholeAgain(this, "left type is unresolved"); return Response OK
             }