0.2.0 - Remove JsonLiteArray.stringifyArray() and improved unit tests.

Author: TeamworkGuy2

.classpath

@@ -2,15 +2,19 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarray-util/bin/jarray_util.jar" sourcepath="/JArrayUtil"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarrays/bin/jarrays.jar" sourcepath="/JArrayUtil"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfunc/bin/jfunc.jar" sourcepath="/JFunc"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jprimitive-collections/bin/jprimitive_collections.jar" sourcepath="/JPrimitiveCollections"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jrange/bin/jrange.jar" sourcepath="/JRange"/>
 	<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-util/bin/jtext_util.jar" sourcepath="/JTextUtil"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.md

@@ -4,18 +4,24 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-###[0.1.2](N/A) - 2016-09-11
+### [0.2.0](N/A) - 2020-05-09
+#### Removed
+* `JsonLiteArray.stringifyArray()` since it was unused and same behavior available from `JsonStringify` library
+
+
+--------
+### [0.1.2](https://github.com/TeamworkGuy2/JParseJsonLite/commit/39194f7ebfa14dc67dae6c0ef5aea6b27bbad935) - 2016-09-11
 #### Changed
-* Updated jtext-parser dependency to latest 0.9.0 version (TextParserImpl -> TextIteratorParser)
+* Updated `jtext-parser` dependency to latest `0.9.0` version (`TextParserImpl` -> `TextIteratorParser`)
 
 
 --------
-###[0.1.1](https://github.com/TeamworkGuy2/JParseJsonLite/commit/d366c341b32743dc47102f4c1c5b55a0cca79f0e) - 2016-09-02
+### [0.1.1](https://github.com/TeamworkGuy2/JParseJsonLite/commit/d366c341b32743dc47102f4c1c5b55a0cca79f0e) - 2016-09-02
 #### Changed
-* Renamed repository from JParserJsonLite -> JParseJsonLite
+* Renamed repository from `JParserJsonLite` -> `JParseJsonLite`
 
 
 --------
-###[0.1.0](https://github.com/TeamworkGuy2/JParseJsonLite/commit/6c02195791eb08fb5031ce489d153971b4401f15) - 2016-09-01
+### [0.1.0](https://github.com/TeamworkGuy2/JParseJsonLite/commit/6c02195791eb08fb5031ce489d153971b4401f15) - 2016-09-01
 Includes simple JSON parsing code from [JParserDataTypeLike](https://github.com/TeamworkGuy2/JParserDataTypeLike) which came from [JLikelyParser](https://github.com/TeamworkGuy2/JLikelyParser).
 * twg2.parser.jsonLite - for parsing JSON like arrays, strings, and numbers

README.md

@@ -1,7 +1,6 @@
 JParseJsonLite
 ==============
-version: 0.1.2
 
-####twg2.parser.jsonLite
+#### twg2.parser.jsonLite
 for parsing JSON like arrays, numbers, and strings, as well as arrays with none quoted strings.
-'JSON like' meaning it supports most common JSON syntax or a superset (such as unquoted property names), but may not support the [JSON spec](http://json.org/)
+'JSON like' meaning it supports common JSON syntax and common extensions such as unquoted property names, but may not fully support the [JSON spec](http://json.org/)

bin/jparse_json_lite-with-tests.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.1.2",
+	"version" : "0.2.0",
 	"name" : "jparse-json-lite",
 	"description" : "Simple parsing for JSON strings/files",
 	"homepage" : "https://github.com/TeamworkGuy2/JParseJsonLite",

bin/jparse_json_lite.jar

@@ -1,6 +1,5 @@
 package twg2.parser.jsonLite;
 
-
 /**
  * @author TeamworkGuy2
  * @since 2014-9-2
@@ -39,42 +38,42 @@ public enum NumberType {
 		}
 
 
-		public static final boolean isInt(JsonLite.NumberType numType) {
+		public static final boolean isInt(NumberType numType) {
 			return numType != null && numType == NumberType.INTEGER;
 		}
 
 
-		public static final boolean isLong(JsonLite.NumberType numType) {
+		public static final boolean isLong(NumberType numType) {
 			return numType != null && numType == NumberType.LONG;
 		}
 
 
-		public static final boolean isFloat(JsonLite.NumberType numType) {
+		public static final boolean isFloat(NumberType numType) {
 			return numType != null && numType == NumberType.FLOAT;
 		}
 
 
-		public static final boolean isDouble(JsonLite.NumberType numType) {
+		public static final boolean isDouble(NumberType numType) {
 			return numType != null && numType == NumberType.DOUBLE;
 		}
 
 
-		public static final boolean isIntLike(JsonLite.NumberType numType) {
+		public static final boolean isIntLike(NumberType numType) {
 			return numType != null && (numType == NumberType.INTEGER);
 		}
 
 
-		public static final boolean isLongLike(JsonLite.NumberType numType) {
+		public static final boolean isLongLike(NumberType numType) {
 			return numType != null && (numType == NumberType.LONG || numType == NumberType.INTEGER);
 		}
 
 
-		public static final boolean isFloatLike(JsonLite.NumberType numType) {
+		public static final boolean isFloatLike(NumberType numType) {
 			return numType != null && (numType == NumberType.FLOAT || numType == NumberType.INTEGER);
 		}
 
 
-		public static final boolean isDoubleLike(JsonLite.NumberType numType) {
+		public static final boolean isDoubleLike(NumberType numType) {
 			return numType != null && (numType == NumberType.DOUBLE || numType == NumberType.FLOAT || numType == NumberType.INTEGER || numType == NumberType.LONG);
 		}
 

package-lib.json

@@ -5,12 +5,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import twg2.parser.textParser.TextIteratorParser;
+import twg2.parser.textParser.TextCharsParser;
 import twg2.parser.textParser.TextParser;
 import twg2.parser.textParserUtils.ReadIsMatching;
 import twg2.parser.textParserUtils.ReadMatching;
 import twg2.parser.textParserUtils.ReadWhitespace;
-import twg2.text.stringEscape.StringEscape;
 import twg2.text.stringUtils.StringCheck;
 
 /**
@@ -20,29 +19,6 @@
 public class JsonLiteArray {
 	private static final char ARRAY_START = '[';
 	private static final char ARRAY_END = ']';
-	//private static final char[] notStringArrayLike = new char[] {' '/*space*/, '	'/*tab*/, ',', ARRAY_END};
-
-
-	/** Convert an array of strings to a JSON styled array of strings (i.e. {@code ["a", "b", "c"]})
-	 */
-	public static final String stringifyArray(List<String> ary) throws IOException {
-		StringBuilder strB = new StringBuilder(ary.size() > 10 ? ary.size() > 20 ? 128 : 64 : 32);
-		strB.append(ARRAY_START);
-		if(ary.size() > 0) {
-			for(int i = 0, size = ary.size() - 1; i < size; i++) {
-				strB.append('"');
-				// replace \ and " with \\ and \"
-				StringEscape.escape(ary.get(i), '\\', '\\', '"', strB);
-				strB.append("\", ");
-			}
-			strB.append('"');
-			StringEscape.escape(ary.get(ary.size()-1), '\\', '\\', '"', strB);
-			strB.append('"');
-		}
-		strB.append(ARRAY_END);
-
-		return strB.toString();
-	}
 
 
 	/**
@@ -59,7 +35,7 @@ public static final List<String> parseArray(String arrayString) {
 	 * @see JsonLiteArray#parseArray(TextParser, boolean, List)
 	 */
 	public static final void parseArray(String arrayString, List<String> dst) {
-		parseArray(TextIteratorParser.of(arrayString), true, dst);
+		parseArray(TextCharsParser.of(arrayString), true, dst);
 	}
 
 

src/twg2/parser/jsonLite/JsonLite.java

@@ -1,13 +1,14 @@
 package twg2.parser.jsonLite;
 
+import twg2.parser.jsonLite.JsonLite.NumberType;
 import twg2.parser.textParser.TextParser;
 
 /**
  * @author TeamworkGuy2
  * @since 2014-9-2
  */
 public class JsonLiteNumber {
-	private JsonLite.NumberType numberType;
+	private NumberType numberType;
 	// TODO all int and float values can be represented by longs and doubles, remove the unnecessary fields
 	private int intVal;
 	private long longVal;
@@ -40,7 +41,7 @@ public JsonLiteNumber(double doubleVal) {
 
 
 	public void setInt(int intVal) {
-		this.numberType = JsonLite.NumberType.INTEGER;
+		this.numberType = NumberType.INTEGER;
 		this.intVal = intVal;
 		this.longVal = intVal;
 		this.floatVal = intVal;
@@ -49,35 +50,35 @@ public void setInt(int intVal) {
 
 
 	public void setLong(long longVal) {
-		this.numberType = JsonLite.NumberType.LONG;
+		this.numberType = NumberType.LONG;
 		this.longVal = longVal;
 		this.doubleVal = longVal;
 	}
 
 
 	public void setFloat(float floatVal) {
-		this.numberType = JsonLite.NumberType.FLOAT;
+		this.numberType = NumberType.FLOAT;
 		this.floatVal = floatVal;
 		this.doubleVal = floatVal;
 	}
 
 
 	public void setDouble(double doubleVal) {
-		this.numberType = JsonLite.NumberType.DOUBLE;
+		this.numberType = NumberType.DOUBLE;
 		this.doubleVal = doubleVal;
 	}
 
 
-	public JsonLite.NumberType getNumberType() {
+	public NumberType getNumberType() {
 		return numberType;
 	}
 
 
 	public int asInt() {
-		if(!JsonLite.NumberType.isIntLike(numberType)) {
+		if(!NumberType.isIntLike(numberType)) {
 			throw new IllegalStateException("cannot get int value from " + (numberType != null ? numberType.getPrimitiveTypeName() : "number") + " without precision loss");
 		}
-		if(numberType == JsonLite.NumberType.INTEGER) {
+		if(numberType == NumberType.INTEGER) {
 			return intVal;
 		}
 		else {
@@ -87,7 +88,7 @@ public int asInt() {
 
 
 	public long asLong() {
-		if(!JsonLite.NumberType.isLongLike(numberType)) {
+		if(!NumberType.isLongLike(numberType)) {
 			throw new IllegalStateException("cannot get long value from " + (numberType != null ? numberType.getPrimitiveTypeName() : "null") + " without precision loss");
 		}
 		switch(numberType) {
@@ -102,7 +103,7 @@ public long asLong() {
 
 
 	public float asFloat() {
-		if(!JsonLite.NumberType.isFloatLike(numberType)) {
+		if(!NumberType.isFloatLike(numberType)) {
 			throw new IllegalStateException("cannot get float value from " + (numberType != null ? numberType.getPrimitiveTypeName() : "null") + " without precision loss");
 		}
 		switch(numberType) {
@@ -117,7 +118,7 @@ public float asFloat() {
 
 
 	public double asDouble() {
-		if(!JsonLite.NumberType.isDoubleLike(numberType)) {
+		if(!NumberType.isDoubleLike(numberType)) {
 			throw new IllegalStateException("cannot get double value from " + (numberType != null ? numberType.getPrimitiveTypeName() : "null") + " without precision loss");
 		}
 		switch(numberType) {
@@ -137,7 +138,7 @@ public double asDouble() {
 
 	@Override
 	public String toString() {
-		return (numberType != null ? (JsonLite.NumberType.isLongLike(numberType) ? (numberType.getPrimitiveTypeName() + " " + asLong()) : (numberType.getPrimitiveTypeName() + " " + asDouble())) : "null numeric");
+		return (numberType != null ? (NumberType.isLongLike(numberType) ? (numberType.getPrimitiveTypeName() + " " + asLong()) : (numberType.getPrimitiveTypeName() + " " + asDouble())) : "null numeric");
 	}
 
 

src/twg2/parser/jsonLite/JsonLiteArray.java

@@ -7,10 +7,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import twg2.junitassist.checks.CheckTask;
 import twg2.parser.jsonLite.JsonLiteArray;
-import twg2.parser.textParser.TextIteratorParser;
+import twg2.parser.textParser.TextCharsParser;
 import twg2.parser.textParser.TextParser;
-import checks.CheckTask;
 
 /**
  * @author TeamworkGuy2
@@ -59,16 +59,20 @@ public void arrayParseTest() {
 
 		Assert.assertEquals("inputs and expected result arrays must be the same length", input.length, expect.length);
 
+		CheckTask.assertTests(input, expect, (str) -> {
+			return JsonLiteArray.parseArray(str.substring(offset, str.length()));
+		});
+
 		CheckTask.assertTests(input, expect, (str) -> {
 			List<String> res = new ArrayList<>();
-			JsonLiteArray.parseArray(TextIteratorParser.of(str, offset, str.length() - offset), true, res);
+			JsonLiteArray.parseArray(parser(str, offset, str.length() - offset), true, res);
 			return res;
 		});
 
 		CheckTask.assertTests(input, expect, (str) -> {
 			List<String> res = new ArrayList<>();
-			TextParser lineBuf = TextIteratorParser.of(str);
-			for(int i = 0; i < offset; i++) { lineBuf.nextChar(); }
+			TextParser lineBuf = parser(str);
+			lineBuf.skip(offset);
 
 			JsonLiteArray.parseArray(lineBuf, true, res);
 			return res;
@@ -86,8 +90,8 @@ public void arrayLineParseTest() {
 
 		CheckTask.assertTests(input, expect, null, (str) -> {
 			List<String> res = new ArrayList<>();
-			TextParser lineBuf = TextIteratorParser.of(str);
-			for(int i = 0; i < offset; i++) { lineBuf.nextChar(); }
+			TextParser lineBuf = parser(str);
+			lineBuf.skip(offset);
 
 			JsonLiteArray.parseArrayLine(lineBuf, true, res);
 			return res;
@@ -117,12 +121,22 @@ public void readJsonLiteArrayTest() {
 		Assert.assertEquals("array lengths", strs.length, expect.length);
 
 		for(int i = 0, size = strs.length; i < size; i++) {
-			List<Object> elems = new ArrayList<>();
-			JsonLiteArray.parseArrayDeep(TextIteratorParser.of(strs[i]), true, elems);
-			CheckTask.assertTests(expect[i], elems.toArray(new Object[0]), (aryStrs) -> aryStrs);
+			List<Object> parsedRes = new ArrayList<>();
 
-			//System.out.println("parsing JsonLite array '" + strs[i] + "': " + elems.toString());
+			JsonLiteArray.parseArrayDeep(parser(strs[i]), true, parsedRes);
+
+			CheckTask.assertTests(expect[i], parsedRes.toArray(new Object[0]), (aryStrs) -> aryStrs);
 		}
 	}
 
+
+	private static TextParser parser(String src) {
+		return TextCharsParser.of(src);
+	}
+
+
+	private static TextParser parser(String src, int off, int len) {
+		return TextCharsParser.of(src, off, len);
+	}
+
 }