0.16.0 - Added class annotation parsing, renamed AccessModifier to Keyword, renamed 2 ProjectClassSet methods, removed unused AstNodeConsumer and AstNodePredicate interfaces.

Author: TeamworkGuy2

CHANGELOG.md

@@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file.
 This project does its best to adhere to [Semantic Versioning](http://semver.org/).
 
 
+--------
+### [0.16.0](N/A) - 2019-03-17
+#### Added
+* Class signature annotation parsing (in `BlockExtractor`, `CsBlockParser`, and `JavaBlockParser`)
+
+#### Changed
+* Simplified `ProjectClassSet` (removed two unnecessary generic parameters, renamed private fields):
+  * Renamed `resolveSimpleNameToClass()` -> `resolveClassNameAgainstNamespaces()`
+  * Renamed `resolveSimpleNameToClassSingleNamespace()` -> `resolveClassNameAgainstNamespace()`
+* Performance improvements to collection allocations in `NameUtil` and `ClassSigResolver`
+* Renamed `AccessModifier` interface to `Keyword`
+* `PerformanceTrackers.getTopParseTimes()` and `getTopParseStepDetails()` switched first parameter from `javax.swing.SortOrder` to `boolean`
+
+#### Removed
+* Unused `AstNodeConsumer` and `AstNodePredicate` interfaces
+* Removed lombok.val usage/dependency from several classes and packages in favor of Java 10 `var` or actual type.
+
+#### Fixed
+* Bug in TokenizeStepLogger trying to `StringCase.toCamelCase()` action names
+
+
 --------
 ### [0.15.7](https://github.com/TeamworkGuy2/JParseCode/commit/b36432e04ec4757a2e58102e88e4fe55c65965c4) - 2018-09-23
 #### Changed
@@ -118,7 +139,7 @@ Simplified class names and generic type signatures:
 --------
 ### [0.14.2](https://github.com/TeamworkGuy2/JParseCode/commit/c9ff08c26752a18e8f38e4365181876d81461190) - 2017-02-06
 #### Changed
-* Removed lombok.val usage/dependency from from test classes.
+* Removed lombok.val usage/dependency from test classes.
 
 #### Fixed
 * Fixed parsing C# classes that extend/implement multiple types, unrecognized types are assumed to possibly be interfaces.

README.md

@@ -1,6 +1,6 @@
 JParseCode
 ==============
-version: 0.15.7
+version: 0.16.0
 
 In progress C#/Java/TypeScript parser tools built atop [JTextParser](https://github.com/TeamworkGuy2/JTextParser), [Jackson](https://github.com/FasterXML/jackson-core/) (core, databind, annotations) and half a dozen other utility libraries. 
 

bin/jparse_code-with-tests.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.15.7",
+	"version" : "0.16.0",
 	"name" : "jparse-code",
 	"description" : "An in-progress suite of parsing/transpilation tools for C#, Java, and TypeScript code.  Generates simple JSON ASTs.",
 	"homepage" : "https://github.com/TeamworkGuy2/JParseCode",

bin/jparse_code.jar

@@ -5,7 +5,6 @@
 import java.util.Map;
 
 import lombok.AllArgsConstructor;
-import lombok.val;
 import twg2.annotations.Immutable;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.JsonWritableSig;
@@ -28,7 +27,7 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 			dst.append(", ");
 			dst.append("\"arguments\": { ");
 			boolean notFirst = false;
-			for(val argumentEntry : arguments.entrySet()) {
+			for(Map.Entry<String, String> argumentEntry : arguments.entrySet()) {
 				// TODO Csv style escape
 				dst.append((notFirst ? ", " : "") + '"' + argumentEntry.getKey() + "\": \"" + argumentEntry.getValue().replace("\"", "\\\"") + '"');
 				notFirst = true;

package-lib.json

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import lombok.Getter;
-import lombok.val;
 import twg2.annotations.Immutable;
 import twg2.ast.interm.field.FieldDef;
 import twg2.ast.interm.field.FieldDefResolved;
@@ -51,11 +50,11 @@ public static class Impl<T_SIG extends ClassSig, T_ENUM extends JsonWritableSig,
 
 		public Impl(T_SIG signature, List<List<String>> usingStatements, List<? extends T_FIELD> fields, List<? extends T_METHOD> methods, List<? extends T_ENUM> enums, T_BLOCK blockType) {
 			@SuppressWarnings("unchecked")
-			val fieldsCast = (List<T_FIELD>)fields;
+			var fieldsCast = (List<T_FIELD>)fields;
 			@SuppressWarnings("unchecked")
-			val methodsCast = (List<T_METHOD>)methods;
+			var methodsCast = (List<T_METHOD>)methods;
 			@SuppressWarnings("unchecked")
-			val enumsCast = (List<T_ENUM>)enums;
+			var enumsCast = (List<T_ENUM>)enums;
 
 			this.signature = signature;
 			this.usingStatements = usingStatements;
@@ -68,7 +67,7 @@ public Impl(T_SIG signature, List<List<String>> usingStatements, List<? extends
 
 		@Override
 		public void toJson(Appendable dst, WriteSettings st) throws IOException {
-			val json = JsonStringify.inst;
+			var json = JsonStringify.inst;
 
 			dst.append("{\n");
 

src/twg2/ast/interm/annotation/AnnotationSig.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import twg2.parser.codeParser.AccessModifier;
+import twg2.parser.codeParser.Keyword;
 import twg2.parser.output.JsonWritableSig;
 
 /**
@@ -11,7 +11,7 @@
  */
 public interface ClassSig extends JsonWritableSig {
 
-	public AccessModifier getAccessModifier();
+	public Keyword getAccessModifier();
 
 	public List<String> getFullName();
 

src/twg2/ast/interm/classes/ClassAst.java

@@ -5,11 +5,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.val;
 import twg2.annotations.Immutable;
+import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.ast.interm.type.TypeSig;
 import twg2.io.json.stringify.JsonStringify;
-import twg2.parser.codeParser.AccessModifier;
+import twg2.parser.codeParser.Keyword;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.WriteSettings;
 
@@ -24,7 +24,9 @@ public class ClassSigResolved implements ClassSig {
 	/** This type's generic type parameters, if any */
 	private final @Getter List<TypeSig.TypeSigResolved> params;
 	/** The block's access (i.e. 'public', 'private', etc.) */
-	private final @Getter AccessModifier accessModifier;
+	private final @Getter Keyword accessModifier;
+	/** The block's annotations */
+	private final @Getter List<AnnotationSig> annotations;
 	/** The block's type (i.e. 'interface', 'class', 'enum', etc.) */
 	private final @Getter String declarationType;
 	private final @Getter TypeSig.TypeSigResolved extendClass;
@@ -44,7 +46,7 @@ public boolean isGeneric() {
 
 	@Override
 	public void toJson(Appendable dst, WriteSettings st) throws IOException {
-		val json = JsonStringify.inst;
+		var json = JsonStringify.inst;
 
 		dst.append("{ ");
 		json.toProp("access", accessModifier.toSrc(), dst).comma(dst)
@@ -66,6 +68,11 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 			json.toArrayConsume(implementInterfaces, dst, (intfType) -> intfType.toJson(dst, st));
 		}
 
+		if(annotations.size() > 0) {
+			json.comma(dst).propName("annotations", dst)
+				.toArrayConsume(annotations, dst, (a) -> a.toJson(dst, st));
+		}
+
 		dst.append(" }");
 	}
 

src/twg2/ast/interm/classes/ClassSig.java

@@ -5,11 +5,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.val;
 import twg2.annotations.Immutable;
+import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.ast.interm.type.TypeSig;
 import twg2.io.json.stringify.JsonStringify;
-import twg2.parser.codeParser.AccessModifier;
+import twg2.parser.codeParser.Keyword;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.WriteSettings;
 
@@ -20,7 +20,9 @@ public class ClassSigSimple implements ClassSig {
 	/** This type's generic type parameters, if any */
 	private final @Getter List<TypeSig.TypeSigSimple> params;
 	/** The block's access (i.e. 'public', 'private', etc.) */
-	private final @Getter AccessModifier accessModifier;
+	private final @Getter Keyword accessModifier;
+	/** The block's annotations */
+	private final @Getter List<AnnotationSig> annotations;
 	/** The block's type (i.e. 'interface', 'class', 'enum', etc.) */
 	private final @Getter String declarationType;
 	private final @Getter List<String> extendImplementSimpleNames;
@@ -39,7 +41,7 @@ public boolean isGeneric() {
 
 	@Override
 	public void toJson(Appendable dst, WriteSettings st) throws IOException {
-		val json = JsonStringify.inst;
+		var json = JsonStringify.inst;
 
 		dst.append("{ ");
 
@@ -60,6 +62,11 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 				.toStringArray(extendImplementSimpleNames, dst);
 		}
 
+		if(annotations.size() > 0) {
+			json.comma(dst).propName("annotations", dst)
+				.toArrayConsume(annotations, dst, (a) -> a.toJson(dst, st));
+		}
+
 		dst.append(" }");
 	}