experimental impl of #4285

eclipse-archived · Jan 28, 2015 · 5b6f069 · 5b6f069
1 parent 9fe125e
commit 5b6f069
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ControlFlowVisitor.java b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ControlFlowVisitor.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 
+import com.redhat.ceylon.compiler.typechecker.model.ProducedType;
 import com.redhat.ceylon.compiler.typechecker.tree.Node;
 import com.redhat.ceylon.compiler.typechecker.tree.Tree;
 import com.redhat.ceylon.compiler.typechecker.tree.Visitor;
@@ -336,7 +337,7 @@ public void visit(Tree.Return that) {
         exit();
         exitLoopScope();
     }
-
+    
     @Override
     public void visit(Tree.Throw that) {
         super.visit(that);
@@ -580,17 +581,22 @@ public void visit(Tree.ExpressionStatement that) {
         super.visit(that);
         Tree.Expression expr = that.getExpression();
         if (expr!=null) {
-            Tree.Term t = expr.getTerm();
-            if (t==null) {
+            Tree.Term term = expr.getTerm();
+            if (term==null) {
                 expr.addError("malformed expression statement");
             }
+            else if (!(term instanceof Tree.InvocationExpression 
+                    || term instanceof Tree.PostfixOperatorExpression
+                    || term instanceof Tree.PrefixOperatorExpression
+                    || term instanceof Tree.AssignmentOp)) {
+                expr.addError("not a legal statement (not an invocation, assignment, or increment/decrement)", 
+                        3000);
+            }
             else {
-                if (!(t instanceof Tree.InvocationExpression
-                        || t instanceof Tree.PostfixOperatorExpression
-                        || t instanceof Tree.PrefixOperatorExpression
-                        || t instanceof Tree.AssignmentOp)) {
-                    expr.addError("not a legal statement (not an invocation, assignment, or increment/decrement)", 
-                            3000);
+                ProducedType type = term.getTypeModel();
+                if (type!=null && type.isNothing()) {
+                    exit();
+                    exitLoopScope();
                 }
             }
         }

diff --git a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/SpecificationVisitor.java b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/SpecificationVisitor.java
@@ -13,6 +13,7 @@
 import com.redhat.ceylon.compiler.typechecker.model.Method;
 import com.redhat.ceylon.compiler.typechecker.model.MethodOrValue;
 import com.redhat.ceylon.compiler.typechecker.model.Parameter;
+import com.redhat.ceylon.compiler.typechecker.model.ProducedType;
 import com.redhat.ceylon.compiler.typechecker.model.Setter;
 import com.redhat.ceylon.compiler.typechecker.model.TypedDeclaration;
 import com.redhat.ceylon.compiler.typechecker.model.Value;
@@ -991,6 +992,21 @@ public void visit(Tree.Return that) {
         }
         exit();
     }
+
+    @Override
+    public void visit(Tree.ExpressionStatement that) {
+        super.visit(that);
+        Tree.Expression expr = that.getExpression();
+        if (expr!=null) {
+            Tree.Term term = expr.getTerm();
+            if (term!=null) {
+                ProducedType type = term.getTypeModel();
+                if (type!=null && type.isNothing()) {
+                    exit();
+                }
+            }
+        }
+    }
 
     private boolean isSharedDeclarationUninitialized() {
         return (declaration.isShared() ||