diff --git a/Operand.cpp b/Operand.cpp index 8916ab6..d2bd0b5 100644 --- a/Operand.cpp +++ b/Operand.cpp @@ -87,6 +87,7 @@ namespace jet { throw coreutils::Exception("Expecting ) at end of TRIM expression."); } else if(in.ifNextIgnoreCase("TOUPPER")) { + } else if(in.ifNextIgnoreCase("TOLOWER")) { } else if(in.ifNextIgnoreCase("REVERSE")) { @@ -94,7 +95,13 @@ namespace jet { } else if(in.ifNextIgnoreCase("CONCAT")) { } else if(in.ifNextIgnoreCase("INTEGER")) { - + if(!in.ifNext("(")) + throw coreutils::Exception("Expecting ( for INTEGER parameters."); + Operand parm1(in, tag); + if(in.ifNext(")")) { + string = parm1.string.asInteger(); + } else + throw coreutils::Exception("Expecting ) at end of INTEGER expression."); } else if(in.ifNextIgnoreCase("ROUND")) { } else if(in.ifNextIgnoreCase("RANDOM")) { diff --git a/__jet.cpp b/__jet.cpp index a48553f..f6e85cd 100644 --- a/__jet.cpp +++ b/__jet.cpp @@ -9,7 +9,6 @@ namespace jet { __jet::__jet(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent, Tag *local) : Tag(in, parentOut, global, parent, this) { if(keywordDefined("cgi") && (resolveKeyword("cgi") == "true")) { global.cgi = true; - char *cookies = getenv("HTTP_COOKIE"); std::cout << cookies << std::endl; diff --git a/tests/testexpr.jet b/tests/testexpr.jet index 3cc7da4..15a5e21 100755 --- a/tests/testexpr.jet +++ b/tests/testexpr.jet @@ -10,4 +10,6 @@ $[lefty]=01234 $[righty]=56789 $[trim]=this is a test + +$[integer]=12430 diff --git a/tests/testvar.jet b/tests/testvar.jet index ba457b0..89c02b4 100755 --- a/tests/testvar.jet +++ b/tests/testvar.jet @@ -19,4 +19,6 @@ $[var$[i$[letterx]]$[i$[letterx]]] $[ix] $[ix] + +$[test64;tobase64]