Fixing bug 3116238: (int) (true) command pops error

mgricken · mgricken · commit 1caae7feeb2b · 2010-11-23T08:30:45.000Z
DynamicJava doesn't perform static type checking for primitive casts.

M    dynamicjava/src/edu/rice/cs/dynamicjava/symbol/StandardTypeSystem.java
M    drjava/lib/dynamicjava-base.jar
M    drjava/src/edu/rice/cs/drjava/ui/MainFrame.java


git-svn-id: file:///tmp/test-svn/trunk@5414 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/lib/dynamicjava-base.jar b/drjava/lib/dynamicjava-base.jar
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -7020,12 +7020,10 @@ public void optionChanged(OptionEvent<Integer> oce) {
           case OptionConstants.INTERMEDIATE_LEVEL:
           case OptionConstants.FUNCTIONAL_JAVA_LEVEL: {
             rbFunctionalMenuItem.setSelected(true);
-            System.out.println("rbFunctionalMenuItem.setSelected(true);");
             break;
           }
           default: {
             rbFullJavaMenuItem.setSelected(true);
-            System.out.println("rbFullJavaMenuItem.setSelected(true);");
             break;
           }
         }
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/StandardTypeSystem.java b/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/StandardTypeSystem.java
@@ -996,6 +996,29 @@ public Expression cast(final Type target, final Expression e) throws Unsupported
         try {
           Expression result = makePrimitive(e);
           Type source = NodeProperties.getType(result);
+          
+          // type check valid conversions, see ExpressionEvaluator.convert          
+          if (target.equals(BOOLEAN)) {
+              if (!source.equals(BOOLEAN)) { throw new UnsupportedConversionException(); }
+          }
+          else if (target.equals(CHAR) ||
+                   target.equals(BYTE) ||
+                   target.equals(SHORT) ||
+                   target.equals(INT) ||
+                   target.equals(LONG) ||
+                   target.equals(FLOAT) ||
+                   target.equals(DOUBLE)) {
+              if ((!source.equals(CHAR)) &&
+                  (!source.equals(BYTE)) &&
+                  (!source.equals(DOUBLE)) &&
+                  (!source.equals(FLOAT)) &&
+                  (!source.equals(INT)) &&
+                  (!source.equals(LONG)) &&
+                  (!source.equals(SHORT))) { throw new UnsupportedConversionException(); }
+          }
+          else { throw new IllegalArgumentException(); }
+          // end type check valid conversions
+          
           if (!isEqual(target, source)) { NodeProperties.setConvertedType(result, erasedClass(target)); }
           return result;
         }

Original file line number	Diff line number	Diff line change
`@@ -7020,12 +7020,10 @@ public void optionChanged(OptionEvent<Integer> oce) {`
`7020`	`7020`	`case OptionConstants.INTERMEDIATE_LEVEL:`
`7021`	`7021`	`case OptionConstants.FUNCTIONAL_JAVA_LEVEL: {`
`7022`	`7022`	`rbFunctionalMenuItem.setSelected(true);`
`7023`		`- System.out.println("rbFunctionalMenuItem.setSelected(true);");`
`7024`	`7023`	`break;`
`7025`	`7024`	`}`
`7026`	`7025`	`default: {`
`7027`	`7026`	`rbFullJavaMenuItem.setSelected(true);`
`7028`		`- System.out.println("rbFullJavaMenuItem.setSelected(true);");`
`7029`	`7027`	`break;`
`7030`	`7028`	`}`
`7031`	`7029`	`}`