Insert int after color instead of before to allow visiblity modifier.

sampottinger · sampottinger · commit bc434fce0b95 · 2020-06-29T15:17:44.000-07:00
diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -542,7 +542,7 @@ public void exitFunctionWithPrimitiveTypeName(
    */
   public void exitColorPrimitiveType(ProcessingParser.ColorPrimitiveTypeContext ctx) {
     if (ctx.getText().equals("color")) {
-      insertBefore(ctx.start, "int");
+      insertAfter(ctx.stop, "int");
       delete(ctx.start, ctx.stop);
     }
   }
diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java
@@ -360,4 +360,9 @@ public void testPdfWrite() {
     expectGood("pdfwrite");
   }
 
+  @Test
+  public void testColorReturn() {
+    expectGood("colorreturn");
+  }
+
 }
diff --git a/java/test/resources/colorreturn.expected b/java/test/resources/colorreturn.expected
@@ -0,0 +1,43 @@
+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 colorreturn extends PApplet {
+
+public void setup() {
+  fill(getColor());
+  noStroke();
+  /* size commented out by preprocessor */;
+  ellipseMode(CENTER);
+  ellipse(50, 50, 50, 50);
+}
+
+public int getColor() {
+  return 0xFF333333;
+}
+
+public void draw() {
+}
+
+
+    public void settings() { size(100,100); }
+
+    static public void main(String[] passedArgs) {
+        String[] appletArgs = new String[] { "colorreturn" };
+        if (passedArgs != null) {
+            PApplet.main(concat(appletArgs, passedArgs));
+        } else {
+            PApplet.main(appletArgs);
+        }
+    }
+}
diff --git a/java/test/resources/colorreturn.pde b/java/test/resources/colorreturn.pde
@@ -0,0 +1,14 @@
+public void setup() {
+  fill(getColor());
+  noStroke();
+  size(100, 100);
+  ellipseMode(CENTER);
+  ellipse(50, 50, 50, 50);
+}
+
+color getColor() {
+  return #333333;
+}
+
+public void draw() {
+}

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ public void exitFunctionWithPrimitiveTypeName(`
`542`	`542`	`*/`
`543`	`543`	`public void exitColorPrimitiveType(ProcessingParser.ColorPrimitiveTypeContext ctx) {`
`544`	`544`	`if (ctx.getText().equals("color")) {`
`545`		`- insertBefore(ctx.start, "int");`
	`545`	`+ insertAfter(ctx.stop, "int");`
`546`	`546`	`delete(ctx.start, ctx.stop);`
`547`	`547`	`}`
`548`	`548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -360,4 +360,9 @@ public void testPdfWrite() {`
`360`	`360`	`expectGood("pdfwrite");`
`361`	`361`	`}`
`362`	`362`
	`363`	`+ @Test`
	`364`	`+ public void testColorReturn() {`
	`365`	`+ expectGood("colorreturn");`
	`366`	`+ }`
	`367`	`+`
`363`	`368`	`}`