0.10.1 - Fixed minor annotation named parameter parsing issue when annotation only had one parameter.

Author: TeamworkGuy2

README.md

@@ -1,6 +1,6 @@
 ParserToolsTmp
 ==============
-version: 0.10.0
+version: 0.10.1
 
 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. 
 

package-lib.json

@@ -1,5 +1,5 @@
 {
-	"version" : "0.10.0",
+	"version" : "0.10.1",
 	"name" : "jparser-tools",
 	"description" : "An in-progress suite of parsing tools for C#, Java, and TypeScript source code",
 	"homepage" : "https://github.com/TeamworkGuy2/JFileIo",

src/twg2/parser/codeParser/extractors/AnnotationExtractor.java

@@ -31,6 +31,7 @@ public static AnnotationSig parseAnnotationBlock(CodeLanguage lang, CodeFragment
 		if(annotNameType != CodeFragmentType.IDENTIFIER) { throw new IllegalArgumentException("annotation node expected to contain identifier, found '" + annotName + "'"); }
 
 		val params = new HashMap<String, String>();
+		boolean firstParamUnnamed = false;
 
 		// parse an annotation '(arguments, ...)'
 		if(size > 0) {
@@ -52,6 +53,9 @@ public static AnnotationSig parseAnnotationBlock(CodeLanguage lang, CodeFragment
 				}
 				else {
 					paramName = "arg" + (params.size() + 1);
+					if(params.size() == 0) {
+						firstParamUnnamed = true;
+					}
 				}
 
 				// parse the annotation argument value
@@ -93,7 +97,7 @@ else if(paramType == CodeFragmentType.IDENTIFIER) {
 		else {
 		}
 
-		if(params.size() == 1) {
+		if(params.size() == 1 && firstParamUnnamed) {
 			params.put("value", params.get("arg1"));
 			params.remove("arg1");
 		}

src/twg2/parser/main/MainParser.java

@@ -22,7 +22,6 @@
 import twg2.parser.language.CodeLanguage;
 import twg2.parser.output.WriteSettings;
 import twg2.parser.project.ProjectClassSet;
-import twg2.parser.test.JavaClassParseTest;
 import twg2.text.stringUtils.StringJoin;
 
 /**
@@ -79,11 +78,6 @@ public static void main(String[] args) throws IOException, FileFormatException {
 		ExecutorService executor = multithread ? Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()) : null;
 		FileReadUtil fileReader = FileReadUtil.threadLocalInst();
 
-		new JavaClassParseTest().simpleJavaParseTest();
-		if(3.5/1.1 > 1.2) {
-			return;
-		}
-
 		if(args.length > 0) {
 			// TODO for VisualVM pause
 			//Scanner in = new Scanner(System.in);

test/twg2/parser/test/CsClassParseTest.java

@@ -48,7 +48,7 @@ public class CsClassParseTest {
 		"    [IntAnnotation(-1)]\n" +
 		"    [BoolAnnotation(true)]\n" +
 		"    [IdentifierAnnotation(Integer.TYPE)]\n" +
-		"    [StringAnnotation(\"\")]\n" +
+		"    [StringAnnotation(Name = \"\")]\n" +
 		"    [MultiArgAnnotation(\"abc\", false , 1.23)]\n" +
 		"    [MultiNamedArgAnnotation(num =1.23, flag=false ,value = \"abc\")]\n" +
 		"    private int mod;\n" +
@@ -149,8 +149,8 @@ public void simpleCsParseTest() {
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 2, "BoolAnnotation", new String[] { "value" }, "true");
 		// annotation: IdentifierAnnotation(Integer.TYPE)
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 3, "IdentifierAnnotation", new String[] { "value" }, "Integer.TYPE");
-		// annotation: StringAnnotation("")
-		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 4, "StringAnnotation", new String[] { "value" }, "");
+		// annotation: StringAnnotation(Name = "")
+		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 4, "StringAnnotation", new String[] { "Name" }, "");
 		// annotation: MultiArgAnnotation(\"abc\", false, 1.23)
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 5, "MultiArgAnnotation", new String[] { "arg1", "arg2", "arg3" }, "abc", "false", "1.23");
 		// annotations: MultiNamedArgAnnotation(num =1.23, flag=false ,value = "abc")

test/twg2/parser/test/JavaClassParseTest.java

@@ -48,7 +48,7 @@ public class JavaClassParseTest {
 		"    @IntAnnotation(-1)]\n" +
 		"    @BoolAnnotation(true)]\n" +
 		"    @IdentifierAnnotation(Integer.TYPE)]\n" +
-		"    @StringAnnotation(\"\")]\n" +
+		"    @StringAnnotation(Name = \"\")]\n" +
 		"    @MultiArgAnnotation(\"abc\", false , 1.23)\n" +
 		"    @MultiNamedArgAnnotation(num =1.23, flag=false ,value = \"abc\")\n" +
 		"    private int mod;\n" +
@@ -145,8 +145,8 @@ public void simpleJavaParseTest() {
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 2, "BoolAnnotation", new String[] { "value" }, "true");
 		// annotations: IdentifierAnnotation(Integer.TYPE)
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 3, "IdentifierAnnotation", new String[] { "value" }, "Integer.TYPE");
-		// annotations: StringAnnotation("")
-		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 4, "StringAnnotation", new String[] { "value" }, "");
+		// annotations: StringAnnotation(Name = "")
+		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 4, "StringAnnotation", new String[] { "Name" }, "");
 		// annotations: MultiArgAnnotation("abc", false , 1.23)
 		ParseAnnotationTest.assertAnnotation(f.getAnnotations(), 5, "MultiArgAnnotation", new String[] { "arg1", "arg2", "arg3" }, "abc", "false", "1.23");
 		// annotations: MultiNamedArgAnnotation(num =1.23, flag=false ,value = "abc")

versions.md

@@ -1,10 +1,20 @@
 --------
 ####0.10.0
-date: 2016-4-12
+date: 2016-4-13
 
 commit: ?
 
+* Fixed minor bug in annotation named parameter parsing when annotation only had one parameter
+
+
+--------
+####0.10.0
+date: 2016-4-12
+
+commit: 3e8a324ccada6af273339e6f29ae569795e3abcd
+
 * Added better annotation parsing, including support for negative numbers as arguments
+* Fixed ParserWorkflow to generate and group all results by destination file before writing (previously a writer was opened in overwrite mode for each destination group, thereby overwriting data written to the same file by a previous destination group during the same program execution)
 * Added CodeFragment which extends 'DocumentFragmentText<CodeFragmentType>' so don't have to keep typing that every time, updated most of the code to use CodeFragment
 * Added OperatorUtil and Operator (with C# and Java implementation enums) similar to the existing Keyword enums
 * Refactored how we use EnumSubSet and enum sub-categorization