Skip to content

[WIP] Fully-functional Slices #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] Fully-functional Slices #166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b37c851
now readSlice will read either a DirectSlice, if there were no escape…
Miha-x64 Mar 4, 2018
ddea0e3
fixed len() -> size() function in codegen
Miha-x64 Mar 4, 2018
d231118
probable fix of toString() -> string() function in codegen
Miha-x64 Mar 5, 2018
5a8e98a
Range check
Miha-x64 Mar 6, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed len() -> size() function in codegen
  • Loading branch information
@Miha-x64
Miha-x64 committed Mar 4, 2018
commit ddea0e386cb6e80471b4d9195dc101614f01f2db
2 changes: 1 addition & 1 deletion src/main/java/com/jsoniter/CodegenImplEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public static String genEnum(ClassInfo classInfo) {
StringBuilder lines = new StringBuilder();
append(lines, "if (iter.readNull()) { return null; }");
append(lines, "com.jsoniter.slice.Slice field = com.jsoniter.CodegenAccess.readSlice(iter);");
append(lines, "switch (field.len()) {");
append(lines, "switch (field.size()) {");
append(lines, renderTriTree(buildTriTree(Arrays.asList(classInfo.clazz.getEnumConstants()))));
append(lines, "}"); // end of switch
append(lines, String.format("throw iter.reportError(\"decode enum\", field + \" is not valid enum for %s\");", classInfo.clazz.getName()));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/jsoniter/CodegenImplObjectStrict.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static String genObjectUsingStrict(ClassDescriptor desc) {
}
}
if (hasAnythingToBindFrom(allBindings)) {
append(lines, "switch (field.len()) {");
append(lines, "switch (field.size()) {");
append(lines, rendered);
append(lines, "}"); // end of switch
}
Expand All @@ -114,7 +114,7 @@ public static String genObjectUsingStrict(ClassDescriptor desc) {
append(lines, "while (com.jsoniter.CodegenAccess.nextToken(iter) == ',') {");
append(lines, "field = com.jsoniter.CodegenAccess.readObjectFieldAsSlice(iter);");
if (hasAnythingToBindFrom(allBindings)) {
append(lines, "switch (field.len()) {");
append(lines, "switch (field.size()) {");
append(lines, rendered);
append(lines, "}"); // end of switch
}
Expand Down