DynamicJava: Another parser fix, this time handling Errors thrown by JavaCharStream (due to malformed Unicode escapes).

dlsmith · dlsmith · commit 5523fc1c8420 · 2008-08-26T19:26:16.000Z
git-svn-id: file:///tmp/test-svn/trunk@4657 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/dynamicjava/parser/wrapper/JavaCCParser.java b/dynamicjava/src/koala/dynamicjava/parser/wrapper/JavaCCParser.java
@@ -101,6 +101,14 @@ public List<Node> parseStream() {
     catch (TokenMgrError e) {
       throw new ParseError(e);
     }
+    catch (Error e) {
+      // JavaCharStream does not use a useful exception type for escape character errors
+      String msg = e.getMessage();
+      if (msg != null && msg.startsWith("Invalid escape character")) {
+        throw new ParseError(e);
+      }
+      else { throw e; }
+    }
   }
   
   /**
@@ -117,5 +125,13 @@ public List<Node> parseCompilationUnit() {
     catch (TokenMgrError e) {
       throw new ParseError(e);
     }
+    catch (Error e) {
+      // JavaCharStream does not use a useful exception type for escape character errors
+      String msg = e.getMessage();
+      if (msg != null && msg.startsWith("Invalid escape character")) {
+        throw new ParseError(e);
+      }
+      else { throw e; }
+    }
   }
 }
diff --git a/dynamicjava/src/koala/dynamicjava/parser/wrapper/ParseError.java b/dynamicjava/src/koala/dynamicjava/parser/wrapper/ParseError.java
@@ -93,8 +93,8 @@ public ParseError(ParseException e) {
         pe = e;
     }
     
-    public ParseError(TokenMgrError e) {
-        this(e.getMessage(), "", -1, -1);
+    public ParseError(Throwable t) {
+        this(t.getMessage(), "", -1, -1);
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,14 @@ public List<Node> parseStream() {`
`101`	`101`	`catch (TokenMgrError e) {`
`102`	`102`	`throw new ParseError(e);`
`103`	`103`	`}`
	`104`	`+ catch (Error e) {`
	`105`	`+ // JavaCharStream does not use a useful exception type for escape character errors`
	`106`	`+ String msg = e.getMessage();`
	`107`	`+ if (msg != null && msg.startsWith("Invalid escape character")) {`
	`108`	`+ throw new ParseError(e);`
	`109`	`+ }`
	`110`	`+ else { throw e; }`
	`111`	`+ }`
`104`	`112`	`}`
`105`	`113`
`106`	`114`	`/**`
`@@ -117,5 +125,13 @@ public List<Node> parseCompilationUnit() {`
`117`	`125`	`catch (TokenMgrError e) {`
`118`	`126`	`throw new ParseError(e);`
`119`	`127`	`}`
	`128`	`+ catch (Error e) {`
	`129`	`+ // JavaCharStream does not use a useful exception type for escape character errors`
	`130`	`+ String msg = e.getMessage();`
	`131`	`+ if (msg != null && msg.startsWith("Invalid escape character")) {`
	`132`	`+ throw new ParseError(e);`
	`133`	`+ }`
	`134`	`+ else { throw e; }`
	`135`	`+ }`
`120`	`136`	`}`
`121`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ public ParseError(ParseException e) {`
`93`	`93`	`pe = e;`
`94`	`94`	`}`
`95`	`95`
`96`		`- public ParseError(TokenMgrError e) {`
`97`		`- this(e.getMessage(), "", -1, -1);`
	`96`	`+ public ParseError(Throwable t) {`
	`97`	`+ this(t.getMessage(), "", -1, -1);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/**`