From 8681e0a4facbe056cde75942337972e4667b2e28 Mon Sep 17 00:00:00 2001 From: Danny van Bruggen Date: Fri, 3 Nov 2017 22:25:30 +0100 Subject: [PATCH] Format the code taken from the grammar --- .../javaparser/GeneratedJavaParserBase.java | 34 ++++++++++--------- .../GeneratedJavaParserTokenManagerBase.java | 14 ++++---- .../com/github/javaparser/ModifierHolder.java | 16 ++++----- .../com/github/javaparser/TokenBase.java | 12 +++++-- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java index 1018714c8e..ef0b7efd4a 100644 --- a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java +++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java @@ -26,13 +26,16 @@ abstract class GeneratedJavaParserBase { //// Interface with the generated code abstract GeneratedJavaParserTokenManager getTokenSource(); + abstract void ReInit(Provider provider); + /* Returns the JavaParser specific token type of the last matched token */ abstract JavaToken token(); + abstract Token getNextToken(); //// - + /* The problems encountered while parsing */ List problems = new ArrayList<>(); /* Configuration flag whether we store tokens and tokenranges */ @@ -46,8 +49,7 @@ void reset(Provider provider) { } /** - * Return the list of JavaParser specific tokens that have been encountered while - * parsing code using this parser. + * Return the list of JavaParser specific tokens that have been encountered while parsing code using this parser. * * @return a list of tokens */ @@ -68,7 +70,7 @@ void addProblem(String message) { /* Returns a tokenRange that spans the last matched token */ TokenRange tokenRange() { - if(storeTokens) { + if (storeTokens) { return new TokenRange(token(), token()); } return null; @@ -78,7 +80,7 @@ TokenRange tokenRange() { * Return a TokenRange spanning from begin to end */ TokenRange range(JavaToken begin, JavaToken end) { - if(storeTokens) { + if (storeTokens) { return new TokenRange(begin, end); } return null; @@ -88,7 +90,7 @@ TokenRange range(JavaToken begin, JavaToken end) { * Return a TokenRange spanning from begin to end */ TokenRange range(Node begin, JavaToken end) { - if(storeTokens) { + if (storeTokens) { return new TokenRange(begin.getTokenRange().get().getBegin(), end); } return null; @@ -98,7 +100,7 @@ TokenRange range(Node begin, JavaToken end) { * Return a TokenRange spanning from begin to end */ TokenRange range(JavaToken begin, Node end) { - if(storeTokens) { + if (storeTokens) { return new TokenRange(begin, end.getTokenRange().get().getEnd()); } return null; @@ -108,7 +110,7 @@ TokenRange range(JavaToken begin, Node end) { * Return a TokenRange spanning from begin to end */ TokenRange range(Node begin, Node end) { - if(storeTokens) { + if (storeTokens) { return new TokenRange(begin.getTokenRange().get().getBegin(), end.getTokenRange().get().getEnd()); } return null; @@ -118,7 +120,7 @@ TokenRange range(Node begin, Node end) { * @return secondChoice if firstChoice is JavaToken.UNKNOWN, otherwise firstChoice */ JavaToken orIfInvalid(JavaToken firstChoice, JavaToken secondChoice) { - if(storeTokens) { + if (storeTokens) { assertNotNull(firstChoice); assertNotNull(secondChoice); if (firstChoice.valid() || secondChoice.invalid()) { @@ -133,7 +135,7 @@ JavaToken orIfInvalid(JavaToken firstChoice, JavaToken secondChoice) { * @return the begin-token secondChoice if firstChoice is JavaToken.UNKNOWN, otherwise firstChoice */ JavaToken orIfInvalid(JavaToken firstChoice, Node secondChoice) { - if(storeTokens) { + if (storeTokens) { return orIfInvalid(firstChoice, secondChoice.getTokenRange().get().getBegin()); } return null; @@ -156,7 +158,7 @@ void setTokenKind(int newKind) { /* Makes the parser keep a list of tokens */ void setStoreTokens(boolean storeTokens) { - this.storeTokens=storeTokens; + this.storeTokens = storeTokens; getTokenSource().setStoreTokens(storeTokens); } @@ -170,13 +172,13 @@ TokenRange recover(int recoveryTokenType, ParseException p) { Token t; do { t = getNextToken(); - } while(t.kind != recoveryTokenType && t.kind!=EOF); + } while (t.kind != recoveryTokenType && t.kind != EOF); JavaToken end = token(); - TokenRange tokenRange=null; - if(begin!=null && end!=null){ - tokenRange=range(begin, end); + TokenRange tokenRange = null; + if (begin != null && end != null) { + tokenRange = range(begin, end); } problems.add(new Problem(makeMessageForParseException(p), tokenRange, p)); @@ -186,7 +188,7 @@ TokenRange recover(int recoveryTokenType, ParseException p) { /** * Quickly create a new NodeList */ - NodeList emptyList() { + NodeList emptyList() { return new NodeList<>(); } diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java index 8f1e6dad72..32534b5cef 100644 --- a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java +++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java @@ -5,12 +5,12 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; -import static com.github.javaparser.GeneratedJavaParserConstants.JAVADOC_COMMENT; -import static com.github.javaparser.GeneratedJavaParserConstants.MULTI_LINE_COMMENT; -import static com.github.javaparser.GeneratedJavaParserConstants.SINGLE_LINE_COMMENT; +import static com.github.javaparser.GeneratedJavaParserConstants.*; import static com.github.javaparser.Position.pos; -/** Base class for {@link com.github.javaparser.GeneratedJavaParserTokenManager} */ +/** + * Base class for {@link com.github.javaparser.GeneratedJavaParserTokenManager} + */ public class GeneratedJavaParserTokenManagerBase { /** * Create a TokenRange that spans exactly one token @@ -20,9 +20,9 @@ private static TokenRange tokenRange(Token token) { return new TokenRange(javaToken, javaToken); } - /** - * Since comments are completely captured in a single token, including their delimiters, - * deconstruct them here so we can turn them into nodes later on. + /** + * Since comments are completely captured in a single token, including their delimiters, deconstruct them here so we + * can turn them into nodes later on. */ static Comment createCommentFromToken(Token token) { String commentText = token.image; diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java index c8abf22791..46d2e8f62a 100644 --- a/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java +++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java @@ -12,13 +12,13 @@ * Helper class for {@link GeneratedJavaParser} */ class ModifierHolder { - final EnumSet modifiers; - final NodeList annotations; - final JavaToken begin; + final EnumSet modifiers; + final NodeList annotations; + final JavaToken begin; - public ModifierHolder(JavaToken begin, EnumSet modifiers, NodeList annotations) { - this.begin = begin; - this.modifiers = assertNotNull(modifiers); - this.annotations = annotations; - } + ModifierHolder(JavaToken begin, EnumSet modifiers, NodeList annotations) { + this.begin = begin; + this.modifiers = assertNotNull(modifiers); + this.annotations = annotations; } +} diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/TokenBase.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/TokenBase.java index 04dfbd6352..b0562262db 100644 --- a/javaparser-core/src/main/javacc-support/com/github/javaparser/TokenBase.java +++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/TokenBase.java @@ -2,10 +2,16 @@ import static com.github.javaparser.GeneratedJavaParserConstants.GT; -/** Base class for the generated {@link Token} */ +/** + * Base class for the generated {@link Token} + */ class TokenBase { - /** For tracking the >> >>> ambiguity. */ + /** + * For tracking the >> >>> ambiguity. + */ int realKind = GT; - /** This is the link to the token that JavaParser presents to the user */ + /** + * This is the link to the token that JavaParser presents to the user + */ JavaToken javaToken; }