fix http://code.google.com/p/processing/issues/detail?id=400

jdf · jdf · commit 83d62d4da88d · 2010-10-05T20:37:05.000Z
diff --git a/app/src/processing/app/preproc/PdeEmitter.java b/app/src/processing/app/preproc/PdeEmitter.java
@@ -257,11 +257,27 @@ private void printIfThenElse(final AST literalIf) throws RunnerException {
     print(thenPath);
 
     // optional "else" clause: an SLIST or an EXPR
+    // what could be simpler?
     final AST elsePath = thenPath.getNextSibling();
     if (elsePath != null) {
       out.print("else");
-      dumpHiddenBefore(getBestPrintableNode(elsePath, true));
-      print(elsePath);
+      final AST bestPrintableNode = getBestPrintableNode(elsePath, true);
+      dumpHiddenBefore(bestPrintableNode);
+      final CommonHiddenStreamToken hiddenBefore =
+        ((CommonASTWithHiddenTokens) elsePath).getHiddenBefore();
+      if (elsePath.getType() == PdeTokenTypes.SLIST && elsePath.getNumberOfChildren() == 0 && 
+          hiddenBefore == null) {
+        out.print("{");
+        final CommonHiddenStreamToken hiddenAfter = 
+          ((CommonASTWithHiddenTokens) elsePath).getHiddenAfter();
+        if (hiddenAfter == null) {
+          out.print("}");
+        } else {
+          dumpHiddenTokens(hiddenAfter);
+        }
+      } else {
+        print(elsePath);
+      }
     }
   }
 
diff --git a/app/src/processing/app/preproc/PdePreprocessor.java b/app/src/processing/app/preproc/PdePreprocessor.java
@@ -430,7 +430,7 @@ private String write(final String program, final PrintWriter stream)
     // Because the meanings of < and > are overloaded to support
     // type arguments and type parameters, we have to treat them
     // as copyable to hidden text (or else the following syntax,
-    // such as (); and what not gets lost under certain circumstances
+    // such as (); and what not gets lost under certain circumstances)
     // -- jdf
     filter.copy(PdeRecognizer.LT);
     filter.copy(PdeRecognizer.GT);
diff --git a/app/test/resources/bug400g.expected b/app/test/resources/bug400g.expected
@@ -0,0 +1,32 @@
+import processing.core.*; 
+import processing.xml.*; 
+
+import java.applet.*; 
+import java.awt.Dimension; 
+import java.awt.Frame; 
+import java.awt.event.MouseEvent; 
+import java.awt.event.KeyEvent; 
+import java.awt.event.FocusEvent; 
+import java.awt.Image; 
+import java.io.*; 
+import java.net.*; 
+import java.text.*; 
+import java.util.*; 
+import java.util.zip.*; 
+import java.util.regex.*; 
+
+public class bug400g extends PApplet {
+
+////
+public void setup(){
+  size(100,100);
+
+    if(true){
+    }
+    else{ // Syntax error on token "else", } expected
+    }
+}
+    static public void main(String args[]) {
+        PApplet.main(new String[] { "--bgcolor=null", "bug400g" });
+    }
+}
diff --git a/app/test/resources/bug400g.pde b/app/test/resources/bug400g.pde
@@ -0,0 +1,9 @@
+////
+void setup(){
+  size(100,100);
+
+    if(true){
+    }
+    else{ // Syntax error on token "else", } expected
+    }
+}
diff --git a/app/test/src/test/processing/parsing/ParserTests.java b/app/test/src/test/processing/parsing/ParserTests.java
@@ -275,4 +275,8 @@ public void bug315g() {
     expectGood("bug315g");
   }
 
+  @Test
+  public void bug400g() {
+    expectGood("bug400g");
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -275,4 +275,8 @@ public void bug315g() {`
`275`	`275`	`expectGood("bug315g");`
`276`	`276`	`}`
`277`	`277`
	`278`	`+ @Test`
	`279`	`+ public void bug400g() {`
	`280`	`+ expectGood("bug400g");`
	`281`	`+ }`
`278`	`282`	`}`