Skip to content

Parse data not in a data structure #14

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

Merged
betzrhodes merged 4 commits into from
Jul 2, 2019
Merged

Parse data not in a data structure #14

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28ace8e
Merge pull request #13 from electricimp/develop
Jun 27, 2019
5c43d9f
Can now parse data not in a data structure
toddallen97 Jul 2, 2019
2c150ed
Update JSONParser.class.nut
toddallen97 Jul 2, 2019
e7ebe29
Update arguments
toddallen97 Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions JSONParser.class.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ class JSONParser {

// current tokenizeing position
local start = 0;

local lastToken = null;

try {

local
Expand All @@ -262,7 +263,8 @@ class JSONParser {
tokenizer = _JSONTokenizer();

while (token = tokenizer.nextToken(str, start)) {

lastToken = token;

if ("ptfn" == token.type) {
// punctuation/true/false/null
action[token.value][state]();
Expand All @@ -284,13 +286,18 @@ class JSONParser {
}

// check is the final state is not ok
// or if there is somethign left in the str
// or if there is something left in the str
if (state != "ok" || regexp("[^\\s]").capture(str, start)) {
local min = @(a, b) a < b ? a : b;
local near = str.slice(start, min(str.len(), start + 10));
throw "JSON Syntax Error near `" + near + "`";
}

// if this is a standalone string or number, convert it
if (lastToken.type == "string" || lastToken.type == "number") {
return this._convert(lastToken.value, lastToken.type, converter)
}

return value;
}

Expand Down