0.15.6 - Support parameter default values, update unit tests.

Author: TeamworkGuy2

CHANGELOG.md

@@ -4,7 +4,19 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.15.5](N/A) - 2018-09-14
+### [0.15.6](N/A) - 2018-09-22
+#### Added
+* Parameter default value parsing support added to `MethodParametersParser`
+* Added `DataTypeExtractor.isDefaultValueLiteral()` to check for field/parameter default values
+
+#### Changed
+* Renamed `CsKeyword.Inst` -> `CsKeyword.CsKeywordUtil`
+* Renamed `JavaKeyword.Inst` -> `JavaKeyword.JavaKeywordUtil`
+* Unit tests changed to use static imports of `TypeAssert.ary()` instead of `new Object[] {...}` and `TypeAssert.ls()` instead of `Arrays.asList()`
+
+
+--------
+### [0.15.5](https://github.com/TeamworkGuy2/JParseCode/commit/cac4e10c769b47ec3b73e2e716befc19ab1876f4) - 2018-09-14
 #### Changed
 * `ParserWorkFlow` returns the `-help` message if no arguments are given when run
 

README.md

@@ -1,6 +1,6 @@
 JParseCode
 ==============
-version: 0.15.5
+version: 0.15.6
 
 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.15.5",
+	"version" : "0.15.6",
 	"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

@@ -73,7 +73,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 = (data.getTokenType() == CodeTokenType.NUMBER || DataTypeExtractor.isBooleanLiteral(data) || DataTypeExtractor.isNullLiteral(data))))) {
+				(isNumOrBoolOrNull = DataTypeExtractor.isDefaultValueLiteral(data)))) {
 			if(preClosingComma) {
 				dst.append(", ");
 			}

package-lib.json

@@ -84,7 +84,7 @@ public AstParser<List<FieldSig>> createFieldParser(BlockAst<CsBlock> block, AstP
 	public AstParser<List<MethodSigSimple>> createMethodParser(BlockAst<CsBlock> block, AstParser<List<AnnotationSig>> annotationParser, AstParser<List<String>> commentParser) {
 		val lang = CodeLanguageOptions.C_SHARP;
 		val typeParser = new DataTypeExtractor(lang, true);
-		return new MethodExtractor(lang.displayName(), CsKeyword.check, block, typeParser, annotationParser, commentParser);
+		return new MethodExtractor(lang.displayName(), CsKeyword.check, lang.getOperatorUtil(), block, typeParser, annotationParser, commentParser);
 	}
 
 

src/twg2/ast/interm/field/FieldDef.java

@@ -94,7 +94,7 @@ public enum CsKeyword implements AccessModifier {
 	WHILE("while");
 
 
-	public static final CsKeyword.Inst check = new CsKeyword.Inst();
+	public static final CsKeyword.CsKeywordUtil check = new CsKeyword.CsKeywordUtil();
 
 	public final String srcName;
 	public final boolean isType;
@@ -146,7 +146,7 @@ public String toSrc() {
 	 * @since 2016-1-14
 	 */
 	@Accessors(fluent = true)
-	public static class Inst implements KeywordUtil<CsKeyword> {
+	public static class CsKeywordUtil implements KeywordUtil<CsKeyword> {
 		public final String[] keywords;
 		private final CsKeyword[] values;
 		private final String[] primitives;

src/twg2/parser/codeParser/csharp/CsBlockParser.java

@@ -129,20 +129,27 @@ public static <T> boolean isPossiblyType(KeywordUtil<? extends AccessModifier> k
 	}
 
 
-	/** Check if a tree node is a boolean literal
+	/** Check if a {@link CodeToken} is a boolean literal
 	 */
 	public static boolean isBooleanLiteral(CodeToken node) {
 		return node.getTokenType() == CodeTokenType.KEYWORD && ("true".equals(node.getText()) || "false".equals(node.getText()));
 	}
 
 
-	/** Check if a tree node is a null literal
+	/** Check if a {@link CodeToken} is a null literal
 	 */
 	public static boolean isNullLiteral(CodeToken node) {
 		return node.getTokenType() == CodeTokenType.KEYWORD && "null".equals(node.getText());
 	}
 
 
+	/** Check if a {@link CodeToken} is a numeric literal, a boolean literal, or a null literal
+	 */
+	public static boolean isDefaultValueLiteral(CodeToken node) {
+		return (node.getTokenType() == CodeTokenType.NUMBER || DataTypeExtractor.isBooleanLiteral(node) || DataTypeExtractor.isNullLiteral(node));
+	}
+
+
 	/** Check if one or two nodes are a number with an optional -/+ sign
 	 * @param node1
 	 * @param node2Optional

src/twg2/parser/codeParser/csharp/CsKeyword.java

@@ -11,6 +11,8 @@
 import twg2.parser.codeParser.AccessModifier;
 import twg2.parser.codeParser.BlockType;
 import twg2.parser.codeParser.KeywordUtil;
+import twg2.parser.codeParser.Operator;
+import twg2.parser.codeParser.OperatorUtil;
 import twg2.parser.codeParser.tools.NameUtil;
 import twg2.parser.fragment.AstFragType;
 import twg2.parser.fragment.CodeToken;
@@ -37,6 +39,7 @@ static enum State {
 
 
 	KeywordUtil<? extends AccessModifier> keywordUtil;
+	OperatorUtil<? extends Operator> operatorUtil;
 	AstParser<List<AnnotationSig>> annotationParser;
 	AstParser<List<String>> commentParser;
 	AstParser<TypeSig.TypeSigSimple> typeParser;
@@ -51,10 +54,11 @@ static enum State {
 	 * @param annotationParser this annotation parser should be being run external from this instance.  When this instance finds a method signature,
 	 * the annotation parser should already contain results (i.e. {@link AstParser#getParserResult()}) for the method's annotations
 	 */
-	public MethodExtractor(String langName, KeywordUtil<? extends AccessModifier> keywordUtil, BlockAst<? extends BlockType> parentBlock,
+	public MethodExtractor(String langName, KeywordUtil<? extends AccessModifier> keywordUtil, OperatorUtil<? extends Operator> operatorUtil, BlockAst<? extends BlockType> parentBlock,
 			AstParser<TypeSig.TypeSigSimple> typeParser, AstParser<List<AnnotationSig>> annotationParser, AstParser<List<String>> commentParser) {
 		super(langName, "method signature", parentBlock, State.COMPLETE, State.FAILED);
 		this.keywordUtil = keywordUtil;
+		this.operatorUtil = operatorUtil;
 		this.methods = new ArrayList<>();
 		this.typeParser = typeParser;
 		this.annotationParser = annotationParser;
@@ -170,7 +174,7 @@ private Consume findingParams(SimpleTree<CodeToken> tokenNode) {
 			val comments = new ArrayList<>(commentParser.getParserResult());
 			commentParser.recycle();
 
-			val params = MethodParametersParser.extractParamsFromSignature(keywordUtil, annotationParser, tokenNode);
+			val params = MethodParametersParser.extractParamsFromSignature(keywordUtil, operatorUtil, annotationParser, tokenNode);
 			val accessMods = new ArrayList<>(accessModifiers);
 			annotationParser.recycle();
 
@@ -199,7 +203,7 @@ public MethodExtractor recycle() {
 
 	@Override
 	public MethodExtractor copy() {
-		val copy = new MethodExtractor(this.langName, this.keywordUtil, this.parentBlock, this.typeParser.copy(), this.annotationParser.copy(), this.commentParser.copy());
+		val copy = new MethodExtractor(this.langName, this.keywordUtil, this.operatorUtil, this.parentBlock, this.typeParser.copy(), this.annotationParser.copy(), this.commentParser.copy());
 		return copy;
 	}