Skip to content

Pass "key" to converter function for parse method #7

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
mm-gmbd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass "key" to converter function for parse method #7

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
20 changes: 10 additions & 10 deletions JSONParser.class.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ class JSONParser {
state = "colon";
},
ovalue = function () {
value = this._convert(value, "string", converter);
value = this._convert(value, "string", converter, key);
state = "ocomma";
}.bindenv(this),
firstavalue = function () {
value = this._convert(value, "string", converter);
value = this._convert(value, "string", converter, key);
state = "acomma";
}.bindenv(this),
avalue = function () {
value = this._convert(value, "string", converter);
value = this._convert(value, "string", converter, key);
state = "acomma";
}.bindenv(this)
};
Expand All @@ -63,15 +63,15 @@ class JSONParser {
state = "ok";
},
ovalue = function () {
value = this._convert(value, "number", converter);
value = this._convert(value, "number", converter, key);
state = "ocomma";
}.bindenv(this),
firstavalue = function () {
value = this._convert(value, "number", converter);
value = this._convert(value, "number", converter, key);
state = "acomma";
}.bindenv(this),
avalue = function () {
value = this._convert(value, "number", converter);
value = this._convert(value, "number", converter, key);
state = "acomma";
}.bindenv(this)
};
Expand Down Expand Up @@ -297,23 +297,23 @@ class JSONParser {
* @param {string} type
* @param {function|null} converter
*/
function _convert(value, type, converter) {
function _convert(value, type, converter, key) {
if ("function" == typeof converter) {

// # of params for converter function

local parametercCount = 2;

// .getinfos() is missing on ei platform
// .getinfos() is missing on ei platform //TODO: When this is available, then this check will fail because the "key" argument has been added
if ("getinfos" in converter) {
parametercCount = converter.getinfos().parameters.len()
- 1 /* "this" is also included */;
}

if (parametercCount == 1) {
return converter(value);
return converter(value, key);
} else if (parametercCount == 2) {
return converter(value, type);
return converter(value, type, key);
} else {
throw "Error: converter function must take 1 or 2 parameters"
}
Expand Down