diff --git a/CHANGELOG.md b/CHANGELOG.md index 657c20c..5f0a5cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/ -------- -###[0.1.1](N/A) - 2016-09-02 +###[0.1.2](N/A) - 2016-09-11 +#### Changed +* 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 #### Changed * Renamed repository from JParserJsonLite -> JParseJsonLite diff --git a/README.md b/README.md index b3d9f32..5bdbce6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ JParseJsonLite ============== -version: 0.1.1 +version: 0.1.2 ####twg2.parser.jsonLite for parsing JSON like arrays, numbers, and strings, as well as arrays with none quoted strings. diff --git a/bin/jparse_json_lite-with-tests.jar b/bin/jparse_json_lite-with-tests.jar index 9b2914f..9d98d61 100644 Binary files a/bin/jparse_json_lite-with-tests.jar and b/bin/jparse_json_lite-with-tests.jar differ diff --git a/bin/jparse_json_lite.jar b/bin/jparse_json_lite.jar index 5f3bda2..590e573 100644 Binary files a/bin/jparse_json_lite.jar and b/bin/jparse_json_lite.jar differ diff --git a/package-lib.json b/package-lib.json index d76f39e..583a7be 100644 --- a/package-lib.json +++ b/package-lib.json @@ -1,5 +1,5 @@ { - "version" : "0.1.1", + "version" : "0.1.2", "name" : "jparse-json-lite", "description" : "Simple parsing for JSON strings/files", "homepage" : "https://github.com/TeamworkGuy2/JParseJsonLite", diff --git a/src/twg2/parser/jsonLite/JsonLiteArray.java b/src/twg2/parser/jsonLite/JsonLiteArray.java index fd72ed6..d7740c3 100644 --- a/src/twg2/parser/jsonLite/JsonLiteArray.java +++ b/src/twg2/parser/jsonLite/JsonLiteArray.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import java.util.List; +import twg2.parser.textParser.TextIteratorParser; import twg2.parser.textParser.TextParser; -import twg2.parser.textParser.TextParserImpl; import twg2.parser.textParserUtils.ReadIsMatching; import twg2.parser.textParserUtils.ReadMatching; import twg2.parser.textParserUtils.ReadWhitespace; @@ -59,7 +59,7 @@ public static final List parseArray(String arrayString) { * @see JsonLiteArray#parseArray(TextParser, boolean, List) */ public static final void parseArray(String arrayString, List dst) { - parseArray(TextParserImpl.of(arrayString), true, dst); + parseArray(TextIteratorParser.of(arrayString), true, dst); } diff --git a/test/twg2/parser/jsonLite/test/JsonLiteArrayTest.java b/test/twg2/parser/jsonLite/test/JsonLiteArrayTest.java index 7e8fc12..52b0c51 100644 --- a/test/twg2/parser/jsonLite/test/JsonLiteArrayTest.java +++ b/test/twg2/parser/jsonLite/test/JsonLiteArrayTest.java @@ -8,7 +8,8 @@ import org.junit.Test; import twg2.parser.jsonLite.JsonLiteArray; -import twg2.parser.textParser.TextParserImpl; +import twg2.parser.textParser.TextIteratorParser; +import twg2.parser.textParser.TextParser; import checks.CheckTask; /** @@ -60,13 +61,13 @@ public void arrayParseTest() { CheckTask.assertTests(input, expect, (str) -> { List res = new ArrayList<>(); - JsonLiteArray.parseArray(TextParserImpl.of(str, offset, str.length() - offset), true, res); + JsonLiteArray.parseArray(TextIteratorParser.of(str, offset, str.length() - offset), true, res); return res; }); CheckTask.assertTests(input, expect, (str) -> { List res = new ArrayList<>(); - TextParserImpl lineBuf = TextParserImpl.of(str); + TextParser lineBuf = TextIteratorParser.of(str); for(int i = 0; i < offset; i++) { lineBuf.nextChar(); } JsonLiteArray.parseArray(lineBuf, true, res); @@ -85,7 +86,7 @@ public void arrayLineParseTest() { CheckTask.assertTests(input, expect, null, (str) -> { List res = new ArrayList<>(); - TextParserImpl lineBuf = TextParserImpl.of(str); + TextParser lineBuf = TextIteratorParser.of(str); for(int i = 0; i < offset; i++) { lineBuf.nextChar(); } JsonLiteArray.parseArrayLine(lineBuf, true, res); @@ -117,7 +118,7 @@ public void readJsonLiteArrayTest() { for(int i = 0, size = strs.length; i < size; i++) { List elems = new ArrayList<>(); - JsonLiteArray.parseArrayDeep(TextParserImpl.of(strs[i]), true, elems); + JsonLiteArray.parseArrayDeep(TextIteratorParser.of(strs[i]), true, elems); CheckTask.assertTests(expect[i], elems.toArray(new Object[0]), (aryStrs) -> aryStrs); //System.out.println("parsing JsonLite array '" + strs[i] + "': " + elems.toString()); diff --git a/test/twg2/parser/jsonLite/test/JsonLiteTest.java b/test/twg2/parser/jsonLite/test/JsonLiteTest.java index abac718..f1feee7 100644 --- a/test/twg2/parser/jsonLite/test/JsonLiteTest.java +++ b/test/twg2/parser/jsonLite/test/JsonLiteTest.java @@ -5,7 +5,7 @@ import twg2.parser.jsonLite.JsonLiteNumber; import twg2.parser.jsonLite.JsonLite.NumberType; -import twg2.parser.textParser.TextParserImpl; +import twg2.parser.textParser.TextIteratorParser; /** * @author TeamworkGuy2 @@ -31,7 +31,7 @@ public void readJsonLiteNumberTest() { for(int i = 0, size = strs.length; i < size; i++) { String s = strs[i]; Object expect = expected[i]; - JsonLiteNumber num = JsonLiteNumber.readNumber(TextParserImpl.of(s)); + JsonLiteNumber num = JsonLiteNumber.readNumber(TextIteratorParser.of(s)); if(num.getNumberType() == NumberType.DOUBLE) { Assert.assertEquals(num.asDouble(), expect); }