Improved failure detection in CompiledConsole; closes #1099

usethesource · Jun 22, 2017 · 4056564 · 4056564
1 parent 7d2c3ef
commit 4056564
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/src/org/rascalmpl/library/experiments/Compiler/RVM/Interpreter/repl/CommandExecutor.java b/src/org/rascalmpl/library/experiments/Compiler/RVM/Interpreter/repl/CommandExecutor.java
@@ -532,12 +532,16 @@ private IValue evalStatement(String src, ITree stat) throws RascalShellExecution
 				Variable var = variables.get(name);
 				if(var != null){
 					val = executeModule("\nvalue main() { " + src + "}\n", true);
-					updateVar(name, val);
+					if(val != null){
+					    updateVar(name, val);
+					}
 					return val;
 				} else {
 					val = executeModule(makeMain(unparse(get(stat, "statement"))), true);
-					declareVar(val.getType().toString(), name);
-					updateVar(name, val);
+					if(val != null){
+					    declareVar(val.getType().toString(), name);
+					    updateVar(name, val);
+					}
 					forceRecompilation = true;
 					return val;
 				}
@@ -547,7 +551,7 @@ private IValue evalStatement(String src, ITree stat) throws RascalShellExecution
 				String name = getBaseVar(assignable);
 				Variable var = variables.get(name);
 				val = executeModule(makeMain(unparse(get(stat, "statement"))), true);
-				if(var != null){
+				if(var != null && val != null){
 				  annotateVar(name, annoName, val);
 				}
 				return val;
@@ -556,7 +560,7 @@ private IValue evalStatement(String src, ITree stat) throws RascalShellExecution
 				String name = getBaseVar(assignable);
 				Variable var = variables.get(name);
 				val = executeModule(makeMain(src), true);
-				if(var == null){
+				if(var == null && val != null){
 				  declareVar(val.getType().toString(), name);
 				  updateVar(name, val);
 				}
@@ -566,19 +570,20 @@ private IValue evalStatement(String src, ITree stat) throws RascalShellExecution
 			case "tuple": {
 				ITree elements = get(assignable, "elements");
 				val = executeModule(makeMain(unparse(get(stat, "statement"))), true);
-
-				ITuple tupleVal = (ITuple) val;
-				IList elemList = TreeAdapter.getListASTArgs(elements);
-				for(int i = 0; i < elemList.length(); i++){
-				  ITree element = (ITree) elemList.get(i);
-				  String elemName = getBaseVar((ITree)element);
-				  if(elemName != null){
-				    declareVar(val.getType().getFieldType(i).toString(), elemName);
-				    updateVar(elemName, tupleVal.get(i));
-				    forceRecompilation = true;
-				  } else {
-				    return reportError("Assignable is not supported: " + unparse((ITree)element));
-				  }
+				if(val != null){
+				    ITuple tupleVal = (ITuple) val;
+				    IList elemList = TreeAdapter.getListASTArgs(elements);
+				    for(int i = 0; i < elemList.length(); i++){
+				        ITree element = (ITree) elemList.get(i);
+				        String elemName = getBaseVar((ITree)element);
+				        if(elemName != null){
+				            declareVar(val.getType().getFieldType(i).toString(), elemName);
+				            updateVar(elemName, tupleVal.get(i));
+				            forceRecompilation = true;
+				        } else {
+				            return reportError("Assignable is not supported: " + unparse((ITree)element));
+				        }
+				    }
 				}
 				return val;
 			}