Fixed handling of TokenMgrErrors in parser

dlsmith · dlsmith · commit 0a882b83dd4d · 2008-08-26T18:57:37.000Z
git-svn-id: file:///tmp/test-svn/trunk@4656 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
@@ -94,7 +94,11 @@ public SourceCodeParser createParser(Reader r, String fname) {
   public List<Node> parseStream() {
     try {
       return parser.parseStream();
-    } catch (ParseException e) {
+    }
+    catch (ParseException e) {
+      throw new ParseError(e);
+    }
+    catch (TokenMgrError e) {
       throw new ParseError(e);
     }
   }
@@ -106,7 +110,11 @@ public List<Node> parseStream() {
   public List<Node> parseCompilationUnit() {
     try {
       return parser.parseCompilationUnit();
-    } catch (ParseException e) {
+    }
+    catch (ParseException e) {
+      throw new ParseError(e);
+    }
+    catch (TokenMgrError e) {
       throw new ParseError(e);
     }
   }
diff --git a/dynamicjava/src/koala/dynamicjava/parser/wrapper/ParseError.java b/dynamicjava/src/koala/dynamicjava/parser/wrapper/ParseError.java
@@ -30,6 +30,7 @@
 
 
 import koala.dynamicjava.parser.impl.ParseException;
+import koala.dynamicjava.parser.impl.TokenMgrError;
   
 /**
  * This error is thrown when an unexpected error append while
@@ -92,6 +93,10 @@ public ParseError(ParseException e) {
         pe = e;
     }
     
+    public ParseError(TokenMgrError e) {
+        this(e.getMessage(), "", -1, -1);
+    }
+    
     /**
      * Constructs an <code>ExecutionError</code> with the specified 
      * detail message, filename, line and column. 
