0.17.0 - performance refactor, several libraries updated, removed most lombok 'val' usages in favor of Java 9 'var'.

Author: TeamworkGuy2

.classpath

@@ -11,7 +11,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANTLR"/>
-	<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="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">
@@ -54,5 +53,6 @@
 	<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="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.md

@@ -4,7 +4,17 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.16.1](N/A) - 2019-03-17
+### [0.17.0](N/A) - 2019-03-30
+Performance refactor, several libraries updated: JArrays, JCollectionUtil, JFileIo, JTextParser, and JTextTokenizer
+#### Changed
+* Changed to new `FileReadUtil.readChars(InputStream)` (`[email protected]`)
+* Switched lombok `val` usage to Java 9 `var`
+* Added `HashMap<String, *Keyword> keywordSet` field to `CsKeyword` and `JavaKeyword` for performance
+* Added some duplicate code in `IdentifierTokenizer` to work with optimized `CharConditions.ContainsFirstSpecial` constructor
+
+
+--------
+### [0.16.1](https://github.com/TeamworkGuy2/JParseCode/commit/4d9ae1065f328e0354e979ab90c21eee5ade2338) - 2019-03-17
 #### Fixed
 * Accidentally deleted compiled *.jar files in 0.16.0 release
 

README.md

@@ -1,6 +1,5 @@
 JParseCode
 ==============
-version: 0.16.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. 
 

bin/jparse_code-with-tests.jar

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

@@ -1,7 +1,7 @@
 package twg2.parser.codeParser.codeStats;
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -137,7 +137,7 @@ public static ParseDirectoryCodeFiles parseFileStats(Path relativePath, List<Pat
 		for(Path path : files) {
 			File file = path.toFile();
 			String fullFileName = file.getName();
-			char[] src = fileReader.readChars(new FileReader(file));
+			char[] src = fileReader.readChars(new FileInputStream(file));
 			int srcOff = 0;
 			int srcLen = src.length;
 			Entry<String, String> fileNameExt = StringSplit.lastMatchParts(fullFileName, ".");

package-lib.json

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.val;
 import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.parser.codeParser.extractors.AnnotationExtractor;
 import twg2.parser.fragment.AstFragType;
@@ -31,13 +30,13 @@ public CsAnnotationExtractor() {
 
 	@Override
 	public boolean acceptNext(SimpleTree<CodeToken> tokenNode) {
-		val lang = CodeLanguageOptions.C_SHARP;
+		var lang = CodeLanguageOptions.C_SHARP;
 
 		if(state != State.FAILED) {
-			val childs = tokenNode.getChildren();
+			var childs = tokenNode.getChildren();
 			CodeToken annotTypeFrag = null;
 			if(AstFragType.isBlock(tokenNode.getData(), "[") && childs != null && childs.size() > 0 && AstFragType.isIdentifier(annotTypeFrag = childs.get(0).getData())) {
-				val annot = AnnotationExtractor.parseAnnotationBlock(lang, annotTypeFrag.getTokenType(), annotTypeFrag.getText(), (childs.size() > 1 ? childs.get(1) : null));
+				var annot = AnnotationExtractor.parseAnnotationBlock(lang, annotTypeFrag.getTokenType(), annotTypeFrag.getText(), (childs.size() > 1 ? childs.get(1) : null));
 				annotations.add(annot);
 				state = State.COMPLETE;
 				return true;
@@ -64,8 +63,7 @@ public CsAnnotationExtractor recycle() {
 
 	@Override
 	public CsAnnotationExtractor copy() {
-		val copy = new CsAnnotationExtractor();
-		return copy;
+		return new CsAnnotationExtractor();
 	}
 
 

src/twg2/parser/codeParser/codeStats/ParseDirectoryCodeFiles.java

@@ -1,6 +1,5 @@
 package twg2.parser.codeParser.csharp;
 
-import lombok.val;
 import twg2.dataUtil.dataUtils.EnumError;
 import twg2.parser.codeParser.AccessModifierEnum;
 import twg2.parser.codeParser.AccessModifierParser;
@@ -132,23 +131,23 @@ public boolean isKeyword(CodeToken node, CsKeyword keyword1, CsKeyword keyword2,
 	@Override
 	public boolean isFieldBlock(SimpleTree<CodeToken> block) {
 		if(block == null) { return true; }
-		val childs = block.getChildren();
+		var childs = block.getChildren();
 		// properties must have at-least one indexer (i.e. 'get' or 'set')
 		if(childs.size() == 0) { return false; }
 
-		val keywords = this.getLanguage().getKeywordUtil();
+		var keywords = this.getLanguage().getKeywordUtil();
 
 		boolean prevWasGetOrSet = false;
 		for(int i = 0, size = childs.size(); i < size; i++) {
-			val child = childs.get(i);
-			val nextChild = i < size - 1 ? childs.get(i + 1) : null;
-			val frag = child.getData();
-			val fragType = frag.getTokenType();
+			var child = childs.get(i);
+			var nextChild = i < size - 1 ? childs.get(i + 1) : null;
+			var frag = child.getData();
+			var fragType = frag.getTokenType();
 			if(fragType == CodeTokenType.COMMENT) {
 				continue;
 			}
-			val isGetOrSet = isGetOrSet(frag);
-			val isAccessMod = keywords.fieldModifiers().is(frag);
+			boolean isGetOrSet = isGetOrSet(frag);
+			boolean isAccessMod = keywords.fieldModifiers().is(frag);
 			if(isGetOrSet ||
 					(prevWasGetOrSet && (fragType == CodeTokenType.BLOCK || fragType == CodeTokenType.SEPARATOR)) ||
 					(isAccessMod && nextChild != null && isGetOrSet(nextChild.getData()))) {

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

@@ -5,7 +5,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import lombok.val;
 import twg2.arrays.ArrayUtil;
 import twg2.ast.interm.annotation.AnnotationSig;
 import twg2.ast.interm.block.BlockAst;
@@ -58,7 +57,7 @@ public CsEnumMemberExtractor(KeywordUtil<? extends Keyword> keywordUtil, BlockAs
 		this.state = State.INIT;
 
 		// determine the enum's base type
-		val enumExtends = parentBlock.declaration.getExtendImplementSimpleNames();
+		var enumExtends = parentBlock.declaration.getExtendImplementSimpleNames();
 		if(enumExtends == null || enumExtends.isEmpty()) {
 			enumType = new TypeSig.TypeSigSimpleBase(CsKeyword.INT.toSrc(), 0, false, true);
 		}
@@ -112,7 +111,7 @@ else if(state == State.FOUND_NAME) {
 			// if a '=' symbol is found, the enum has a custom value (i.e. 'MY_ENUM = 2, ...;')
 			if(AstFragType.isOperator(tokenData, CsOperator.ASSIGNMENT)) {
 				// remove the minimum viable enum that was added when the previous identifier node was found, this is going to be a full enum with a value
-				val minimumEnum = enumMembers.remove(enumMembers.size() - 1);
+				var minimumEnum = enumMembers.remove(enumMembers.size() - 1);
 				nextMemberComments = minimumEnum.getComments();
 				state = State.FOUND_ASSIGNMENT_SYMBOL;
 				return true;
@@ -160,8 +159,7 @@ public CsEnumMemberExtractor recycle() {
 
 	@Override
 	public AstParser<List<FieldDef>> copy() {
-		val copy = new CsEnumMemberExtractor(keywordUtil, parentBlock, commentParser.copy());
-		return copy;
+		return new CsEnumMemberExtractor(keywordUtil, parentBlock, commentParser.copy());
 	}
 
 
@@ -172,8 +170,8 @@ void reset() {
 
 
 	private void addEnumMember(String memberName, SimpleTree<CodeToken> tokenNode) {
-		val comments = (nextMemberComments != null ? nextMemberComments : new ArrayList<>(commentParser.getParserResult()));
-		val field = new FieldDef(memberName, NameUtil.newFqName(parentBlock.declaration.getFullName(), memberName), enumType,
+		var comments = (nextMemberComments != null ? nextMemberComments : new ArrayList<>(commentParser.getParserResult()));
+		var field = new FieldDef(memberName, NameUtil.newFqName(parentBlock.declaration.getFullName(), memberName), enumType,
 				Arrays.asList(CsKeyword.PUBLIC), Collections.<AnnotationSig>emptyList(), comments, tokenNode);
 		nextMemberComments = null;
 		commentParser.recycle();