0.10.0 - Added C# and Java enum parsing (see new class field 'initializer'/'initializerExpression' JSON field), major refactoring (package and class moving/renaming), added unit tests.

Author: TeamworkGuy2

.classpath

@@ -29,7 +29,7 @@
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jstreamish/bin/jstreamish.jar" sourcepath="/JStreamish"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/bin/jtext_parser.jar" sourcepath="/JTextParser"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-template/bin/jtext_template.jar" sourcepath="/JTextTemplate"/>
-	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/bin/jtext_util.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Projects/JTextParser/src"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/bin/jtext_util.jar" sourcepath="/JTextUtil"/>
 	<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"/>

CHANGELOG.md

@@ -4,8 +4,36 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-###[0.10.8](N/A) - 2016-09-02
-#### Changed 
+###[0.11.0](N/A) - 2016-09-05
+#### Added
+* __basic C# and Java enum parsing__
+  * Added twg2.ast.interm.field FieldDef and FieldDefResolved to represent enum members (TODO could use some clarification/refactoring)
+  * Added CsEnumMemberExtractor and JavaEnumMemberExtractor
+* Moved duplicate code from class that implemented AstParser into new AstParserReusableBase and AstMemberInClassParserReusable abstract classes (I know the names are a little awkward, suggestions are welcome)
+ * Added C# and Java unit tests for enum parsing
+ * Moved duplicate source code parsing logic for tests into new CodeFileAndAst class
+
+#### Changed
+* moved and renamed several packages and class names
+  * twg2.parser.baseAst and sub-packages split and moved to twg2.parser.codeParser and sub-packages
+    * twg2.parser.baseAst.tools -> twg2.parser.fragment
+    * twg2.parser.baseAst.CompoundBlock -> twg2.parser.codeParser.BlockType
+  * CsClassParser -> CsClassTokenizer
+  * JavaClassParser -> JavaClassTokenizer
+  * twg2.parser.codeParser.parsers -> twg2.parser.tokenizers and *Parser class name prefix changed to *Tokenizer
+* AccessModifierExtractor renamed readAccessModifier() -> parseAccessModifier() and readAccessModifierFromIter() -> readAccessModifiers()
+* CsBlock and JavaBlock renamed fromKeyword() -> parseKeyword() and tryFromKeyword() -> tryParseKeyword()
+* TypeSig renamed nested classes:
+  * Simple -> TypeSigSimple
+  * SimpleBaseImpl -> TypeSigSimpleBase
+  * SimpleGenericImpl -> TypeSigSimpleGeneric
+  * ResolvedBaseImpl -> TypeSigResolvedBase
+  * ResolvedGenericImpl -> TypeSigResolvedGeneric
+
+
+--------
+###[0.10.8](https://github.com/TeamworkGuy2/JParseCode/commit/a89e38e23341bb999ec136fc61212c8271ad4332) - 2016-09-02
+#### Changed
 * Updated dependency, switched jparser-data-type-like (now deprecated/removed) to jparse-primitive which is a separate project containing just the primitive parsing code from jparser-data-type-like
 * Renamed project from JParserTools -> JParseCode
 * Moved plugin-js/ -> plugin/node-js/

README.md

@@ -1,6 +1,6 @@
 JParseCode
 ==============
-version: 0.10.8
+version: 0.11.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.10.8",
+	"version" : "0.11.0",
 	"name" : "jparse-code",
 	"description" : "An in-progress suite of parsing tools for C#, Java, and TypeScript source code",
 	"homepage" : "https://github.com/TeamworkGuy2/JParseCode",

bin/jparse_code.jar

@@ -8,7 +8,7 @@
 import lombok.Getter;
 import lombok.val;
 import twg2.annotations.Immutable;
-import twg2.parser.baseAst.tools.NameUtil;
+import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.JsonWritableSig;
 import twg2.parser.output.WriteSettings;
 

package-lib.json

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import twg2.annotations.Immutable;
 import twg2.ast.interm.classes.ClassSig;
-import twg2.parser.baseAst.CompoundBlock;
+import twg2.parser.codeParser.BlockType;
 import twg2.parser.documentParser.CodeFragment;
 import twg2.treeLike.simpleTree.SimpleTree;
 
@@ -12,7 +12,7 @@
  * @since 2015-12-5
  */
 @Immutable
-public class BlockAst<T_BLOCK extends CompoundBlock> {
+public class BlockAst<T_BLOCK extends BlockType> {
 	private final @Getter ClassSig.SimpleImpl declaration;
 	private final @Getter SimpleTree<CodeFragment> blockTree;
 	private final @Getter T_BLOCK blockType;

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

@@ -6,14 +6,16 @@
 import lombok.Getter;
 import lombok.val;
 import twg2.annotations.Immutable;
+import twg2.ast.interm.field.FieldDef;
+import twg2.ast.interm.field.FieldDefResolved;
 import twg2.ast.interm.field.FieldSig;
 import twg2.ast.interm.field.FieldSigResolved;
 import twg2.ast.interm.method.MethodSig;
 import twg2.ast.interm.method.ParameterSig;
 import twg2.ast.interm.method.ParameterSigResolved;
 import twg2.io.write.JsonWrite;
-import twg2.parser.baseAst.CompoundBlock;
-import twg2.parser.baseAst.tools.NameUtil;
+import twg2.parser.codeParser.BlockType;
+import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.JsonWritableSig;
 import twg2.parser.output.WriteSettings;
 import twg2.text.stringUtils.StringJoin;
@@ -22,7 +24,7 @@
  * @author TeamworkGuy2
  * @since 2015-12-4
  */
-public interface ClassAst<T_SIG extends ClassSig, T_METHOD extends JsonWritableSig, T_BLOCK extends CompoundBlock> extends JsonWritableSig {
+public interface ClassAst<T_SIG extends ClassSig, T_METHOD extends JsonWritableSig, T_BLOCK extends BlockType> extends JsonWritableSig {
 
 	public T_SIG getSignature();
 
@@ -40,23 +42,31 @@ public interface ClassAst<T_SIG extends ClassSig, T_METHOD extends JsonWritableS
 	 * @since 2015-12-4
 	 */
 	@Immutable
-	public static class Impl<T_SIG extends ClassSig, T_FIELD extends JsonWritableSig, T_METHOD extends JsonWritableSig, T_PARAM extends JsonWritableSig, T_BLOCK extends CompoundBlock>
+	public static class Impl<T_SIG extends ClassSig, T_ENUM extends JsonWritableSig, T_FIELD extends JsonWritableSig, T_METHOD extends JsonWritableSig, T_PARAM extends JsonWritableSig, T_BLOCK extends BlockType>
 			implements ClassAst<T_SIG, T_METHOD, T_BLOCK> {
 		private final @Getter T_SIG signature;
 		private final @Getter List<List<String>> usingStatements;
+		private final @Getter List<T_ENUM> enumMembers;
 		private final @Getter List<T_FIELD> fields;
 		private final @Getter List<T_METHOD> methods;
 		private final @Getter T_BLOCK blockType;
 
 
-		public Impl(T_SIG signature, List<List<String>> usingStatements, List<? extends T_FIELD> fields, List<? extends T_METHOD> methods, T_BLOCK blockType) {
+		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;
 			@SuppressWarnings("unchecked")
 			val methodsCast = (List<T_METHOD>)methods;
+			@SuppressWarnings("unchecked")
+			val enumsCast = (List<T_ENUM>)enums;
+
+			if(enumsCast != null && enumsCast.size() > 0) {
+				System.out.println();
+			}
 
 			this.signature = signature;
 			this.usingStatements = usingStatements;
+			this.enumMembers = enumsCast;
 			this.fields = fieldsCast;
 			this.methods = methodsCast;
 			this.blockType = blockType;
@@ -77,6 +87,16 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
 			JsonWrite.joinStr(usingStatements, ", ", dst, (us) -> '"' + NameUtil.joinFqName(us) + '"');
 			dst.append("],\n");
 
+			if(enumMembers != null && blockType.isEnum()) {
+				dst.append("\t\"enumMembers\": [");
+				if(enumMembers.size() > 0) {
+					dst.append("\n\t\t");
+					JsonWrite.joinStrConsume(enumMembers, ",\n\t\t", dst, (f) -> f.toJson(dst, st));
+					dst.append("\n\t");
+				}
+				dst.append("],\n");
+			}
+
 			dst.append("\t\"fields\": [");
 			if(fields.size() > 0) {
 				dst.append("\n\t\t");
@@ -112,11 +132,11 @@ public String toString() {
 	 * @since 2016-1-2
 	 */
 	@Immutable
-	public static class SimpleImpl<T_BLOCK extends CompoundBlock> extends Impl<ClassSig.SimpleImpl, FieldSig, MethodSig.SimpleImpl, ParameterSig, T_BLOCK> {
+	public static class SimpleImpl<T_BLOCK extends BlockType> extends Impl<ClassSig.SimpleImpl, FieldDef, FieldSig, MethodSig.SimpleImpl, ParameterSig, T_BLOCK> {
 
 		public SimpleImpl(ClassSig.SimpleImpl signature, List<List<String>> usingStatements, List<? extends FieldSig> fields,
-				List<? extends MethodSig.SimpleImpl> methods, T_BLOCK blockType) {
-			super(signature, usingStatements, fields, methods, blockType);
+				List<? extends MethodSig.SimpleImpl> methods, List<? extends FieldDef> enums, T_BLOCK blockType) {
+			super(signature, usingStatements, fields, methods, enums, blockType);
 		}
 
 	}
@@ -129,11 +149,11 @@ public SimpleImpl(ClassSig.SimpleImpl signature, List<List<String>> usingStateme
 	 * @since 2015-12-4
 	 */
 	@Immutable
-	public static class ResolvedImpl<T_BLOCK extends CompoundBlock> extends Impl<ClassSig.ResolvedImpl, FieldSigResolved, MethodSig.ResolvedImpl, ParameterSigResolved, T_BLOCK> {
+	public static class ResolvedImpl<T_BLOCK extends BlockType> extends Impl<ClassSig.ResolvedImpl, FieldDefResolved, FieldSigResolved, MethodSig.ResolvedImpl, ParameterSigResolved, T_BLOCK> {
 
 		public ResolvedImpl(ClassSig.ResolvedImpl signature, List<List<String>> usingStatements, List<? extends FieldSigResolved> fields,
-				List<? extends MethodSig.ResolvedImpl> methods, T_BLOCK blockType) {
-			super(signature, usingStatements, fields, methods, blockType);
+				List<? extends MethodSig.ResolvedImpl> methods, List<? extends FieldDefResolved> enums, T_BLOCK blockType) {
+			super(signature, usingStatements, fields, methods, enums, blockType);
 		}
 
 	}

src/twg2/ast/interm/block/BlockAst.java

@@ -8,8 +8,8 @@
 import twg2.annotations.Immutable;
 import twg2.ast.interm.type.TypeSig;
 import twg2.io.write.JsonWrite;
-import twg2.parser.baseAst.AccessModifier;
-import twg2.parser.baseAst.tools.NameUtil;
+import twg2.parser.codeParser.AccessModifier;
+import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.output.JsonWritableSig;
 import twg2.parser.output.WriteSettings;
 
@@ -35,7 +35,7 @@ public interface ClassSig extends JsonWritableSig {
 	public static class SimpleImpl implements ClassSig {
 		private final @Getter List<String> fullName;
 		/** This type's generic type parameters, if any */
-		private final @Getter List<TypeSig.Simple> params;
+		private final @Getter List<TypeSig.TypeSigSimple> params;
 		/** The block's type (i.e. 'interface', 'class', 'enum', etc.) */
 		private final @Getter AccessModifier accessModifier;
 		private final @Getter String declarationType;
@@ -101,12 +101,12 @@ public String toString() {
 	public static class ResolvedImpl implements ClassSig {
 		private final @Getter List<String> fullName;
 		/** This type's generic type parameters, if any */
-		private final @Getter List<TypeSig.Resolved> params;
+		private final @Getter List<TypeSig.TypeSigResolved> params;
 		private final @Getter AccessModifier accessModifier;
 		/** The block's type (i.e. 'interface', 'class', 'enum', etc.) */
 		private final @Getter String declarationType;
-		private final @Getter TypeSig.Resolved extendClass;
-		private final @Getter List<TypeSig.Resolved> implementInterfaces;
+		private final @Getter TypeSig.TypeSigResolved extendClass;
+		private final @Getter List<TypeSig.TypeSigResolved> implementInterfaces;
 
 
 		@Override