smalltalk: expression parser + 47 parse tests

lib/smalltalk/test.sh

@@ -31,6 +31,8 @@ for arg in "$@"; do
 done
 
 if [ ${#FILES[@]} -eq 0 ]; then
+  # tokenize.sx must load first — it defines the st-test helpers reused by
+  # subsequent test files. Sort enforces this lexicographically.
   mapfile -t FILES < <(find lib/smalltalk/tests -maxdepth 2 -name '*.sx' | sort)
 fi
 
@@ -41,7 +43,8 @@ FAILED_FILES=()
 for FILE in "${FILES[@]}"; do
   [ -f "$FILE" ] || { echo "skip $FILE (not found)"; continue; }
   TMPFILE=$(mktemp)
-  cat > "$TMPFILE" <<EPOCHS
+  if [ "$(basename "$FILE")" = "tokenize.sx" ]; then
+    cat > "$TMPFILE" <<EPOCHS
 (epoch 1)
 (load "lib/smalltalk/tokenizer.sx")
 (epoch 2)
@@ -49,14 +52,30 @@ for FILE in "${FILES[@]}"; do
 (epoch 3)
 (eval "(list st-test-pass st-test-fail)")
 EPOCHS
+  else
+    cat > "$TMPFILE" <<EPOCHS
+(epoch 1)
+(load "lib/smalltalk/tokenizer.sx")
+(epoch 2)
+(load "lib/smalltalk/parser.sx")
+(epoch 3)
+(load "lib/smalltalk/tests/tokenize.sx")
+(epoch 4)
+(load "$FILE")
+(epoch 5)
+(eval "(list st-test-pass st-test-fail)")
+EPOCHS
+  fi
 
   OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>&1 || true)
   rm -f "$TMPFILE"
 
-  LINE=$(echo "$OUTPUT" | awk '/^\(ok-len 3 / {getline; print; exit}')
+  # Final epoch's value: either (ok N (P F)) on one line or
+  # (ok-len N M)\n(P F) where the value is on the following line.
+  LINE=$(echo "$OUTPUT" | awk '/^\(ok-len [0-9]+ / {getline; print}' | tail -1)
   if [ -z "$LINE" ]; then
-    LINE=$(echo "$OUTPUT" | grep -E '^\(ok 3 \([0-9]+ [0-9]+\)\)' | tail -1 \
-            | sed -E 's/^\(ok 3 //; s/\)$//')
+    LINE=$(echo "$OUTPUT" | grep -E '^\(ok [0-9]+ \([0-9]+ [0-9]+\)\)' | tail -1 \
+            | sed -E 's/^\(ok [0-9]+ //; s/\)$//')
   fi
   if [ -z "$LINE" ]; then
     echo "X $FILE: could not extract summary"
@@ -73,7 +92,8 @@ EPOCHS
     FAILED_FILES+=("$FILE")
     printf 'X %-40s %d/%d\n' "$FILE" "$P" "$((P+F))"
     TMPFILE2=$(mktemp)
-    cat > "$TMPFILE2" <<EPOCHS
+    if [ "$(basename "$FILE")" = "tokenize.sx" ]; then
+      cat > "$TMPFILE2" <<EPOCHS
 (epoch 1)
 (load "lib/smalltalk/tokenizer.sx")
 (epoch 2)
@@ -81,7 +101,21 @@ EPOCHS
 (epoch 3)
 (eval "(map (fn (f) (get f :name)) st-test-fails)")
 EPOCHS
-    FAILS=$(timeout 60 "$SX_SERVER" < "$TMPFILE2" 2>&1 | grep -E '^\(ok 3 ' || true)
+    else
+      cat > "$TMPFILE2" <<EPOCHS
+(epoch 1)
+(load "lib/smalltalk/tokenizer.sx")
+(epoch 2)
+(load "lib/smalltalk/parser.sx")
+(epoch 3)
+(load "lib/smalltalk/tests/tokenize.sx")
+(epoch 4)
+(load "$FILE")
+(epoch 5)
+(eval "(map (fn (f) (get f :name)) st-test-fails)")
+EPOCHS
+    fi
+    FAILS=$(timeout 60 "$SX_SERVER" < "$TMPFILE2" 2>&1 | grep -E '^\(ok [0-9]+ \(' | tail -1 || true)
     rm -f "$TMPFILE2"
     echo "    $FAILS"
   elif [ "$VERBOSE" = "1" ]; then