tcl: Phase 2 eval engine — tcl-eval-script + set/puts/incr/append (+20 tests, 87 total)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/tcl/test.sh

@@ -11,9 +11,19 @@ if [ ! -x "$SX_SERVER" ]; then echo "ERROR: sx_server.exe not found"; exit 1; fi
 
 VERBOSE="${1:-}"
 TMPFILE=$(mktemp)
-trap "rm -f $TMPFILE" EXIT
+HELPER=$(mktemp --suffix=.sx)
+trap "rm -f $TMPFILE $HELPER" EXIT
 
-cat > "$TMPFILE" << 'EPOCHS'
+# Helper file: run both test suites and format a parseable summary string
+cat > "$HELPER" << 'HELPER_EOF'
+(define __pr (tcl-run-parse-tests))
+(define __er (tcl-run-eval-tests))
+(define tcl-test-summary
+  (str "PARSE:" (get __pr "passed") ":" (get __pr "failed")
+       " EVAL:" (get __er "passed") ":" (get __er "failed")))
+HELPER_EOF
+
+cat > "$TMPFILE" << EPOCHS
 (epoch 1)
 (load "lib/tcl/tokenizer.sx")
 (epoch 2)
@@ -21,33 +31,51 @@ cat > "$TMPFILE" << 'EPOCHS'
 (epoch 3)
 (load "lib/tcl/tests/parse.sx")
 (epoch 4)
-(eval "(tcl-run-parse-tests)")
+(load "lib/tcl/runtime.sx")
+(epoch 5)
+(load "lib/tcl/tests/eval.sx")
+(epoch 6)
+(load "$HELPER")
+(epoch 7)
+(eval "tcl-test-summary")
 EPOCHS
 
 OUTPUT=$(timeout 30 "$SX_SERVER" < "$TMPFILE" 2>&1)
 [ "$VERBOSE" = "-v" ] && echo "$OUTPUT"
 
-# Result follows an (ok-len 3 N) line
-RESULT=$(echo "$OUTPUT" | grep -A1 "^(ok-len 4 " | tail -1)
-if [ -z "$RESULT" ]; then
-  RESULT=$(echo "$OUTPUT" | grep "^(ok 4 " | sed 's/^(ok 3 //' | sed 's/)$//')
-fi
-if [ -z "$RESULT" ]; then
-  echo "ERROR: no result from epoch 4"
-  echo "$OUTPUT" | tail -10
+# Extract summary line from epoch 7 output
+SUMMARY=$(echo "$OUTPUT" | grep -A1 "^(ok-len 7 " | tail -1 | tr -d '"')
+
+if [ -z "$SUMMARY" ]; then
+  echo "ERROR: no summary from test run"
+  echo "$OUTPUT" | tail -20
   exit 1
 fi
 
-PASSED=$(echo "$RESULT" | grep -o ':passed [0-9]*' | grep -o '[0-9]*$')
-FAILED=$(echo "$RESULT" | grep -o ':failed [0-9]*' | grep -o '[0-9]*$')
-PASSED=${PASSED:-0}; FAILED=${FAILED:-1}
-TOTAL=$((PASSED + FAILED))
+# Parse PARSE:N:M EVAL:N:M
+PARSE_PART=$(echo "$SUMMARY" | grep -o 'PARSE:[0-9]*:[0-9]*')
+EVAL_PART=$(echo "$SUMMARY"  | grep -o 'EVAL:[0-9]*:[0-9]*')
 
-if [ "$FAILED" = "0" ]; then
-  echo "ok $PASSED/$TOTAL tcl-tokenize tests passed"
+PARSE_PASSED=$(echo "$PARSE_PART" | cut -d: -f2)
+PARSE_FAILED=$(echo "$PARSE_PART" | cut -d: -f3)
+EVAL_PASSED=$(echo "$EVAL_PART"   | cut -d: -f2)
+EVAL_FAILED=$(echo "$EVAL_PART"   | cut -d: -f3)
+
+PARSE_PASSED=${PARSE_PASSED:-0}; PARSE_FAILED=${PARSE_FAILED:-1}
+EVAL_PASSED=${EVAL_PASSED:-0};   EVAL_FAILED=${EVAL_FAILED:-1}
+
+TOTAL_PASSED=$((PARSE_PASSED + EVAL_PASSED))
+TOTAL_FAILED=$((PARSE_FAILED + EVAL_FAILED))
+TOTAL=$((TOTAL_PASSED + TOTAL_FAILED))
+
+if [ "$TOTAL_FAILED" = "0" ]; then
+  echo "ok $TOTAL_PASSED/$TOTAL tcl tests passed (parse: $PARSE_PASSED, eval: $EVAL_PASSED)"
   exit 0
 else
-  echo "FAIL $PASSED/$TOTAL passed, $FAILED failed"
-  echo "$RESULT"
+  echo "FAIL $TOTAL_PASSED/$TOTAL passed, $TOTAL_FAILED failed (parse: $PARSE_PASSED/$((PARSE_PASSED+PARSE_FAILED)), eval: $EVAL_PASSED/$((EVAL_PASSED+EVAL_FAILED)))"
+  if [ -z "$VERBOSE" ]; then
+    echo "--- output ---"
+    echo "$OUTPUT" | tail -20
+  fi
   exit 1
 fi