Merge pull request #2772 from JakubValtar/preproc-constructorCast-fix

benfry · benfry · commit ab2fb8cba104 · 2014-08-12T09:25:32.000-04:00
Fixes #1936 - Preproc constructor cast fix
diff --git a/app/src/processing/mode/java/preproc/pde.g b/app/src/processing/mode/java/preproc/pde.g
@@ -194,13 +194,14 @@ constructorCast!
         // if this is a string literal, make sure the type we're trying to cast
         // to is one of the supported ones
         //
-        { #e.getType() != STRING_LITERAL ||
-            ( #t.getType() == LITERAL_byte ||
+        { (#e == null) ||
+          ( (#e.getType() != STRING_LITERAL) ||
+            ( #t.getType() == LITERAL_boolean ||
               #t.getType() == LITERAL_double ||
               #t.getType() == LITERAL_float ||
               #t.getType() == LITERAL_int ||
               #t.getType() == LITERAL_long ||
-              #t.getType() == LITERAL_short ) }?
+              #t.getType() == LITERAL_short )) }?
         // create the node
         //
         {#constructorCast = #(#[CONSTRUCTOR_CAST,"CONSTRUCTOR_CAST"], t, e);}
diff --git a/app/test/resources/bug1936.expected b/app/test/resources/bug1936.expected
@@ -0,0 +1,29 @@
+import processing.core.*; 
+import processing.data.*; 
+import processing.event.*; 
+import processing.opengl.*; 
+
+import java.util.HashMap; 
+import java.util.ArrayList; 
+import java.io.File; 
+import java.io.BufferedReader; 
+import java.io.PrintWriter; 
+import java.io.InputStream; 
+import java.io.OutputStream; 
+import java.io.IOException; 
+
+public class bug1936 extends PApplet {
+    public void setup() {
+char a = PApplet.parseChar(PApplet.parseByte(PApplet.parseInt("15")));
+        noLoop();
+    }
+
+    static public void main(String[] passedArgs) {
+        String[] appletArgs = new String[] { "bug1936" };
+        if (passedArgs != null) {
+          PApplet.main(concat(appletArgs, passedArgs));
+        } else {
+          PApplet.main(appletArgs);
+        }
+    }
+}
diff --git a/app/test/resources/bug1936.pde b/app/test/resources/bug1936.pde
@@ -0,0 +1 @@
+char a = char(byte(int("15")));
diff --git a/app/test/src/test/processing/mode/java/ParserTests.java b/app/test/src/test/processing/mode/java/ParserTests.java
@@ -276,6 +276,11 @@ public void bug1532() {
   public void bug1534() {
     expectGood("bug1534");
   }
+  
+  @Test
+  public void bug1936() {
+    expectGood("bug1936");
+  }
 
   @Test
   public void bug315g() {
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -9635,7 +9635,7 @@ static final public float[] parseFloat(char what[]) {
   }
   */
 
-  static final public float[] parseByte(byte what[]) {
+  static final public float[] parseFloat(byte what[]) {
     float floaties[] = new float[what.length];
     for (int i = 0; i < what.length; i++) {
       floaties[i] = what[i];

Original file line number	Diff line number	Diff line change
`@@ -9635,7 +9635,7 @@ static final public float[] parseFloat(char what[]) {`
`9635`	`9635`	`}`
`9636`	`9636`	`*/`
`9637`	`9637`
`9638`		`- static final public float[] parseByte(byte what[]) {`
	`9638`	`+ static final public float[] parseFloat(byte what[]) {`
`9639`	`9639`	`float floaties[] = new float[what.length];`
`9640`	`9640`	`for (int i = 0; i < what.length; i++) {`
`9641`	`9641`	`floaties[i] = what[i];`