0.3.0 - Added basic Java parsing support and some initial tests for parsed Java AST. Refactored many interfaces into JTextParser library and renamed some methods. Refactored interm parsing to be more generic, reused some C# interm parsers for fields, methods, and method parameters for Java interm parsing.

Author: TeamworkGuy2

.classpath

@@ -23,5 +23,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/jar/jtree_walker.jar" sourcepath="/JTreeWalker"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/jar/data_transfer.jar"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparser-data-type-like/jar/jparser_data_type_like.jar" sourcepath="/JParserDataTypeLike"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

README.md

@@ -1,6 +1,6 @@
 ParserToolsTmp
 ==============
-version: 0.2.1
+version: 0.3.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. 
 
@@ -16,71 +16,73 @@ In progress C#/Java/TypeScript parser tools built atop [JTextParser] (https://gi
 Example:
 --------
 
-Source Code:
-
+Source Code (SimpleCs.cs):
+```C#
 	namespace ParserExamples.Samples {
 
 		/// <summary>
 		/// A simple class to test parsing.
 		/// </summary>
 		public class SimpleCs {
 
-		/// <value>The names.</value>
-		public IList<string> Names { get; set; }
+			/// <value>The names.</value>
+			public IList<string> Names { get; set; }
 
-		/// <value>The number of names.</value>
-		public int Count { get; set }
+			/// <value>The number of names.</value>
+			public int Count { get; set; }
+	
+			/// <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;
+			}
 
-		/// <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;
 		}
 
 	}
+```
 
 
-Parser Code:
-
-	CodeFileSrc<CodeLanguage> simpleCsAst = ParseCodeFile.parseCode(simpleCsName, CodeLanguageOptions.C_SHARP, simpleCsCode);
+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);
 
-	for(val block : CodeLanguageOptions.C_SHARP.getExtractor().extractClassFieldsAndMethodSignatures(simpleCsAst.getDoc())) {
-		CodeFileParsed.Simple<String, CsBlock> fileParsed = new CodeFileParsed.Simple<>(simpleCsName, block.getValue(), block.getKey());
+	for(Map.Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.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());
+		System.out.println(sb.toString()); // Print the parsed AST to System.out
 	}
+```
 
 
-JSON Result:
-
+JSON Result (printed to System.out):
+```JSON
 	{
 		"classSignature" : {
 			"access" : "PUBLIC",
-			"name" : "SimpleCs",
+			"name" : "ParserExamples.Samples.SimpleCs",
 			"declarationType" : "class"
 		},
 		"blockType" : "CLASS",
 		"using" : [],
 		"fields" : [{
-				"name" : "SimpleCs.Names",
+				"name" : "ParserExamples.Samples.SimpleCs.Names",
 				"type" : "IList[string]"
 			}, {
-				"name" : "SimpleCs.Count",
+				"name" : "ParserExamples.Samples.SimpleCs.Count",
 				"type" : "int"
 			}
 		],
 		"methods" : [{
-				"name" : "SimpleCs.AddName",
+				"name" : "ParserExamples.Samples.SimpleCs.AddName",
 				"parameters" : [{
 						"type" : "string",
 						"name" : "name"
@@ -118,3 +120,4 @@ JSON Result:
 			}
 		]
 	}
+```

src/twg2/parser/baseAst/AstTypeChecker.java

@@ -15,12 +15,4 @@ public interface AstTypeChecker<T_KEYWORD> {
 
 	public boolean isKeyword(DocumentFragmentText<CodeFragmentType> node, T_KEYWORD keyword1, T_KEYWORD keyword2, T_KEYWORD keyword3);
 
-	/** Checks for block identifying keywords (i.e. 'namespace', 'module', 'class', 'interface')
-	 */
-	public boolean isBlockKeyword(DocumentFragmentText<CodeFragmentType> node);
-
-	/** Checks for class/interface block modifier keywords (i.e. 'abstract', 'static', 'final', 'sealed')
-	 */
-	public boolean isClassModifierKeyword(DocumentFragmentText<CodeFragmentType> node);
-
 }

src/twg2/parser/baseAst/AstUtil.java

@@ -0,0 +1,13 @@
+package twg2.parser.baseAst;
+
+
+/**
+ * @author TeamworkGuy2
+ * @since 2015-12-6
+ */
+public interface AstUtil<T_BLOCK extends CompoundBlock, T_KEYWORD> {
+
+	public AccessModifierParser<AccessModifierEnum, T_BLOCK> getAccessModifierParser();
+
+	public AstTypeChecker<T_KEYWORD> getChecker();
+}

src/twg2/parser/baseAst/LanguageAstUtil.java

@@ -3,7 +3,7 @@
 import twg2.parser.baseAst.AccessModifierEnum;
 import twg2.parser.baseAst.AccessModifierParser;
 import twg2.parser.baseAst.AstTypeChecker;
-import twg2.parser.baseAst.LanguageAstUtil;
+import twg2.parser.baseAst.AstUtil;
 import twg2.parser.codeParser.CodeFragmentType;
 import twg2.parser.codeParser.CodeLanguage;
 import twg2.parser.codeParser.CodeLanguageOptions;
@@ -16,7 +16,7 @@
  * @author TeamworkGuy2
  * @since 2015-12-6
  */
-public class CsAstUtil implements AccessModifierParser<AccessModifierEnum, CsBlock>, AstTypeChecker<CsKeyword>, LanguageAstUtil {
+public class CsAstUtil implements AccessModifierParser<AccessModifierEnum, CsBlock>, AstTypeChecker<CsKeyword>, AstUtil<CsBlock, CsKeyword> {
 
 	@Override
 	public CodeLanguage getLanguage() {
@@ -122,20 +122,4 @@ public boolean isKeyword(DocumentFragmentText<CodeFragmentType> node, CsKeyword
 		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD && (keyword1.getSrcName().equals(node.getText()) || keyword2.getSrcName().equals(node.getText()) || keyword3.getSrcName().equals(node.getText())));
 	}
 
-
-	@Override
-	public boolean isBlockKeyword(DocumentFragmentText<CodeFragmentType> node) {
-		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD &&
-				(CsKeyword.CLASS.getSrcName().equals(node.getText()) || CsKeyword.INTERFACE.getSrcName().equals(node.getText()) || CsKeyword.NAMESPACE.getSrcName().equals(node.getText())));
-	}
-
-
-	@Override
-	public boolean isClassModifierKeyword(DocumentFragmentText<CodeFragmentType> node) {
-		String text = null;
-		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD &&
-				(CsKeyword.PUBLIC.getSrcName().equals((text = node.getText())) || CsKeyword.PROTECTED.getSrcName().equals(text) || CsKeyword.INTERNAL.getSrcName().equals(text) || CsKeyword.PRIVATE.getSrcName().equals(text) ||
-				CsKeyword.ABSTRACT.getSrcName().equals(text) || CsKeyword.SEALED.getSrcName().equals(text) || CsKeyword.STATIC.getSrcName().equals(text)));
-	}
-
 }

src/twg2/parser/baseAst/csharp/CsAstUtil.java

@@ -0,0 +1,128 @@
+package twg2.parser.baseAst.java;
+
+import twg2.parser.baseAst.AccessModifierEnum;
+import twg2.parser.baseAst.AccessModifierParser;
+import twg2.parser.baseAst.AstTypeChecker;
+import twg2.parser.baseAst.AstUtil;
+import twg2.parser.codeParser.CodeFragmentType;
+import twg2.parser.codeParser.CodeLanguage;
+import twg2.parser.codeParser.CodeLanguageOptions;
+import twg2.parser.codeParser.java.JavaBlock;
+import twg2.parser.codeParser.java.JavaKeyword;
+import twg2.parser.documentParser.DocumentFragmentText;
+import dataUtils.EnumUtil;
+
+/**
+ * @author TeamworkGuy2
+ * @since 2016-1-14
+ */
+public class JavaAstUtil implements AccessModifierParser<AccessModifierEnum, JavaBlock>, AstTypeChecker<JavaKeyword>, AstUtil<JavaBlock, JavaKeyword> {
+
+	@Override
+	public CodeLanguage getLanguage() {
+		return CodeLanguageOptions.JAVA;
+	}
+
+
+	@Override
+	public JavaAstUtil getAccessModifierParser() {
+		return this;
+	}
+
+
+	@Override
+	public AstTypeChecker<JavaKeyword> getChecker() {
+		return this;
+	}
+
+
+	@Override
+	public AccessModifierEnum defaultAccessModifier(String src, JavaBlock currentBlock, JavaBlock parentBlock) {
+		AccessModifierEnum access = tryFromLanguageSrc(src);
+		return defaultAccessModifier(access, currentBlock, parentBlock);
+	}
+
+
+	@Override
+	public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access, JavaBlock currentBlock, JavaBlock parentBlock) {
+		if(access != null) {
+			return access;
+		}
+
+		if(parentBlock == null) {
+			return AccessModifierEnum.NAMESPACE_LOCAL;
+		}
+
+		switch(currentBlock) {
+			case CLASS:
+				switch(parentBlock) {
+				case CLASS: // class { class }
+				case ENUM: // enum { class }
+					return AccessModifierEnum.NAMESPACE_LOCAL;
+				case INTERFACE: // interface { class }
+					return AccessModifierEnum.PUBLIC;
+				default:
+					throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
+				}
+			case INTERFACE:
+				switch(parentBlock) {
+				case CLASS: // class { interface }
+				case ENUM: // enum { interface }
+					return AccessModifierEnum.NAMESPACE_LOCAL;
+				case INTERFACE: // interface { interface }
+					return AccessModifierEnum.PUBLIC;
+				default:
+					throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
+				}
+			case ENUM:
+				switch(parentBlock) {
+				case CLASS: // class { enum }
+				case ENUM: // enum { enum }
+					return AccessModifierEnum.NAMESPACE_LOCAL;
+				case INTERFACE: // interface { enum }
+					return AccessModifierEnum.PUBLIC;
+				default:
+					throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
+				}
+			default:
+				throw EnumUtil.unknownValue(currentBlock, JavaBlock.class);
+		}
+	}
+
+
+	@Override
+	public final AccessModifierEnum tryFromLanguageSrc(String src) {
+		if("public".equals(src)) {
+			return AccessModifierEnum.PUBLIC;
+		}
+		if("private".equals(src)) {
+			return AccessModifierEnum.PRIVATE;
+		}
+		if("protected".equals(src)) {
+			return AccessModifierEnum.NAMESPACE_OR_INHERITANCE_LOCAL;
+		}
+		if("".equals(src)) {
+			return AccessModifierEnum.NAMESPACE_LOCAL;
+		}
+		return null;
+	}
+
+
+	@Override
+	public boolean isKeyword(DocumentFragmentText<CodeFragmentType> node, JavaKeyword keyword1) {
+		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD && keyword1.getSrcName().equals(node.getText()));
+	}
+
+
+	@Override
+	public boolean isKeyword(DocumentFragmentText<CodeFragmentType> node, JavaKeyword keyword1, JavaKeyword keyword2) {
+		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD && (keyword1.getSrcName().equals(node.getText()) || keyword2.getSrcName().equals(node.getText())));
+	}
+
+
+	@Override
+	public boolean isKeyword(DocumentFragmentText<CodeFragmentType> node, JavaKeyword keyword1, JavaKeyword keyword2, JavaKeyword keyword3) {
+		return node != null && (node.getFragmentType() == CodeFragmentType.KEYWORD && (keyword1.getSrcName().equals(node.getText()) || keyword2.getSrcName().equals(node.getText()) || keyword3.getSrcName().equals(node.getText())));
+	}
+
+}

src/twg2/parser/baseAst/java/JavaAstUtil.java

@@ -4,8 +4,14 @@
 import java.util.Map.Entry;
 
 import twg2.parser.baseAst.CompoundBlock;
+import twg2.parser.condition.AstParser;
 import twg2.parser.documentParser.DocumentFragmentText;
+import twg2.parser.intermAst.annotation.AnnotationSig;
+import twg2.parser.intermAst.block.IntermBlock;
 import twg2.parser.intermAst.classes.IntermClass;
+import twg2.parser.intermAst.field.IntermFieldSig;
+import twg2.parser.intermAst.method.IntermMethodSig;
+import twg2.parser.intermAst.type.TypeSig;
 import twg2.treeLike.simpleTree.SimpleTree;
 
 /**
@@ -15,6 +21,20 @@
  */
 public interface AstExtractor<T_BLOCK extends CompoundBlock> {
 
+	public AstParser<List<List<String>>> createImportStatementParser();
+
+	public AstParser<TypeSig.Simple> createTypeParser();
+
+	public AstParser<List<AnnotationSig>> createAnnotationParser(IntermBlock<T_BLOCK> block);
+
+	public AstParser<List<IntermFieldSig>> createFieldParser(IntermBlock<T_BLOCK> block, AstParser<TypeSig.Simple> typeParser, AstParser<List<AnnotationSig>> annotationParser);
+
+	public AstParser<List<IntermMethodSig.SimpleImpl>> createMethodParser(IntermBlock<T_BLOCK> block, AstParser<TypeSig.Simple> typeParser, AstParser<List<AnnotationSig>> annotationParser);
+
+
+	public List<IntermBlock<T_BLOCK>> extractBlocks(List<String> nameScope, SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree, IntermBlock<T_BLOCK> parentScope);
+
+
 	public List<Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.SimpleImpl<T_BLOCK>>> extractClassFieldsAndMethodSignatures(SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree);
 
 }