DynamicJava: Fix for bug 2974931 -- division by zero causes exception during static checking.

dlsmith · dlsmith · commit 0fad47bdd1e9 · 2010-04-11T03:17:20.000Z
git-svn-id: file:///tmp/test-svn/trunk@5214 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java
@@ -80,6 +80,7 @@
 import edu.rice.cs.plt.tuple.Option;
 import edu.rice.cs.plt.lambda.Lambda;
 import edu.rice.cs.plt.lambda.Lambda2;
+import edu.rice.cs.plt.lambda.WrappedException;
 
 import edu.rice.cs.dynamicjava.Options;
 import edu.rice.cs.dynamicjava.symbol.*;
@@ -1583,13 +1584,21 @@ private Type handleBooleanExpression(BinaryExpression node) {
     
     private void evaluateConstantExpression(BinaryExpression node) {
       if (hasValue(node.getLeftExpression()) && hasValue(node.getRightExpression())) {
-        setValue(node, new ExpressionEvaluator(RuntimeBindings.EMPTY, opt).value(node));
+        try {
+          Object val = new ExpressionEvaluator(RuntimeBindings.EMPTY, opt).value(node);
+          setValue(node, val);
+        }
+        catch (WrappedException e) { /* failed to evaluate -- just ignore */ }
       }
     }
     
     private void evaluateConstantExpression(UnaryExpression node) {
       if (hasValue(node.getExpression())) {
-        setValue(node, new ExpressionEvaluator(RuntimeBindings.EMPTY, opt).value(node));
+        try {
+          Object val = new ExpressionEvaluator(RuntimeBindings.EMPTY, opt).value(node);
+          setValue(node, val);
+        }
+        catch (WrappedException e) { /* failed to evaluate -- just ignore */ }
       }
     }
     
