diff --git a/Global.cpp b/Global.cpp index c93ef06..485dd25 100644 --- a/Global.cpp +++ b/Global.cpp @@ -36,7 +36,6 @@ namespace jet { coreutils::MString Global::processModifier(coreutils::MString &value, coreutils::MString &modifier) { if(modifier == "") return value; - std::cout << "mod: " << modifier << std::endl; if(modifier == "tobinary") return value.toBinary(); else if(modifier == "frombinary") diff --git a/__call.cpp b/__call.cpp index 200a301..83fa037 100644 --- a/__call.cpp +++ b/__call.cpp @@ -54,9 +54,9 @@ namespace jet { if(!variableDefined("scope") || (variables["scope"] == "global")) global.variables[variables["name"]].read(fdo[0]); else if(variables["scope"] == "local") - local->variables[variables["name"]].read(fdo[0]); + this->local->variables[variables["name"]].read(fdo[0]); else if(variables["scope"] == "parent") - local->parent->local->variables[variables["name"]].read(fdo[0]); + this->local->parent->local->variables[variables["name"]].read(fdo[0]); else throw coreutils::Exception("scope value is not valid."); diff --git a/tests/testfor.jet b/tests/testfor.jet index d7eae3f..2b2e98e 100755 --- a/tests/testfor.jet +++ b/tests/testfor.jet @@ -2,8 +2,6 @@ - #[scope] - - -->[iz]-[iy]-#[ix]<-- + -->#[ix]<-- diff --git a/tests/testvar.jet b/tests/testvar.jet index 591b836..61a5be6 100755 --- a/tests/testvar.jet +++ b/tests/testvar.jet @@ -9,15 +9,14 @@ test1=[$[test1]] name1=[#[name1]] -$[$[ix]var$[ix];binary] +$[$[ix]var$[ix];tobinary] $[var$[ix]] $[var$[ix]var] $[var$[i$[letterx]]var] -$[letterx;TOHEX] +$[letterx;tohex] $[var$[i$[letterx]]$[ix]] $[var$[i$[letterx]]$[i$[letterx]]] $[ix] $[ix] -#[iy]