0.20.0 - Add method generic type parameters support and several in-testing performance optimizations. Several dependency updates.

Author: TeamworkGuy2

CHANGELOG.md

@@ -4,7 +4,34 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.19.2](N/A) - 2020-05-23
+### [0.20.0](N/A) - 2020-11-22
+__Method generic type parameters parsing support__ (i.e. 'public T Create<T>()' in C#).
+#### Added
+* Method generic type parameters added - `MethodSig` and sub-classes have a new `typeParameters` field. Note: if these 'types' contain lower/upper type bounds these are included in the `typeName` property in Java and are not yet included in C# parsing
+  * Added basic unit tests for this new method generic type parameters parsing support
+* `AstFragType.isBlock(CodeToken, char)` overload for attempted performance optimization
+
+#### Changed
+* Renamed `DataTypeExtractor` -> `TypeExtractor`
+* Added `EnhancedListIterator` as a replacement for `TokenListIterable` to try and simplify fragment iteration since it is a fairly hot section of code in most parsing scenarios
+* `ParseTimes.TrackerAction` enums renamed:
+  * `LOAD` -> `READ`
+  * `PARSE` -> `EXTRACT_AST`
+* Update dependency [email protected] and code to match
+  * Adjustments to `new CharParserMatchableFactory()` and `CharConditions.Identifier.newInstance()` calls in `IdentifierTokenizer` and `NumberTokenizer`
+* JSON output now excludes empty `annotations` arrays on fields, methods, and parameters
+* Additional performance log counters added to several methods and printed when performance info is enabled via `-debug` CLI flag
+
+#### Removed
+* `AstFragType.isType()` static method and overloads since they were unused
+* Unused `CommentTokenizer.createCommentTokenizerForJava()`
+
+#### Fixed
+* An exception being thrown when resolving class names if a file imported a namespace and also imported a child namespace of the first namespace
+
+
+--------
+### [0.19.2](https://github.com/TeamworkGuy2/JParseCode/commit/9967d655b7c274b8d58892ab74b7fd1fe4dea522) - 2020-05-23
 __Parameter varargs parsing support__ (i.e. 'int...' in Java).
 #### Changed
 * Update dependency `[email protected]` and `[email protected]`

bin/jparse_code-with-tests.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.19.2",
+	"version" : "0.20.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

@@ -33,8 +33,13 @@ public int CompareTo(Implementer other) {
 
 
         public void GetObjectData(SerializationInfo info, StreamingContext context) {
+            var a = Int32.Parse("");
         }
 
+
+        public TType Refresh<TType>(TType tt) where TType : IConvertible {
+            return tt;
+        }
     }
 
 }

package-lib.json

@@ -33,4 +33,9 @@ public int compareTo(TrackInfo o) {
 		return other != null ? (this.Name != null ? this.Name.CompareTo(other.Name) : (other.Name != null ? 1 : 0)) : (this.Name != null ? -1 : 0);
 	}
 
+
+	public <TType extends Number> TType refresh(TType tt) {
+		return tt;
+	}
+
 }

rsc/csharp/ParserExamples/Models/TrackInfo.cs

@@ -4,20 +4,25 @@
 import java.util.List;
 import java.util.Map;
 
-import lombok.AllArgsConstructor;
 import twg2.annotations.Immutable;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.JsonWritableSig;
 import twg2.parser.output.WriteSettings;
 
 @Immutable
-@AllArgsConstructor
 public class AnnotationSig implements JsonWritableSig {
 	public final String name;
 	public final List<String> fullName;
 	public final Map<String, String> arguments;
 
 
+	public AnnotationSig(String name, List<String> fullName, Map<String, String> arguments) {
+		this.name = name;
+		this.fullName = fullName;
+		this.arguments = arguments;
+	}
+
+
 	@Override
 	public void toJson(Appendable dst, WriteSettings st) throws IOException {
 		dst.append(" {");

rsc/java/ParserExamples/Models/TrackInfo.java

@@ -3,11 +3,11 @@
 import java.io.IOException;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import twg2.annotations.Immutable;
 import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.ast.interm.type.TypeSig;
+import twg2.ast.interm.type.TypeSig.TypeSigResolved;
 import twg2.io.json.stringify.JsonStringify;
 import twg2.parser.codeParser.Keyword;
 import twg2.parser.codeParser.tools.NameUtil;
@@ -18,7 +18,6 @@
  * @since 2015-12-5
  */
 @Immutable
-@AllArgsConstructor
 public class ClassSigResolved implements ClassSig {
 	private final @Getter List<String> fullName;
 	/** This type's generic type parameters, if any */
@@ -33,6 +32,25 @@ public class ClassSigResolved implements ClassSig {
 	private final @Getter List<TypeSig.TypeSigResolved> implementInterfaces;
 
 
+	public ClassSigResolved(List<String> fullName, List<? extends TypeSigResolved> params, Keyword accessModifier, List<? extends AnnotationSig> annotations,
+			String declarationType, TypeSigResolved extendClass, List<? extends TypeSigResolved> implementInterfaces) {
+		@SuppressWarnings("unchecked")
+		var paramsCast = (List<TypeSigResolved>)params;
+		@SuppressWarnings("unchecked")
+		var annotationsCast = (List<AnnotationSig>)annotations;
+		@SuppressWarnings("unchecked")
+		var implementInterfacesCast = (List<TypeSigResolved>)implementInterfaces;
+
+		this.fullName = fullName;
+		this.params = paramsCast;
+		this.accessModifier = accessModifier;
+		this.annotations = annotationsCast;
+		this.declarationType = declarationType;
+		this.extendClass = extendClass;
+		this.implementInterfaces = implementInterfacesCast;
+	}
+
+
 	@Override
 	public String getSimpleName() {
 		return fullName.get(fullName.size() - 1);

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

@@ -3,18 +3,17 @@
 import java.io.IOException;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import twg2.annotations.Immutable;
 import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.ast.interm.type.TypeSig;
+import twg2.ast.interm.type.TypeSig.TypeSigSimple;
 import twg2.io.json.stringify.JsonStringify;
 import twg2.parser.codeParser.Keyword;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.WriteSettings;
 
 @Immutable
-@AllArgsConstructor
 public class ClassSigSimple implements ClassSig {
 	private final @Getter List<String> fullName;
 	/** This type's generic type parameters, if any */
@@ -28,6 +27,22 @@ public class ClassSigSimple implements ClassSig {
 	private final @Getter List<String> extendImplementSimpleNames;
 
 
+
+	public ClassSigSimple(List<String> fullName, List<? extends TypeSigSimple> params, Keyword accessModifier, List<? extends AnnotationSig> annotations, String declarationType, List<String> extendImplementSimpleNames) {
+		@SuppressWarnings("unchecked")
+		var paramsCast = (List<TypeSigSimple>)params;
+		@SuppressWarnings("unchecked")
+		var annotationsCast = (List<AnnotationSig>)annotations;
+
+		this.fullName = fullName;
+		this.params = paramsCast;
+		this.accessModifier = accessModifier;
+		this.annotations = annotationsCast;
+		this.declarationType = declarationType;
+		this.extendImplementSimpleNames = extendImplementSimpleNames;
+	}
+
+
 	@Override
 	public String getSimpleName() {
 		return fullName.get(fullName.size() - 1);

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

@@ -9,7 +9,7 @@
 import twg2.ast.interm.type.TypeSig.TypeSigSimple;
 import twg2.io.json.stringify.JsonStringify;
 import twg2.parser.codeParser.Keyword;
-import twg2.parser.codeParser.extractors.DataTypeExtractor;
+import twg2.parser.codeParser.extractors.TypeExtractor;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.fragment.CodeToken;
 import twg2.parser.fragment.CodeTokenType;
@@ -46,8 +46,10 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 		json.comma(dst).propName("accessModifiers", dst)
 			.toStringArray(accessModifiers, dst, (acs) -> acs.toSrc());
 
-		json.comma(dst).propName("annotations", dst)
-			.toArrayConsume(annotations, dst, (ann) -> ann.toJson(dst, st));
+		if(annotations != null && annotations.size() > 0) {
+			json.comma(dst).propName("annotations", dst)
+				.toArrayConsume(annotations, dst, (ann) -> ann.toJson(dst, st));
+		}
 
 		initializerToJson(initializer, true, dst, st);
 
@@ -72,7 +74,7 @@ public static void initializerToJson(SimpleTree<CodeToken> astNode, boolean preC
 		boolean isNumOrBoolOrNull = false;
 		if(astNode != null && !astNode.hasChildren() && (data = astNode.getData()) != null &&
 				(data.getTokenType() == CodeTokenType.STRING ||
-				(isNumOrBoolOrNull = DataTypeExtractor.isDefaultValueLiteral(data)))) {
+				(isNumOrBoolOrNull = TypeExtractor.isDefaultValueLiteral(data)))) {
 			if(preClosingComma) {
 				dst.append(", ");
 			}
@@ -91,7 +93,7 @@ else if(astNode != null && astNode.hasChildren()) {
 				dst.append(", ");
 			}
 			dst.append("\"initializerExpression\": ");
-			if((data = astNode.getData()) != null && !DataTypeExtractor.isNullLiteral(data)) {
+			if((data = astNode.getData()) != null && !TypeExtractor.isNullLiteral(data)) {
 				dst.append('"');
 				dst.append(StringEscapeJson.toJsonString(data.getText()));
 				dst.append('"');