0.15.4 - Fixes for parameter annotation parsing, and generic type parameter parsing, and C# parameter annotation parsing.

Author: TeamworkGuy2

.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="plugins"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre-9.0.1">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="limit-modules" value="java.se,java.xml.ws.annotation"/>
@@ -14,7 +14,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-annotations-2.5.0.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/src/jackson-annotations-2.5.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/doc/jackson-annotations-2.5.0-javadoc.jar!/"/>
@@ -55,4 +54,5 @@
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/bin/jtree_walker.jar" sourcepath="/JTreeWalker"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtuples/bin/jtuples.jar" sourcepath="/JTuples"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/bin/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.md

@@ -4,7 +4,26 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.15.3](N/A) - 2017-12-30
+### [0.15.4](N/A) - 2018-09-13
+#### Added
+* Annotations to parameter signatures (with basic parameter annotation parsing added to `MethodParametersParser.extractParamsFromSignature()`)
+* Documented DataTypeExtractor methods
+* Added/Improved test cases for:
+  * Class signatures (generics, multiple extend/implement types)
+  * Generic types with multiple parameters
+  * Annotations on method parameters
+  * TODO: fix failing test for default parameters
+
+#### Removed
+* Old code from MainParser
+
+#### Fixed
+* `CsBlockParser.readClassIdentifierAndExtends()` was incorrectly trying to parse `new {` object initializer blocks as class declarations
+* DataTypeExtractor was reversing the parameter order of multi-paremeter generic types
+
+
+--------
+### [0.15.3](https://github.com/TeamworkGuy2/JParseCode/commit/7704ebf8f49e2841dc9e362fef1752252e283b71) - 2017-12-30
 #### Changed
 * Update dependency `jtwg2-logging@0.3.0`
 

README.md

@@ -1,8 +1,8 @@
 JParseCode
 ==============
-version: 0.15.3
+version: 0.15.4
 
-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. 
+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. 
 
 ### Goals:
 * A source code parser that can turn C#, Java, or JavaScript/TypeScript code into a simple AST like structure ('competent' meaning this project aims to support common use cases, not every syntatic feature of the supported languages). 
@@ -18,60 +18,60 @@ Example:
 
 Source Code (SimpleCs.cs):
 ```C#
-	namespace ParserExamples.Samples {
+namespace ParserExamples.Samples {
 
-		/// <summary>
-		/// A simple class to test parsing.
-		/// </summary>
-		public class SimpleCs {
+	/// <summary>
+	/// A simple class to test parsing.
+	/// </summary>
+	public class SimpleCs {
 
-			/// <value>The modification count.</value>
-			private int mod;
+		/// <value>The modification count.</value>
+		private int mod;
 
-			/// <value>The name.</value>
-			private string _name;
+		/// <value>The name.</value>
+		private string _name;
 
-			/// <value>The names.</value>
-			public IList<string> Names { get; }
+		/// <value>The names.</value>
+		public IList<string> Names { get; }
 
-			/// <value>The number of names.</value>
-			public int Count { set; }
+		/// <value>The number of names.</value>
+		public int Count { set; }
 
-			/// <value>The access timestamps.</value>
-			public DateTime[] accesses { set { this.mod++; this.accesses = value; } }
+		/// <value>The access timestamps.</value>
+		public DateTime[] accesses { set { this.mod++; this.accesses = value; } }
 
-			/// <value>The access timestamps.</value>
-			public string name { get { this.mod++; return this._name; } set { this.mod++; this._name = value; } }
-
-			/// <summary>Add name</summary>
-			/// <param name="name">the name</param>
-			/// <returns>the names</returns>
-			[OperationContract]
-			[WebInvoke(Method = "POST", UriTemplate = "/AddName?name={name}",
-					ResponseFormat = WebMessageFormat.Json)]
-			[TransactionFlow(TransactionFlowOption.Allowed)]
-			Result<IList<String>> AddName(string name) {
-				content of block;
-			}
+		/// <value>The access timestamps.</value>
+		public string name { get { this.mod++; return this._name; } set { this.mod++; this._name = value; } }
 
+		/// <summary>Add name</summary>
+		/// <param name="name">the name</param>
+		/// <returns>the names</returns>
+		[OperationContract]
+		[WebInvoke(Method = "POST", UriTemplate = "/AddName?name={name}",
+				ResponseFormat = WebMessageFormat.Json)]
+		[TransactionFlow(TransactionFlowOption.Allowed)]
+		Result<IList<String>> AddName(string name) {
+			content of block;
 		}
 
 	}
+
+}
 ```
 
 
 Java code to parser SimpleCs.cs (simple_cs_source_string is a string containing the contents of SimpleCs.cs):
 ```Java
-	CodeFileSrc<CodeLanguage> simpleCsAst = ParseCodeFile.parseCode("SimpleCs.cs", CodeLanguageOptions.C_SHARP, simple_cs_source_string);
-	WriteSettings ws = new WriteSettings(true, true, true, true);
-	
-	for(Map.Entry<SimpleTree<CodeToken>, ClassAst.SimpleImpl<CsBlock>> block : CodeLanguageOptions.C_SHARP.getExtractor().extractClassFieldsAndMethodSignatures(simpleCsAst.getDoc())) {
-		CodeFileParsed.Simple<String, CsBlock> fileParsed = new CodeFileParsed.Simple<>("SimpleCs.cs", block.getValue(), block.getKey());
-	
-		StringBuilder sb = new StringBuilder();
-		fileParsed.getParsedClass().toJson(sb, ws);
-		System.out.println(sb.toString()); // Print the parsed AST to System.out
-	}
+CodeFileSrc<CodeLanguage> simpleCsAst = ParseCodeFile.parseCode("SimpleCs.cs", CodeLanguageOptions.C_SHARP, simple_cs_source_string);
+WriteSettings ws = new WriteSettings(true, true, true, true);
+
+for(Map.Entry<SimpleTree<CodeToken>, ClassAst.SimpleImpl<CsBlock>> block : CodeLanguageOptions.C_SHARP.getExtractor().extractClassFieldsAndMethodSignatures(simpleCsAst.getDoc())) {
+	CodeFileParsed.Simple<String, CsBlock> fileParsed = new CodeFileParsed.Simple<>("SimpleCs.cs", block.getValue(), block.getKey());
+
+	StringBuilder sb = new StringBuilder();
+	fileParsed.getParsedClass().toJson(sb, ws);
+	System.out.println(sb.toString()); // Print the parsed AST to System.out
+}
 ```
 
 
@@ -190,10 +190,10 @@ path/to/java -jar path/to/jparse-code.jar
  -log './output/parser.log'
 ```
 Where ./src/java/Server/** is where source files are kept
-And the files in ./src/java/Server/Services belong to the C# namespace 'App.Services' and ./src/java/Server/Models/ belong to the C# namespace 'App.Entities'
+And the files in ./src/java/Server/Services belong to the C# namespace `App.Services` and ./src/java/Server/Models/ belong to the C# namespace `App.Entities`
 
 
-###Sources
+#### Sources
 A semicolon separated list of paths set equal to a directory depth followed by a comma and a comma separated, brackets wrapped, list of file extensions. 
 The path, child directory depth, and file extensions are used to create a file system filter and all matching files are parsed.
 The following formats are valid:
@@ -202,18 +202,18 @@ The following formats are valid:
 'path'
 
 Example: ```/project/myApp/Models=3,[java,json]```
-Note: the brackets around '[fileExt]' are literal.
+Note: the brackets around the '[java,json]' file extension list are literal.
 
 
-###Destinations
+#### Destinations
 A semicolon separated list of output file names associated with lists of namespaces.  Each parsed file who's namespace falls into one of these lists is written to that file. 
 The following format is valid:
 'path=[namespace,namespace,...]'
 
 Example: ```/project/output/models.json=[MyApp.Models]```
 
 
-####Log
+#### Log
 An optional log file name to write parser information to, in the format:
 'path'
 

bin/jparse_code-with-tests.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.15.3",
+	"version" : "0.15.4",
 	"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

@@ -23,7 +23,7 @@ public interface ITrackSearchService
         [WebInvoke(Method = "POST", UriTemplate = "/TrackSearch",
             RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
         [TransactionFlow(TransactionFlowOption.Allowed)]
-        SearchResult<TrackInfo> Search(TrackSearchCriteria criteria) { ; }
+        SearchResult<TrackInfo<string>, AlbumInfo<string>> Search(TrackSearchCriteria criteria) { ; }
 
         /// <summary>
         /// Searches tracks that have past due date.

package-lib.json

@@ -1 +1 @@
-package ParserExamples.Services;import System.ServiceModel;import System.ServiceModel.Web;import ParserExamples.Models;import ParserExamples.Searching;/// <summary>/// This interface provides the contract for track searching./// </summary>/// <remarks>/// Implementations are expected to be effectively thread-safe./// </remarks>[ServiceContract]public interface ITrackSearchService{	/// <summary>	/// Searches tracks.	/// </summary>	/// <param name="criteria">The search criteria</param>	/// <returns>The search result</returns>	@OperationContract	@WebInvoke(Method = "POST", UriTemplate = "/TrackSearch",		RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)	@TransactionFlow(TransactionFlowOption.Allowed)	SearchResult<TrackInfo> Search(TrackSearchCriteria criteria) { ; }	/// <summary>	/// Searches tracks that have past due date.	/// </summary>	/// <param name="albumName">The album name</param>	/// <returns>The search result</returns>	@OperationContract	@WebInvoke(Method = "POST", UriTemplate = "/GetAlbumTracks?albumName={albumName}",		ResponseFormat = WebMessageFormat.Json)	@TransactionFlow(TransactionFlowOption.Allowed)	SearchResult<Dictionary<AlbumInfo, List<TrackInfo>>> GetAlbumTracks(String albumName) {		content of block;	}}
+package ParserExamples.Services;import System.ServiceModel;import System.ServiceModel.Web;import ParserExamples.Models;import ParserExamples.Searching;/// <summary>/// This interface provides the contract for track searching./// </summary>/// <remarks>/// Implementations are expected to be effectively thread-safe./// </remarks>[ServiceContract]public interface ITrackSearchService{	/// <summary>	/// Searches tracks.	/// </summary>	/// <param name="criteria">The search criteria</param>	/// <returns>The search result</returns>	@OperationContract	@WebInvoke(Method = "POST", UriTemplate = "/TrackSearch",		RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)	@TransactionFlow(TransactionFlowOption.Allowed)	SearchResult<TrackInfo<String>, AlbumInfo<String>> Search(TrackSearchCriteria criteria) { ; }	/// <summary>	/// Searches tracks that have past due date.	/// </summary>	/// <param name="albumName">The album name</param>	/// <returns>The search result</returns>	@OperationContract	@WebInvoke(Method = "POST", UriTemplate = "/GetAlbumTracks?albumName={albumName}",		ResponseFormat = WebMessageFormat.Json)	@TransactionFlow(TransactionFlowOption.Allowed)	SearchResult<Dictionary<AlbumInfo, List<TrackInfo>>> GetAlbumTracks(String albumName) {		content of block;	}}

rsc/csharp/ParserExamples/Services/ITrackSearchService.cs

@@ -45,4 +45,48 @@ public String toString() {
 		return "annotation: " + name + "(" + arguments + ")";
 	}
 
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (arguments == null ? 0 : arguments.hashCode());
+		result = prime * result + (fullName == null ? 0 : fullName.hashCode());
+		result = prime * result + (name == null ? 0 : name.hashCode());
+		return result;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null || this.getClass() != obj.getClass())
+			return false;
+
+		AnnotationSig other = (AnnotationSig) obj;
+		if (arguments == null) {
+			if (other.arguments != null)
+				return false;
+		}
+		else if (!arguments.equals(other.arguments))
+			return false;
+
+		if (fullName == null) {
+			if (other.fullName != null)
+				return false;
+		}
+		else if (!fullName.equals(other.fullName))
+			return false;
+
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		}
+		else if (!name.equals(other.name))
+			return false;
+
+		return true;
+	}
+
 }

rsc/java/ParserExamples/Services/ITrackSearchService.java

@@ -7,6 +7,7 @@
 import lombok.Getter;
 import lombok.val;
 import twg2.annotations.Immutable;
+import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.io.json.stringify.JsonStringify;
 import twg2.parser.codeParser.AccessModifier;
 import twg2.parser.output.JsonWritableSig;
@@ -22,6 +23,7 @@ public class ParameterSig implements JsonWritableSig {
 	final @Getter String name;
 	final @Getter String typeSimpleName;
 	final @Getter List<AccessModifier> parameterModifiers;
+	final @Getter List<AnnotationSig> annotations;
 	final @Getter boolean optional;
 	final @Getter String defaultValue;
 
@@ -38,6 +40,11 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 		json.comma(dst).propName("parameterModifiers", dst)
 			.toStringArray(parameterModifiers, dst, (acs) -> acs.toSrc());
 
+		if(annotations != null) {
+			json.comma(dst).propName("annotations", dst)
+				.toArrayConsume(annotations, dst, (ann) -> ann.toJson(dst, st));
+		}
+
 		if(optional) {
 			json.comma(dst).toProp("optional", optional, dst);
 		}

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

@@ -7,6 +7,7 @@
 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;
@@ -23,6 +24,7 @@ public class ParameterSigResolved implements JsonWritableSig {
 	final @Getter String name;
 	final @Getter TypeSig.TypeSigResolved type;
 	final @Getter List<AccessModifier> parameterModifiers;
+	final @Getter List<AnnotationSig> annotations;
 	final @Getter boolean optional;
 	final @Getter String defaultValue;
 
@@ -41,6 +43,11 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 		json.comma(dst).propName("parameterModifiers", dst)
 			.toStringArray(parameterModifiers, dst, (acs) -> acs.toSrc());
 
+		if(annotations != null) {
+			json.comma(dst).propName("annotations", dst)
+				.toArrayConsume(annotations, dst, (ann) -> ann.toJson(dst, st));
+		}
+
 		if(optional) {
 			json.comma(dst).toProp("optional", optional, dst);
 		}

src/twg2/ast/interm/method/ParameterSig.java

@@ -170,7 +170,7 @@ public static void _extractBlocksFromTree(List<String> nameScope, SimpleTree<Cod
 	 * @return {@code <className, extendImplementNames>}
 	 */
 	private static Entry<String, List<String>> readClassIdentifierAndExtends(EnhancedListBuilderIterator<SimpleTree<CodeToken>> iter) {
-		val lang = CodeLanguageOptions.C_SHARP;
+		val keywords = CodeLanguageOptions.C_SHARP.getKeywordUtil();
 		// class signatures are read backward from the opening '{'
 		int prevCount = 0;
 		val names = new ArrayList<String>();
@@ -180,8 +180,11 @@ private static Entry<String, List<String>> readClassIdentifierAndExtends(Enhance
 		if(iter.hasPrevious()) { prevCount++; }
 		SimpleTree<CodeToken> prevNode = iter.hasPrevious() ? iter.previous() : null;
 
-		// TODO should read ', ' between each name, currently only works with 1 extend/implement class name
-		while(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !lang.getKeywordUtil().blockModifiers().is(prevNode.getData()) && !lang.getKeywordUtil().isInheritanceKeyword(prevNode.getData().getText())) {
+		while(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !keywords.blockModifiers().is(prevNode.getData()) && !keywords.isInheritanceKeyword(prevNode.getData().getText())) {
+			// found an object initializer in the form 'new [Abc] {', not a class/interface definition so return nothing
+			if(names.size() < 2 && CsKeyword.NEW.toSrc().equals(prevNode.getData().getText())) {
+				break;
+			}
 			names.add(prevNode.getData().getText());
 			prevNode = iter.hasPrevious() ? iter.previous() : null;
 			if(iter.hasPrevious()) { prevCount++; }
@@ -191,7 +194,7 @@ private static Entry<String, List<String>> readClassIdentifierAndExtends(Enhance
 		if(prevNode != null && prevNode.getData().getText().equals(":")) {
 			prevNode = iter.hasPrevious() ? iter.previous() : null;
 			if(iter.hasPrevious()) { prevCount++; }
-			if(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !lang.getKeywordUtil().blockModifiers().is(prevNode.getData())) {
+			if(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !keywords.blockModifiers().is(prevNode.getData())) {
 				Collections.reverse(names);
 				val extendImplementNames = names;
 				val className = prevNode.getData().getText();