merge

tests/testcall.jet

@@ -0,0 +1,8 @@
+#!../jet-2.0
+<jet name1="localname" filterblanklines="true" trimlines="true">
+<set name="abc" value="abcdefg" />
+<call pgm="cat" error="error" input="$[abc]xyz" name="test1" />
+test1=$[test1]
+name1=#[localname]
+error=$[error]
+</jet>

tests/testexpr.jet

@@ -0,0 +1,9 @@
+#!../jet-2.0
+<jet name1="localname" filterblanklines="true" trimlines="true">
+<set name="test1" value="5 + 5" />
+<set name="test2" expr="expr($[test1])" />
+$[test2]
+<set name="numbers">0123456789</set>
+<set name="lefty" expr="left($[numbers],5)" />
+$[lefty]
+</jet>

tests/testjet.jet

@@ -1,4 +1,4 @@
-#!../jet-2.0
+#!/home/barant/Development/JetCore/jet-2.0
 <jet cgi="true" name1="localname" filterblanklines="true" trimlines="true">
  <header name="Content-Type" value="text/html" />
  <comment>This is a comment and should not show up in the output.</comment>
@@ -21,9 +21,9 @@
  <set name="division" expr="5/3" />
  <set name="divisor" value="8" />
  <set name="nested" expr="(2*(4+4)/$[divisor])*32" />
- $[nested]
+ $[$nested]
  <set name="numbers">0123456789</set>
- <set name="lefty" expr="LEFT('$[numbers]',5)" />
+ <set name="lefty" expr="LEFT($[numbers],5)" />
  lefty=[$[lefty]]
  substring('abcdefg', 1, 3)=[$[theexpr]]
  5+3=($[addition])

tests/testsystem.jet

@@ -0,0 +1,8 @@
+#!../jet-2.0
+<jet name1="localname" filterblanklines="true" trimlines="true">
+<set name="abc" value="abcdefg" />
+<system cmd="cats" input="$[abc]xyz" name="test1" />
+test1=$[test1]
+name1=#[localname]
+error=$[error]
+</jet>

tests/testvar.jet

@@ -1,10 +1,14 @@
 #!../jet-2.0
+<jet name1="localhost" filterblanklines="true" trimlines="true">
+<set name="test1" value="#[name1]" />
+test1=[$[test1]]
 <set name="ix" value="1" />
 <set name="letterx" value="x" />
 <set name="var$[ix]" value="this is a test $[ix]" />
 <set name="1var1" value="This is another test" />
 <set name="var1var" value="Yet another test" />
 <set name="var11" value="it seems to work." />
+name1=[#[name1]]
 $[$[ix]var$[ix];binary]
 $[var$[ix]]
 $[var$[ix]var]
@@ -15,3 +19,4 @@ $[var$[i$[letterx]]$[i$[letterx]]]
 $[ix]
 <set name="ix" expr="$[ix]+1" />
 $[ix]
+</jet>

tests/testwhile.jet

@@ -1,8 +1,8 @@
 #!../jet-2.0
 <jet cgi="false" name1="localname" filterblanklines="true" trimlines="true">
  <set name="ix" value="1" />
- <while expr="$[ix]<=11">
+ <while expr="$[ix] <= 11">
   -->$[ix]<--
-  <set name="ix" expr="$[ix]+1" />
+  <set name="ix" expr="$[ix] + 1" />
  </while>
 </jet>