Skip to content

Commit

Permalink
Move TokenConstants around
Browse files Browse the repository at this point in the history
  • Loading branch information
@matozoid
matozoid committed Mar 6, 2017
1 parent 9192b9d commit b29a465
Show file tree
Hide file tree
Showing 18 changed files with 524 additions and 503 deletions.
46 changes: 34 additions & 12 deletions ...ub/javaparser/printer/TokenConstants.java → ...ava/com/github/javaparser/TokenTypes.java
View file
@@ -1,15 +1,12 @@
package com.github.javaparser.printer;

import com.github.javaparser.GeneratedJavaParserConstants;
import com.github.javaparser.utils.Utils;
package com.github.javaparser;

import static com.github.javaparser.GeneratedJavaParserConstants.*;
import static com.github.javaparser.utils.Utils.*;
import static com.github.javaparser.utils.Utils.EOL;

/**
* It complements GeneratedJavaParserConstants
* Complements GeneratedJavaParserConstants
*/
public class TokenConstants {
public class TokenTypes {
public static boolean isWhitespace(int tokenType) {
return tokenType >= EOF && tokenType <= ZERO_WIDTH_NO_BREAK_SPACE;
}
Expand All @@ -32,8 +29,33 @@ public static boolean isWhitespaceOrComment(int tokenType) {
public static boolean isSpaceOrTab(int tokenType) {
switch (tokenType) {
case SPACE:
// TODO lots more space tokens in the grammar!
case GeneratedJavaParserConstants.TAB:
case TAB:
case FORM_FEED:
case NEXT_LINE:
case NON_BREAKING_SPACE:
case OGHAM_SPACE:
case MONGOLIAN_VOWEL_SEPARATOR:
case EN_QUAD:
case EM_QUAD:
case EN_SPACE:
case EM_SPACE:
case THREE_PER_EM_SPACE:
case FOUR_PER_EM_SPACE:
case SIX_PER_EM_SPACE:
case FIGURE_SPACE:
case PUNCTUATION_SPACE:
case THIN_SPACE:
case HAIR_SPACE:
case ZERO_WIDTH_SPACE:
case ZERO_WIDTH_NON_JOINER:
case ZERO_WIDTH_JOINER:
case LINE_SEPARATOR:
case PARAGRAPH_SEPARATOR:
case NARROW_NO_BREAK_SPACE:
case MEDIUM_MATHEMATICAL_SPACE:
case WORD_JOINER:
case IDEOGRAPHIC_SPACE:
case ZERO_WIDTH_NO_BREAK_SPACE:
return true;
default:
return false;
Expand All @@ -47,13 +69,13 @@ public static boolean isComment(int tokenType) {
}

public static int eolToken() {
if(EOL.equals("\n")){
if (EOL.equals("\n")) {
return UNIX_EOL;
}
if(EOL.equals("\r\n")){
if (EOL.equals("\r\n")) {
return WINDOWS_EOL;
}
if(EOL.equals("\r")){
if (EOL.equals("\r")) {
return OLD_MAC_EOL;
}
throw new AssertionError("Unknown EOL character sequence");
Expand Down
10 changes: 5 additions & 5 deletions javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
View file
Expand Up @@ -289,7 +289,7 @@ public CompilationUnit addImport(String name, boolean isStatic, boolean isAsteri
}
i.append(";");
ImportDeclaration importDeclaration = JavaParser.parseImport(i.toString());
if (getImports().stream().anyMatch( im -> im.toString().equals(importDeclaration.toString())))
if (getImports().stream().anyMatch(im -> im.toString().equals(importDeclaration.toString())))
return this;
else {
getImports().add(importDeclaration);
Expand Down Expand Up @@ -395,7 +395,7 @@ public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier... m
* @param className the class name (case-sensitive)
*/
public Optional<ClassOrInterfaceDeclaration> getClassByName(String className) {
return getTypes().stream().filter( type -> type.getNameAsString().equals(className) && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map( t -> (ClassOrInterfaceDeclaration) t);
return getTypes().stream().filter(type -> type.getNameAsString().equals(className) && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t);
}

/**
Expand All @@ -404,7 +404,7 @@ public Optional<ClassOrInterfaceDeclaration> getClassByName(String className) {
* @param interfaceName the interface name (case-sensitive)
*/
public Optional<ClassOrInterfaceDeclaration> getInterfaceByName(String interfaceName) {
return getTypes().stream().filter( type -> type.getNameAsString().equals(interfaceName) && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map( t -> (ClassOrInterfaceDeclaration) t);
return getTypes().stream().filter(type -> type.getNameAsString().equals(interfaceName) && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t);
}

/**
Expand All @@ -413,7 +413,7 @@ public Optional<ClassOrInterfaceDeclaration> getInterfaceByName(String interface
* @param enumName the enum name (case-sensitive)
*/
public Optional<EnumDeclaration> getEnumByName(String enumName) {
return getTypes().stream().filter( type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration).findFirst().map( t -> (EnumDeclaration) t);
return getTypes().stream().filter(type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration).findFirst().map(t -> (EnumDeclaration) t);
}

/**
Expand All @@ -422,7 +422,7 @@ public Optional<EnumDeclaration> getEnumByName(String enumName) {
* @param annotationName the annotation name (case-sensitive)
*/
public Optional<AnnotationDeclaration> getAnnotationDeclarationByName(String annotationName) {
return getTypes().stream().filter( type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration).findFirst().map( t -> (AnnotationDeclaration) t);
return getTypes().stream().filter(type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration).findFirst().map(t -> (AnnotationDeclaration) t);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
View file
Expand Up @@ -113,7 +113,7 @@ public enum ObserverRegistrationMode {
/**
* This can be used to sort nodes on position.
*/
public static Comparator<Node> NODE_BY_BEGIN_POSITION = ( a, b) -> {
public static Comparator<Node> NODE_BY_BEGIN_POSITION = (a, b) -> {
if (a.getRange().isPresent() && b.getRange().isPresent()) {
return a.getRange().get().begin.compareTo(b.getRange().get().begin);
}
Expand Down Expand Up @@ -338,7 +338,7 @@ public List<Comment> getAllContainedComments() {
*/
@Override
public Node setParentNode(Node parentNode) {
observers.forEach( o -> o.parentChange(this, this.parentNode, parentNode));
observers.forEach(o -> o.parentChange(this, this.parentNode, parentNode));
// remove from old parent, if any
if (this.parentNode != null) {
this.parentNode.childNodes.remove(this);
Expand Down Expand Up @@ -380,7 +380,7 @@ public boolean hasComment() {
}

public void tryAddImportToParentCompilationUnit(Class<?> clazz) {
getAncestorOfType(CompilationUnit.class).ifPresent( p -> p.addImport(clazz));
getAncestorOfType(CompilationUnit.class).ifPresent(p -> p.addImport(clazz));
}

/**
Expand Down Expand Up @@ -456,7 +456,7 @@ protected void setAsParentNodeOf(NodeList<? extends Node> list) {
}

public <P> void notifyPropertyChange(ObservableProperty property, P oldValue, P newValue) {
this.observers.forEach( o -> o.propertyChange(this, property, oldValue, newValue));
this.observers.forEach(o -> o.propertyChange(this, property, oldValue, newValue));
}

@Override
Expand Down Expand Up @@ -497,8 +497,8 @@ public void register(AstObserver observer, ObserverRegistrationMode mode) {
*/
public void registerForSubtree(AstObserver observer) {
register(observer);
this.getChildNodes().forEach( c -> c.registerForSubtree(observer));
this.getNodeLists().forEach( nl -> {
this.getChildNodes().forEach(c -> c.registerForSubtree(observer));
this.getNodeLists().forEach(nl -> {
if (nl != null)
nl.register(observer);
});
Expand Down
2 changes: 1 addition & 1 deletion ...parser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
View file
Expand Up @@ -151,7 +151,7 @@ public ClassOrInterfaceDeclaration setTypeParameters(final NodeList<TypeParamete
* @return the methods found (multiple in case of polymorphism)
*/
public Optional<ConstructorDeclaration> getDefaultConstructor() {
return getMembers().stream().filter( bd -> bd instanceof ConstructorDeclaration).map( bd -> (ConstructorDeclaration) bd).filter( cd -> cd.getParameters().isEmpty()).findFirst();
return getMembers().stream().filter(bd -> bd instanceof ConstructorDeclaration).map(bd -> (ConstructorDeclaration) bd).filter(cd -> cd.getParameters().isEmpty()).findFirst();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
View file
Expand Up @@ -158,7 +158,7 @@ public MethodDeclaration createGetter() {
String fieldName = variable.getNameAsString();
String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length());
final MethodDeclaration getter;
getter = parentClass.map( clazz -> clazz.addMethod("get" + fieldNameUpper, PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, PUBLIC));
getter = parentClass.map(clazz -> clazz.addMethod("get" + fieldNameUpper, PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, PUBLIC));
getter.setType(variable.getType());
BlockStmt blockStmt = new BlockStmt();
getter.setBody(blockStmt);
Expand All @@ -185,7 +185,7 @@ public MethodDeclaration createSetter() {
String fieldName = variable.getNameAsString();
String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length());
final MethodDeclaration setter;
setter = parentClass.map( clazz -> clazz.addMethod("set" + fieldNameUpper, PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, PUBLIC));
setter = parentClass.map(clazz -> clazz.addMethod("set" + fieldNameUpper, PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, PUBLIC));
setter.setType(new VoidType());
setter.getParameters().add(new Parameter(variable.getType(), fieldName));
BlockStmt blockStmt2 = new BlockStmt();
Expand Down
2 changes: 1 addition & 1 deletion javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java
View file
Expand Up @@ -54,7 +54,7 @@ enum Type {
private boolean derived;

public static ObservableProperty fromCamelCaseName(String camelCaseName) {
Optional<ObservableProperty> observableProperty = Arrays.stream(values()).filter( v -> v.camelCaseName().equals(camelCaseName)).findFirst();
Optional<ObservableProperty> observableProperty = Arrays.stream(values()).filter(v -> v.camelCaseName().equals(camelCaseName)).findFirst();
if (observableProperty.isPresent()) {
return observableProperty.get();
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...arser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java
View file
Expand Up @@ -1865,7 +1865,7 @@ public List<R> visit(WildcardType n, A arg) {

@Override
public List<R> visit(NodeList n, A arg) {
return ((NodeList<? extends Node>) n).stream().filter(Objects::nonNull).flatMap( v -> v.accept(this, arg).stream()).collect(Collectors.toList());
return ((NodeList<? extends Node>) n).stream().filter(Objects::nonNull).flatMap(v -> v.accept(this, arg).stream()).collect(Collectors.toList());
}

@Override
Expand Down

0 comments on commit b29a465

Please sign in to comment.