aboutsummaryrefslogtreecommitdiff
path: root/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
diff options
context:
space:
mode:
authorDanny van Bruggen <hexagonaal@gmail.com>2017-06-03 23:38:27 +0200
committerDanny van Bruggen <hexagonaal@gmail.com>2017-06-04 00:04:42 +0200
commit155768b66aca4e5dc4c2b575e52f386dbf2508d8 (patch)
treeaca48d2bbe4de845d57f3c549180385f35d3e5b9 /javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
parent9991a2503ee3a383b738832a434dfa9b1ec5fd87 (diff)
downloadjavaparser-155768b66aca4e5dc4c2b575e52f386dbf2508d8.tar.gz
Recover from errors at CU level
Diffstat (limited to 'javaparser-core/src/main/java/com/github/javaparser/JavaParser.java')
-rw-r--r--javaparser-core/src/main/java/com/github/javaparser/JavaParser.java68
1 files changed, 0 insertions, 68 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
index a46789693..5eb342fac 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
@@ -131,16 +131,6 @@ public final class JavaParser {
return new ParseResult<>(resultNode, parser.problems, parser.getTokens(),
parser.getCommentsCollection());
- } catch (ParseException p) {
- TokenRange tokenRange = null;
- if (p.currentToken != null) {
- if (p.currentToken instanceof GeneratedJavaParser.CustomToken) {
- final JavaToken token = ((GeneratedJavaParser.CustomToken) p.currentToken).javaToken;
- tokenRange = new TokenRange(token, token);
- }
- }
- parser.problems.add(new Problem(makeMessageForParseException(p), tokenRange, p));
- return new ParseResult<>(null, parser.problems, parser.getTokens(), parser.getCommentsCollection());
} catch (Exception e) {
final String message = e.getMessage() == null ? "Unknown error" : e.getMessage();
parser.problems.add(new Problem(message, null, e));
@@ -155,64 +145,6 @@ public final class JavaParser {
}
/**
- * This is the code from ParseException.initialise, modified to be more horizontal.
- */
- private String makeMessageForParseException(ParseException exception) {
- final StringBuilder sb = new StringBuilder("Parse error. Found ");
- final StringBuilder expected = new StringBuilder();
-
- int maxExpectedTokenSequenceLength = 0;
- TreeSet<String> sortedOptions = new TreeSet<>();
- for (int i = 0; i < exception.expectedTokenSequences.length; i++) {
- if (maxExpectedTokenSequenceLength < exception.expectedTokenSequences[i].length) {
- maxExpectedTokenSequenceLength = exception.expectedTokenSequences[i].length;
- }
- for (int j = 0; j < exception.expectedTokenSequences[i].length; j++) {
- sortedOptions.add(exception.tokenImage[exception.expectedTokenSequences[i][j]]);
- }
- }
-
- for (String option : sortedOptions) {
- expected.append(" ").append(option);
- }
-
- sb.append("");
-
- Token token = exception.currentToken.next;
- for (int i = 0; i < maxExpectedTokenSequenceLength; i++) {
- String tokenText = token.image;
- String escapedTokenText = ParseException.add_escapes(tokenText);
- if (i != 0) {
- sb.append(" ");
- }
- if (token.kind == 0) {
- sb.append(exception.tokenImage[0]);
- break;
- }
- escapedTokenText = "\"" + escapedTokenText + "\"";
- String image = exception.tokenImage[token.kind];
- if (image.equals(escapedTokenText)) {
- sb.append(image);
- } else {
- sb.append(" ")
- .append(escapedTokenText)
- .append(" ")
- .append(image);
- }
- token = token.next;
- }
-
- if (exception.expectedTokenSequences.length != 0) {
- int numExpectedTokens = exception.expectedTokenSequences.length;
- sb.append(", expected")
- .append(numExpectedTokens == 1 ? "" : " one of ")
- .append(expected.toString());
- }
- return sb.toString();
-
- }
-
- /**
* Parses the Java code contained in the {@link InputStream} and returns a
* {@link CompilationUnit} that represents it.
*