2003/11/22 06:44:39

[org.ibex.core.git] / src / org / xwt / util / Preprocessor.java

diff --git a/src/org/xwt/util/Preprocessor.java b/src/org/xwt/util/Preprocessor.java
index cc6d34d..7290e14 100644 (file)
--- a/src/org/xwt/util/Preprocessor.java
+++ b/src/org/xwt/util/Preprocessor.java
@@ -153,8 +153,8 @@ PROCESS:
                 if (expEnd - expStart <= 1) { err.add(new Error("badly formed #switch statement")); continue PROCESS; }
                 String expr = trimmed.substring(expStart, expEnd);
 
-                out.println("final String ccSwitch"+enumSwitch+" = (String)("+expr+");"+
-                    "switch(ccSwitch"+enumSwitch+".length()) {");
+                out.println("final String ccSwitch"+enumSwitch+" = (String)("+expr+");");
+                out.println("SUCCESS:do { switch(ccSwitch"+enumSwitch+".length()) {");
 
                 Hashtable[] byLength = new Hashtable[255];
                 String key = null;
@@ -196,8 +196,9 @@ PROCESS:
                     buildTrie("", byLength[i]);
                     out.println("}; break; }");
                 }
-                if (Default != null) out.println("default: { " + Default + " }");
                 out.println("} //switch");
+                if (Default != null) out.println(Default);
+                out.println("} while(false); //OUTER");
                 enumSwitch++;
 
             } else {
@@ -231,7 +232,7 @@ PROCESS:
                 String code = (String)cases.get(keys.elementAt(i));
                 code = code.substring(0, code.length() - 1);
                 String key = (String)keys.elementAt(i);
-                out.println("if (\""+key+"\".equals(ccSwitch"+enumSwitch+")) { " + code + " } break; ");
+                out.println("if (\""+key+"\".equals(ccSwitch"+enumSwitch+")) { if (true) do { " + code + " } while(false); break SUCCESS; } break; ");
             }
         }
     }