Skip to content

Workaround for missing putils #101

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
Gulvan0 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −3
Open

Workaround for missing putils #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/json2object/reader/BaseParser.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,18 @@ class BaseParser<T> {
loadJson(json);
}
catch (e:hxjsonast.Error) {
errors.push(ParserError(e.message, putils.convertPosition(e.pos)));
var convertedPos = null;
if (putils != null)
convertedPos = putils.convertPosition(e.pos);
errors.push(ParserError(e.message, convertedPos));
}
return value;
}

public function loadJson(json:hxjsonast.Json, variable:String="") : T {
var pos = putils.convertPosition(json.pos);
var pos = null;
if (putils != null)
pos = putils.convertPosition(json.pos);
switch (json.value) {
case JNull : loadJsonNull(pos, variable);
case JString(s) : loadJsonString(s, pos, variable);
Expand Down Expand Up @@ -223,7 +228,9 @@ class BaseParser<T> {
}

private function objectErrors(assigned:Map<String, Bool>, pos:Position) {
var lastPos:Null<json2object.Position> = putils.convertPosition({file:pos.file, min:pos.max-1, max:pos.max-1});
var lastPos:Null<json2object.Position> = null;
if (putils != null)
lastPos = putils.convertPosition({file:pos.file, min:pos.max-1, max:pos.max-1});
for (s in assigned.keys()) {
if (!assigned[s]) {
errors.push(UninitializedVariable(s, lastPos));
Expand Down
Loading