[apex] Summit-AST Apex module - Part 6 Passing testsuite

pmd-apex/pom.xml

@@ -120,7 +120,7 @@
         <dependency>
             <groupId>com.google.summit</groupId>
             <artifactId>summit-ast</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0</version>
         </dependency>
 
         <dependency>

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexJorjeLogging.java

@@ -4,13 +4,15 @@
 
 package net.sourceforge.pmd.lang.apex;
 
+/*
 import java.util.logging.Level;
 import java.util.logging.Logger;
+*/
 
+// TODO(b/243903752)
 public final class ApexJorjeLogging {
     // note: that's a static/strong reference in order to avoid that the logger is garbage collected
     // private static final Logger APEX_LOGGER = Logger.getLogger(BaseApexLexer.class.getName());
-    // TODO(b/239648780)
 
     private ApexJorjeLogging() {
         // this is a utility class
@@ -22,6 +24,5 @@ public static void disableLogging() {
         // INFORMATION: Deduped array ApexLexer.DFA23_transition. Found 7927114 shorts which is 15MB not
         // including array overhead. Removed 7204963 shorts which is 13MB not counting array overhead. Took 18ms.
         // APEX_LOGGER.setLevel(Level.WARNING);
-        // TODO(b/239648780)
     }
 }

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java

@@ -18,7 +18,7 @@ public class ApexLanguageModule extends BaseLanguageModule {
     public ApexLanguageModule() {
         super(NAME, null, TERSE_NAME, FIRST_EXTENSION, REMAINING_EXTENSIONS);
         // addVersion(String.valueOf((int) Version.CURRENT.getExternal()), new ApexHandler(), true);
-        // TODO(b/239648780)
+        // TODO(b/243906862)
         addVersion("0", new ApexHandler(), true);
     }
 }

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java

@@ -4,15 +4,11 @@
 
 package net.sourceforge.pmd.lang.apex.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
+import com.google.summit.ast.expression.SoqlOrSoslBinding;
 
-import com.google.summit.ast.Node;
+public class ASTBindExpressions extends AbstractApexNode.Single<SoqlOrSoslBinding> {
 
-public class ASTBindExpressions extends AbstractApexNode.Single<Node> {
-
-    @Deprecated
-    @InternalApi
-    public ASTBindExpressions(Node bindExpressions) {
+    ASTBindExpressions(SoqlOrSoslBinding bindExpressions) {
         super(bindExpressions);
     }
 

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java

@@ -18,11 +18,11 @@ public Object jjtAccept(ApexParserVisitor visitor, Object data) {
     }
 
     public String getExceptionType() {
-        return node.getExceptionVariable().getType().asCodeString();
+        return node.getException().getType().asCodeString();
     }
 
     public String getVariableName() {
-        return node.getExceptionVariable().getId().getString();
+        return node.getException().getDeclarations().get(0).getId().getString();
     }
 
     public ASTBlockStatement getBody() {

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java

@@ -12,22 +12,30 @@
 import com.google.summit.ast.Identifier;
 import com.google.summit.ast.Node;
 import com.google.summit.ast.TypeRef;
+import com.google.summit.ast.declaration.EnumDeclaration;
 import com.google.summit.ast.expression.Expression;
 import com.google.summit.ast.expression.LiteralExpression;
 
 public class ASTField extends AbstractApexNode.Many<Node> implements CanSuppressWarnings {
 
-    private final TypeRef type;
     private final Identifier name;
     private final Optional<Expression> value;
+    private final String typeName;
 
-    ASTField(TypeRef type, Identifier name, Optional<Expression> value) {
+    ASTField(TypeRef typeRef, Identifier name, Optional<Expression> value) {
         super(value.isPresent()
-              ? Arrays.asList(type, name, value.get())
-              : Arrays.asList(type, name));
-        this.type = type;
+              ? Arrays.asList(typeRef, name, value.get())
+              : Arrays.asList(typeRef, name));
         this.name = name;
         this.value = value;
+        this.typeName = caseNormalizedTypeIfPrimitive(typeRef.asCodeString());
+    }
+
+    ASTField(EnumDeclaration enumType, Identifier name) {
+        super(Arrays.asList(name));
+        this.name = name;
+        this.value = Optional.empty();
+        this.typeName = enumType.getId().asCodeString();
     }
 
     @Override
@@ -52,8 +60,14 @@ public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         return false;
     }
 
+    /**
+     * Returns the type name.
+     *
+     * This includes any type arguments. (This is tested.)
+     * If the type is a primitive, its case will be normalized.
+     */
     public String getType() {
-        return type.asCodeString();
+        return typeName;
     }
 
     public ASTModifierNode getModifiers() {

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java

@@ -40,8 +40,14 @@ public ASTModifierNode getModifiers() {
         return getFirstChildOfType(ASTModifierNode.class);
     }
 
+    /**
+     * Returns the type name.
+     *
+     * This includes any type arguments.
+     * If the type is a primitive, its case will be normalized.
+     */
     public String getTypeName() {
-        return node.getType().asCodeString();
+        return caseNormalizedTypeIfPrimitive(node.getType().asCodeString());
     }
 
     /*
@@ -52,9 +58,9 @@ private static String identifiersToString(List<Identifier> identifiers) {
     // TODO(b/239648780)
 
     public List<String> getTypeArguments() {
+        /*
         List<String> result = new ArrayList<>();
 
-        /*
         if (node.getTypeName() != null) {
             List<TypeRef> typeArgs = node.getTypeName().getTypeArguments();
             for (TypeRef arg : typeArgs) {
@@ -71,6 +77,6 @@ public List<String> getTypeArguments() {
          */
         // TODO(b/239648780)
 
-        return result;
+        return new ArrayList<>();
     }
 }

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFormalComment.java

@@ -4,28 +4,16 @@
 
 package net.sourceforge.pmd.lang.apex.ast;
 
-import org.antlr.runtime.Token;
+import org.antlr.v4.runtime.Token;
 
-import com.google.summit.ast.Node;
+import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
 
+public class ASTFormalComment extends AbstractApexNode.Empty {
 
-public class ASTFormalComment extends AbstractApexNode.Single<Node> {
-
-    private final String image;
+    private final Token token;
 
     ASTFormalComment(Token token) {
-        // super(new AstComment(token));
-        // TODO(b/239648780)
-        super(null);
-        this.image = token.getText();
-    }
-
-    @Deprecated
-    public ASTFormalComment(String token) {
-        // super(new AstComment(null));
-        // TODO(b/239648780)
-        super(null);
-        image = token;
+        this.token = token;
     }
 
     @Override
@@ -35,51 +23,29 @@ public Object jjtAccept(ApexParserVisitor visitor, Object data) {
 
     @Override
     public String getImage() {
-        return image;
+        return token.getText();
     }
 
     public String getToken() {
-        return image;
+        return token.getText();
     }
 
-    /*
-    @Deprecated
-    @InternalApi
-    public static final class AstComment implements AstNode {
-
-        private final Location loc;
-
-        private AstComment(Token token) {
-            this.loc = token == null
-                       ? Locations.NONE
-                       : Locations.loc(token.getLine(), token.getCharPositionInLine() + 1);
-        }
-
-        @Override
-        public Location getLoc() {
-            return loc;
-        }
-
-        @Override
-        public <T extends Scope> void traverse(AstVisitor<T> astVisitor, T t) {
-            // do nothing
-        }
-
-        @Override
-        public void validate(SymbolResolver symbolResolver, ValidationScope validationScope) {
-            // do nothing
-        }
+    @Override
+    void calculateLineNumbers(SourceCodePositioner positioner) {
+        this.beginLine = positioner.lineNumberFromOffset(token.getStartIndex());
+        this.beginColumn = positioner.columnFromOffset(this.beginLine, token.getStartIndex());
+        this.endLine = positioner.lineNumberFromOffset(token.getStopIndex());
+        this.endColumn = positioner.columnFromOffset(this.endLine, token.getStopIndex());
+    }
 
-        @Override
-        public void emit(Emitter emitter) {
-            // do nothing
-        }
+    @Override
+    public boolean hasRealLoc() {
+        return true;
+    }
 
-        @Override
-        public TypeInfo getDefiningType() {
-            return TypeInfos.VOID;
-        }
+    @Override
+    public String getLocation() {
+        return String.format("[%d:%d,%d:%d]", this.beginLine, this.beginColumn,
+                this.endLine, this.endColumn);
     }
-     */
-    // TODO(b/239648780)
 }

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java

@@ -41,8 +41,10 @@ public LiteralType getLiteralType() {
             return LiteralType.DOUBLE;
         } else if (node instanceof LiteralExpression.LongVal) {
             return LiteralType.LONG;
-        } else if (false) { // TODO(b/239648780)
+        /* TODO(b/239648780): the parser must distinguish decimal vs. double
+        } else if (node instanceof LiteralExpression.DecimalVal) {
             return LiteralType.DECIMAL;
+        */
         } else if (node instanceof LiteralExpression.NullVal) {
             return LiteralType.NULL;
         } else {

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java

@@ -23,4 +23,9 @@ public class ASTMapEntryNode extends AbstractApexNode.Many<Expression> {
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
+
+    @Override
+    public String getImage() {
+        return String.format("%s: %s", key, value);
+    }
 }