cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error reporting around function calls with incorrect arity

Browse Source
This commit is contained in:
Tom MacWright 2011-12-07 22:57:55 -05:00
parent be5abb3bdc
commit 67ddce9ab6
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/carto/parser.js
View File

@ -485,7 +485,7 @@ carto.Parser = function Parser(env) {
if (! $(')')) return;
if (name) { return new tree.Call(name, args) }
if (name) { return new tree.Call(name, args, i) }
},
arguments: function() {
var args = [], arg;

19
lib/carto/tree/call.js
View File

@ -3,9 +3,10 @@
//
// A function call node.
//
tree.Call = function Call(name, args) {
tree.Call = function Call(name, args, index) {
this.name = name;
this.args = args;
this.index = index;
};
tree.Call.prototype = {
//
@ -33,7 +34,21 @@ tree.Call.prototype = {
}
if (this.name in tree.functions) { // 1.
return tree.functions[this.name].apply(tree.functions, args);
if (tree.functions[this.name].length === args.length) {
return tree.functions[this.name].apply(tree.functions, args);
} else {
env.error({
message: 'incorrect number of arguments for ' + this.name +
'(). ' + tree.functions[this.name].length + ' expected.',
index: this.index,
type: 'runtime',
filename: this.filename
});
return {
is: 'undefined',
value: 'undefined'
};
}
} else { // 2.
return new tree.Anonymous(this.name +
'(' + args.map(function(a) { return a.toString(); }).join(', ') + ')');