* net/loveruby/cflat/compiler/DereferenceChecker.java: throw SemanticError on invalid expr and catch it on each statement.

* test/test3.cb: make compilable.
* test/aref-semcheck2.cb: test nested invalid expr.
* test/test.sh: run aref-semcheck2.cb.


git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3821 1b9489fe-b721-0410-924e-b54b9192deb8

ChangeLog

@@ -1,3 +1,14 @@
+Sun Jan 13 06:52:52 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/compiler/DereferenceChecker.java: throw
+	  SemanticError on invalid expr and catch it on each statement.
+
+	* test/test3.cb: make compilable.
+
+	* test/aref-semcheck2.cb: test nested invalid expr.
+
+	* test/test.sh: run aref-semcheck2.cb.
+
 Sun Jan 13 05:20:59 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/type/ArrayType.java (size): returns pointer

net/loveruby/cflat/compiler/DereferenceChecker.java

@@ -40,9 +40,32 @@ class DereferenceChecker extends Visitor {
     // Statements
     //
 
+    public void visit(BlockNode node) {
+        Iterator vars = node.variables();
+        while (vars.hasNext()) {
+            DefinedVariable var = (DefinedVariable)vars.next();
+            checkVariable(var);
+        }
+        Iterator stmts = node.stmts();
+        while (stmts.hasNext()) {
+            try {
+                Node n = (Node)stmts.next();
+                check(n);
+            }
+            catch (SemanticError err) {
+                ;
+            }
+        }
+    }
+
     protected void checkVariable(DefinedVariable var) {
         if (var.hasInitializer()) {
-            check(var.initializer());
+            try {
+                check(var.initializer());
+            }
+            catch (SemanticError err) {
+                ;
+            }
         }
     }
 
@@ -63,8 +86,7 @@ class DereferenceChecker extends Visitor {
 
     protected void checkAssignment(AbstractAssignNode node) {
         if (! node.lhs().isAssignable()) {
-            error(node, "invalid lhs expression");
-            return;
+            semanticError(node, "invalid lhs expression");
         }
     }
 
@@ -75,16 +97,14 @@ class DereferenceChecker extends Visitor {
     public void visit(FuncallNode node) {
         super.visit(node);
         if (! node.expr().isCallable()) {
-            error(node, "calling object is not a function");
-            return;
+            semanticError(node, "calling object is not a function");
         }
     }
 
     public void visit(ArefNode node) {
         super.visit(node);
         if (! node.expr().isDereferable()) {
-            error(node, "is not indexable: " + node.expr().type());
-            return;
+            semanticError(node, "indexing non-array/pointer expression");
         }
         check(node.index());
     }
@@ -97,36 +117,34 @@ class DereferenceChecker extends Visitor {
     public void visit(PtrMemberNode node) {
         super.visit(node);
         if (! node.expr().isDereferable()) {
-            undereferableError(node, node.expr().type());
-            return;
+            undereferableError(node);
         }
         checkMemberRef(node, node.dereferedType(), node.member());
     }
 
     protected void checkMemberRef(Node node, Type t, String memb) {
         if (! t.isComplexType()) {
-            error(node, "is not struct/union: " + t);
-            return;
+            semanticError(node, "accessing member `" + memb
+                                + "' for non-struct/union: " + t);
         }
         ComplexType type = t.getComplexType();
         if (! type.hasMember(memb)) {
-            error(node, type.toString() + " does not have member " + memb);
-            return;
+            semanticError(node, type.toString()
+                                + " does not have member: " + memb);
         }
     }
 
     public void visit(DereferenceNode node) {
         super.visit(node);
         if (! node.expr().isDereferable()) {
-            undereferableError(node, node.expr().type());
-            return;
+            undereferableError(node);
         }
     }
 
     public void visit(AddressNode node) {
         super.visit(node);
         if (! node.expr().isAssignable()) {
-            error(node, "invalid LHS expression for &");
+            semanticError(node, "invalid LHS expression for &");
         }
     }
 
@@ -134,15 +152,12 @@ class DereferenceChecker extends Visitor {
     // Utilities
     //
 
-    protected void undereferableError(Node n, Type type) {
-        error(n, "dereferencing non-pointer expression: " + type);
+    protected void undereferableError(Node n) {
+        semanticError(n, "dereferencing non-pointer expression");
     }
 
-    protected void warn(Node n, String msg) {
-        errorHandler.warn(n.location(), msg);
-    }
-
-    protected void error(Node n, String msg) {
+    protected void semanticError(Node n, String msg) {
         errorHandler.error(n.location(), msg);
+        throw new SemanticError("invalid expr");
     }
 }

test/aref-semcheck2.cb

@@ -0,0 +1,8 @@
+void f(void) {
+    1[0][0];
+    1[0].memb;
+    1[0]->memb;
+    *(1[0]);
+    1[0]();
+    &(1[0]);
+}

test/test.sh

@@ -149,6 +149,7 @@ assert_out "1;5;9" ./array
 assert_out "0;0;0" ./array2
 assert_compile_error aref-semcheck.cb
 assert_compile_error array-semcheck1.cb
+assert_compile_error array-semcheck2.cb
 
 assert_out "11;22" ./struct
 assert_stat 0 ./struct-semcheck

test/test3.cb

@@ -5,3 +5,5 @@ struct file {
 };
 
 struct file f;
+
+int main(int argc, char **argv) { return 0; }