Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

'var' is a js keyword, rename it to variable.

This commit is contained in:
Willi Goesgens 2014-09-04 13:26:52 +02:00
parent 8f1123c8b9
commit 2943451c6c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Aql/RangeInfo.h
View File

@ -156,7 +156,7 @@ namespace triagens {
RangeInfo () : _valid(false), _undefined(true) {} RangeInfo () : _valid(false), _undefined(true) {}
RangeInfo (basics::Json const& json) : RangeInfo (basics::Json const& json) :
_var(basics::JsonHelper::checkAndGetStringValue(json.json(), "var")), _var(basics::JsonHelper::checkAndGetStringValue(json.json(), "variable")),
_attr(basics::JsonHelper::checkAndGetStringValue(json.json(), "attr")), _attr(basics::JsonHelper::checkAndGetStringValue(json.json(), "attr")),
_valid(basics::JsonHelper::checkAndGetBooleanValue(json.json(), "valid")), _valid(basics::JsonHelper::checkAndGetBooleanValue(json.json(), "valid")),
_undefined(false) { _undefined(false) {
@ -180,7 +180,7 @@ namespace triagens {
Json toJson () { Json toJson () {
Json item(basics::Json::Array); Json item(basics::Json::Array);
item("var", Json(_var))("attr", Json(_attr)); item("variable", Json(_var))("attr", Json(_attr));
if(!_low._undefined){ if(!_low._undefined){
item("low", _low.toJson()); item("low", _low.toJson());
} }
@ -256,7 +256,7 @@ namespace triagens {
for (auto x : _ranges) { for (auto x : _ranges) {
for (auto y: x.second){ for (auto y: x.second){
Json item(Json::Array); Json item(Json::Array);
item("var", Json(x.first)) item("variable", Json(x.first))
("attribute name", Json(y.first)) ("attribute name", Json(y.first))
("range info", y.second.toJson()); ("range info", y.second.toJson());
list(item); list(item);