Skip to content

Commit a0ef508

Browse files
TeamworkGuy2TeamworkGuy2
committed
0.10.1 - Updated dependencies, add new json-stringify dependency
1 parent 0ca793a commit a0ef508

18 files changed

+85
-67
lines changed

‎.classpath

+22-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="src" path="plugins"/>
@@ -9,10 +9,23 @@
99
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
1010
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
1111
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
12-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-annotations-2.5.0.jar"/>
13-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-core-2.5.0.jar"/>
14-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-databind-2.5.4.jar"/>
15-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarray-util/bin/jarray_util.jar" sourcepath="/JArrayUtil"/>
12+
<classpathentry kind="output" path="bin"/>
13+
<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">
14+
<attributes>
15+
<attribute name="javadoc_location" value="jar:file:/C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/doc/jackson-annotations-2.5.0-javadoc.jar!/"/>
16+
</attributes>
17+
</classpathentry>
18+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-core-2.5.0.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/src/jackson-core-2.5.0-sources.jar">
19+
<attributes>
20+
<attribute name="javadoc_location" value="jar:file:/C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/doc/jackson-core-2.5.0-javadoc.jar!/"/>
21+
</attributes>
22+
</classpathentry>
23+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-databind-2.5.4.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/src/jackson-databind-2.5.4-sources.jar">
24+
<attributes>
25+
<attribute name="javadoc_location" value="jar:file:/C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/doc/jackson-databind-2.5.4-javadoc.jar!/"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarrays/bin/jarrays.jar" sourcepath="/JArrays"/>
1629
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-builders/bin/jcollection_builders.jar" sourcepath="/JCollectionBuilders"/>
1730
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-interfaces/bin/jcollection_interfaces.jar" sourcepath="/JCollectionInterfaces"/>
1831
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/bin/jcollection_util.jar" sourcepath="/JCollectionUtil"/>
@@ -21,17 +34,18 @@
2134
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/bin/jfile_io.jar" sourcepath="/JFileIo"/>
2235
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfunc/bin/jfunc.jar" sourcepath="/JFunc"/>
2336
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jinterfaces/bin/jinterfaces.jar" sourcepath="/JInterfaces"/>
37+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparse-json-lite/bin/jparse_json_lite.jar" sourcepath="/JParseJsonLite"/>
38+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparse-primitive/bin/jparse_primitive.jar" sourcepath="/JParsePrimitive"/>
2439
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jprimitive-collections/bin/jprimitive_collections.jar" sourcepath="/JPrimitiveCollections"/>
2540
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jrange/bin/jrange.jar" sourcepath="/JRange"/>
26-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/bin/jsimple_types.jar" sourcepath="/JSimpleTypes/src"/>
41+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/bin/jsimple_types.jar" sourcepath="/JSimpleTypes"/>
2742
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/json-io/bin/json_io.jar" sourcepath="/JsonIo"/>
43+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/json-stringify/bin/json_stringify.jar" sourcepath="/JsonStringify"/>
2844
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jstreamish/bin/jstreamish.jar" sourcepath="/JStreamish"/>
2945
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/bin/jtext_parser.jar" sourcepath="/JTextParser"/>
3046
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-template/bin/jtext_template.jar" sourcepath="/JTextTemplate"/>
3147
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/bin/jtext_util.jar" sourcepath="/JTextUtil"/>
3248
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/bin/jtree_walker.jar" sourcepath="/JTreeWalker"/>
3349
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtuples/bin/jtuples.jar" sourcepath="/JTuples"/>
3450
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/bin/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>
35-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparse-primitive/bin/jparse_primitive.jar" sourcepath="/JParsePrimitive"/>
36-
<classpathentry kind="output" path="bin"/>
3751
</classpath>

‎CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
44

55

66
--------
7-
###[0.12.0](N/A) - 2016-09-13
7+
###[0.12.1](N/A) - 2016-10-02
8+
#### Changed
9+
* Updated dependencies, specifically jfile-io to 0.7.0 which no longer contains JsonWrite, so added json-stringify library for new equivalent JsonStringify class and updated related code
10+
11+
12+
--------
13+
###[0.12.0](https://github.com/TeamworkGuy2/JParseCode/commit/0ca793a0dd5f2d41f629e7f133dbd3bf2a2c4adb) - 2016-09-13
814
#### Added
915
* PerformanceTrackers, ParseTimes, TokenizeStepDetails in new twg2.parser.codeParser.tools.performance package - used for tracking performance
1016

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
JParseCode
22
==============
3-
version: 0.12.0
3+
version: 0.12.1
44

55
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.
66

‎bin/jparse_code-with-tests.jar

-3.33 KB
Binary file not shown.

‎bin/jparse_code.jar

201 Bytes
Binary file not shown.

‎package-lib.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
2-
"version" : "0.12.0",
2+
"version" : "0.12.1",
33
"name" : "jparse-code",
4-
"description" : "An in-progress suite of parsing tools for C#, Java, and TypeScript source code",
4+
"description" : "An in-progress suite of parsing/transpilation tools for C#, Java, and TypeScript code. Generates simple JSON ASTs.",
55
"homepage" : "https://github.com/TeamworkGuy2/JParseCode",
66
"license" : "MIT",
77
"main" : "./bin/jparse_code.jar",
88
"dependencies" : {
99
"jackson-annotations": "~2.5.0",
1010
"jackson-core": "~2.5.0",
1111
"jackson-databind": "~2.5.0",
12-
"jarray-util": "*",
12+
"jarrays": "*",
13+
"jcollection-builders": "*",
1314
"jcollection-util": "*",
1415
"jdata-util": "*",
1516
"jdate-times": "*",
@@ -21,9 +22,11 @@
2122
"jrange": "*",
2223
"jsimple-types": "*",
2324
"json-io": "*",
25+
"json-stringify": "*",
2426
"jstreamish": "*",
2527
"jtext-parser": "*",
2628
"jtext-util": "*",
27-
"jtree-walker": "*"
29+
"jtree-walker": "*",
30+
"jtuples": "*"
2831
}
2932
}

‎src/twg2/ast/interm/classes/ClassAst.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import twg2.ast.interm.method.MethodSig;
1414
import twg2.ast.interm.method.ParameterSig;
1515
import twg2.ast.interm.method.ParameterSigResolved;
16-
import twg2.io.write.JsonWrite;
16+
import twg2.io.json.stringify.JsonStringify;
1717
import twg2.parser.codeParser.BlockType;
1818
import twg2.parser.codeParser.tools.NameUtil;
1919
import twg2.parser.output.JsonWritableSig;
@@ -80,14 +80,14 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
8080
dst.append("\t\"blockType\": \"" + blockType + "\",\n");
8181

8282
dst.append("\t\"using\": [");
83-
JsonWrite.joinStr(usingStatements, ", ", dst, (us) -> '"' + NameUtil.joinFqName(us) + '"');
83+
JsonStringify.join(usingStatements, ", ", dst, (us) -> '"' + NameUtil.joinFqName(us) + '"');
8484
dst.append("],\n");
8585

8686
if(enumMembers != null && blockType.isEnum()) {
8787
dst.append("\t\"enumMembers\": [");
8888
if(enumMembers.size() > 0) {
8989
dst.append("\n\t\t");
90-
JsonWrite.joinStrConsume(enumMembers, ",\n\t\t", dst, (f) -> f.toJson(dst, st));
90+
JsonStringify.joinConsume(enumMembers, ",\n\t\t", dst, (f) -> f.toJson(dst, st));
9191
dst.append("\n\t");
9292
}
9393
dst.append("],\n");
@@ -96,15 +96,15 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
9696
dst.append("\t\"fields\": [");
9797
if(fields.size() > 0) {
9898
dst.append("\n\t\t");
99-
JsonWrite.joinStrConsume(fields, ",\n\t\t", dst, (f) -> f.toJson(dst, st));
99+
JsonStringify.joinConsume(fields, ",\n\t\t", dst, (f) -> f.toJson(dst, st));
100100
dst.append("\n\t");
101101
}
102102
dst.append("],\n");
103103

104104
dst.append("\t\"methods\": [");
105105
if(methods.size() > 0) {
106106
dst.append("\n\t\t");
107-
JsonWrite.joinStrConsume(methods, ",\n\t\t", dst, (m) -> m.toJson(dst, st));
107+
JsonStringify.joinConsume(methods, ",\n\t\t", dst, (m) -> m.toJson(dst, st));
108108
dst.append("\n\t");
109109
}
110110
dst.append("]\n");

‎src/twg2/ast/interm/classes/ClassSig.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import lombok.Getter;
88
import twg2.annotations.Immutable;
99
import twg2.ast.interm.type.TypeSig;
10-
import twg2.io.write.JsonWrite;
10+
import twg2.io.json.stringify.JsonStringify;
1111
import twg2.parser.codeParser.AccessModifier;
1212
import twg2.parser.codeParser.tools.NameUtil;
1313
import twg2.parser.output.JsonWritableSig;
@@ -67,14 +67,14 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
6767
if(params != null && params.size() > 0) {
6868
dst.append(", ");
6969
dst.append("\"genericParameters\": [");
70-
JsonWrite.joinStrConsume(params, ", ", dst, (p) -> p.toJson(dst, st));
70+
JsonStringify.joinConsume(params, ", ", dst, (p) -> p.toJson(dst, st));
7171
dst.append("]");
7272
}
7373

7474
if(extendImplementSimpleNames.size() > 0) {
7575
dst.append(", ");
7676
dst.append("\"extendImplementClassNames\": [");
77-
JsonWrite.joinStr(extendImplementSimpleNames, ", ", dst, (n) -> '"' + n + '"');
77+
JsonStringify.join(extendImplementSimpleNames, ", ", dst, (n) -> '"' + n + '"');
7878
dst.append("] ");
7979
}
8080

@@ -130,7 +130,7 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
130130
if(params != null && params.size() > 0) {
131131
dst.append(", ");
132132
dst.append("\"genericParameters\": [");
133-
JsonWrite.joinStrConsume(params, ", ", dst, (p) -> p.toJson(dst, st));
133+
JsonStringify.joinConsume(params, ", ", dst, (p) -> p.toJson(dst, st));
134134
dst.append("]");
135135
}
136136

@@ -143,7 +143,7 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
143143
if(implementInterfaces.size() > 0) {
144144
dst.append(", ");
145145
dst.append("\"implementClassNames\": [");
146-
JsonWrite.joinStrConsume(implementInterfaces, ", ", dst, (intfType) -> intfType.toJson(dst, st));
146+
JsonStringify.joinConsume(implementInterfaces, ", ", dst, (intfType) -> intfType.toJson(dst, st));
147147
dst.append("] ");
148148
}
149149

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import twg2.annotations.Immutable;
88
import twg2.ast.interm.annotation.AnnotationSig;
99
import twg2.ast.interm.type.TypeSig.TypeSigSimple;
10-
import twg2.io.write.JsonWrite;
10+
import twg2.io.json.stringify.JsonStringify;
1111
import twg2.parser.codeParser.AccessModifier;
1212
import twg2.parser.codeParser.extractors.DataTypeExtractor;
1313
import twg2.parser.codeParser.tools.NameUtil;
@@ -43,17 +43,17 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
4343
dst.append(", ");
4444

4545
dst.append("\"accessModifiers\": [");
46-
JsonWrite.joinStr(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
46+
JsonStringify.join(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
4747
dst.append("], ");
4848

4949
dst.append("\"annotations\": [");
50-
JsonWrite.joinStrConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
50+
JsonStringify.joinConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
5151
dst.append("], ");
5252

5353
initializerToJson(initializer, dst, st);
5454

5555
dst.append("\"comments\": [");
56-
JsonWrite.joinStrConsume(comments, ", ", dst, (str) -> { dst.append('"'); dst.append(StringEscapeJson.toJsonString(str)); dst.append('"'); });
56+
JsonStringify.joinConsume(comments, ", ", dst, (str) -> { dst.append('"'); StringEscapeJson.toJsonString(str, 0, str.length(), dst); dst.append('"'); });
5757
dst.append("]");
5858

5959
dst.append(" }");

‎src/twg2/ast/interm/field/FieldDefResolved.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import twg2.annotations.Immutable;
88
import twg2.ast.interm.annotation.AnnotationSig;
99
import twg2.ast.interm.type.TypeSig.TypeSigResolved;
10-
import twg2.io.write.JsonWrite;
10+
import twg2.io.json.stringify.JsonStringify;
1111
import twg2.parser.codeParser.AccessModifier;
1212
import twg2.parser.codeParser.tools.NameUtil;
1313
import twg2.parser.fragment.CodeFragment;
@@ -41,17 +41,17 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
4141
dst.append(", ");
4242

4343
dst.append("\"accessModifiers\": [");
44-
JsonWrite.joinStr(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
44+
JsonStringify.join(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
4545
dst.append("], ");
4646

4747
dst.append("\"annotations\": [");
48-
JsonWrite.joinStrConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
48+
JsonStringify.joinConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
4949
dst.append("], ");
5050

5151
FieldDef.initializerToJson(initializer, dst, st);
5252

5353
dst.append("\"comments\": [");
54-
JsonWrite.joinStrConsume(comments, ", ", dst, (str) -> { dst.append('"'); dst.append(StringEscapeJson.toJsonString(str)); dst.append('"'); });
54+
JsonStringify.joinConsume(comments, ", ", dst, (str) -> { dst.append('"'); StringEscapeJson.toJsonString(str, 0, str.length(), dst); dst.append('"'); });
5555
dst.append("]");
5656

5757
dst.append(" }");

‎src/twg2/ast/interm/field/FieldSig.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import twg2.annotations.Immutable;
99
import twg2.ast.interm.annotation.AnnotationSig;
1010
import twg2.ast.interm.type.TypeSig;
11-
import twg2.io.write.JsonWrite;
11+
import twg2.io.json.stringify.JsonStringify;
1212
import twg2.parser.codeParser.AccessModifier;
1313
import twg2.parser.codeParser.tools.NameUtil;
1414
import twg2.parser.output.JsonWritableSig;
@@ -41,15 +41,15 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
4141
dst.append(", ");
4242

4343
dst.append("\"accessModifiers\": [");
44-
JsonWrite.joinStr(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
44+
JsonStringify.join(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
4545
dst.append("], ");
4646

4747
dst.append("\"annotations\": [");
48-
JsonWrite.joinStrConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
48+
JsonStringify.joinConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
4949
dst.append("], ");
5050

5151
dst.append("\"comments\": [");
52-
JsonWrite.joinStrConsume(comments, ", ", dst, (str) -> { dst.append('"'); dst.append(StringEscapeJson.toJsonString(str)); dst.append('"'); });
52+
JsonStringify.joinConsume(comments, ", ", dst, (str) -> { dst.append('"'); StringEscapeJson.toJsonString(str, 0, str.length(), dst); dst.append('"'); });
5353
dst.append("]");
5454

5555
dst.append(" }");

‎src/twg2/ast/interm/field/FieldSigResolved.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import twg2.annotations.Immutable;
99
import twg2.ast.interm.annotation.AnnotationSig;
1010
import twg2.ast.interm.type.TypeSig;
11-
import twg2.io.write.JsonWrite;
11+
import twg2.io.json.stringify.JsonStringify;
1212
import twg2.parser.codeParser.AccessModifier;
1313
import twg2.parser.codeParser.tools.NameUtil;
1414
import twg2.parser.output.JsonWritableSig;
@@ -42,15 +42,15 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
4242
dst.append(", ");
4343

4444
dst.append("\"accessModifiers\": [");
45-
JsonWrite.joinStr(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
45+
JsonStringify.join(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
4646
dst.append("], ");
4747

4848
dst.append("\"annotations\": [");
49-
JsonWrite.joinStrConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
49+
JsonStringify.joinConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
5050
dst.append("], ");
5151

5252
dst.append("\"comments\": [");
53-
JsonWrite.joinStrConsume(comments, ", ", dst, (str) -> { dst.append('"'); dst.append(StringEscapeJson.toJsonString(str)); dst.append('"'); });
53+
JsonStringify.joinConsume(comments, ", ", dst, (str) -> { dst.append('"'); StringEscapeJson.toJsonString(str, 0, str.length(), dst); dst.append('"'); });
5454
dst.append("]");
5555

5656
dst.append(" }");

‎src/twg2/ast/interm/method/MethodSig.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import twg2.annotations.Immutable;
99
import twg2.ast.interm.annotation.AnnotationSig;
1010
import twg2.ast.interm.type.TypeSig;
11-
import twg2.io.write.JsonWrite;
11+
import twg2.io.json.stringify.JsonStringify;
1212
import twg2.parser.codeParser.AccessModifier;
1313
import twg2.parser.codeParser.tools.NameUtil;
1414
import twg2.parser.output.JsonWritableSig;
@@ -64,23 +64,23 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
6464
dst.append("\"name\": \"" + (st.fullMethodName ? NameUtil.joinFqName(fullName) : fullName.get(fullName.size() - 1)) + "\", ");
6565

6666
dst.append("\"parameters\": [");
67-
JsonWrite.joinStrConsume(paramSigs, ", ", dst, (param) -> param.toJson(dst, st));
67+
JsonStringify.joinConsume(paramSigs, ", ", dst, (param) -> param.toJson(dst, st));
6868
dst.append("], ");
6969

7070
dst.append("\"accessModifiers\": [");
71-
JsonWrite.joinStr(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
71+
JsonStringify.join(accessModifiers, ", ", dst, (acs) -> '"' + acs.toSrc() + '"');
7272
dst.append("], ");
7373

7474
dst.append("\"annotations\": [");
75-
JsonWrite.joinStrConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
75+
JsonStringify.joinConsume(annotations, ", ", dst, (ann) -> ann.toJson(dst, st));
7676
dst.append("], ");
7777

7878
dst.append("\"returnType\": ");
7979
returnType.toJson(dst, st);
8080
dst.append(", ");
8181

8282
dst.append("\"comments\": [");
83-
JsonWrite.joinStrConsume(comments, ", ", dst, (str) -> { dst.append('"'); dst.append(StringEscapeJson.toJsonString(str)); dst.append('"'); });
83+
JsonStringify.joinConsume(comments, ", ", dst, (str) -> { dst.append('"'); StringEscapeJson.toJsonString(str, 0, str.length(), dst); dst.append('"'); });
8484
dst.append("]");
8585

8686
dst.append(" }");

‎src/twg2/ast/interm/type/TypeSig.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import lombok.Getter;
88
import lombok.val;
99
import twg2.annotations.Immutable;
10-
import twg2.io.write.JsonWrite;
10+
import twg2.io.json.stringify.JsonStringify;
1111
import twg2.parser.codeParser.tools.NameUtil;
1212
import twg2.parser.output.JsonWritableSig;
1313
import twg2.parser.output.WriteSettings;
@@ -163,7 +163,7 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
163163
dst.append("\"typeName\": \"" + typeName + "\", ");
164164

165165
dst.append("\"genericParameters\": [");
166-
JsonWrite.joinStrConsume(params, ", ", dst, (param) -> param.toJson(dst, st));
166+
JsonStringify.joinConsume(params, ", ", dst, (param) -> param.toJson(dst, st));
167167
dst.append("]");
168168

169169
if(arrayDimensions > 0) {
@@ -344,7 +344,7 @@ public void toJson(Appendable dst, WriteSettings st) throws IOException {
344344
dst.append("\"typeName\": \"" + NameUtil.joinFqName(fullName) + "\", ");
345345

346346
dst.append("\"genericParameters\": [");
347-
JsonWrite.joinStrConsume(params, ", ", dst, (param) -> param.toJson(dst, st));
347+
JsonStringify.joinConsume(params, ", ", dst, (param) -> param.toJson(dst, st));
348348
dst.append("]");
349349

350350
if(arrayDimensions > 0) {

0 commit comments

Comments
 (0)