X-Git-Url: http://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/c5810975e3ec971fc8caf65f58b77c96c97b2571..74321600d30da35329fdab76094ab990398d6587:/tests/general.at

diff --git a/tests/general.at b/tests/general.at
index 498028e..7b34b9d 100644
--- a/tests/general.at
+++ b/tests/general.at
@@ -63,13 +63,33 @@ AT_CLEANUP
 
 AT_SETUP([cdecl99 help command])
 
-AT_DATA([input], [[help
+AT_DATA([input],
+[[help
 explain int
 ]])
 
-AT_CHECK([cdecl99 -f input], [0], [stdout])
-AT_CHECK([sed -n '$p' stdout], [0], [type int
-])
+# Program to generate expected output based on src/execute.gperf
+AT_DATA([expout.sed],
+[[#n
+/^%%$/,/^%%$/ {
+  s/^exit.*//
+  s/,.*//p
+}
+$a\
+type int
+]])
+sed -f expout.sed "$srcdir/src/execute.gperf" >expout
+
+# Program to filter the help output to extract the command list from "help"
+# without any descriptions.
+AT_DATA([filter.sed],
+[[/^ /,$ !d
+/^          /d
+s/^  *\([^ ]*\).*/\1/
+]])
+
+AT_CHECK([LC_ALL=C cdecl99 -f input >stdout && sed -f filter.sed stdout],
+  [0], [expout])
 
 AT_CLEANUP
 
@@ -115,7 +135,7 @@ END { exit(status); }
 ]])
 
 AT_CHECK([LC_ALL=C cdecl99 --file=input || exit 42], [42], [], [stderr])
-AT_CHECK([$AWK -v progname="$progname" -f check.awk stderr])
+AT_CHECK([$AWK -f check.awk progname="$progname" stderr])
 
 exec 3<input
 set x; shift
@@ -123,7 +143,7 @@ while read line <&3; do
   set x "$@" "--execute=$line"; shift;
 done
 AT_CHECK([LC_ALL=C cdecl99 "$@" || exit 42], [42], [], [stderr])
-AT_CHECK([$AWK -v progname="$progname" -f check.awk stderr])
+AT_CHECK([$AWK f check.awk progname="$progname" stderr])
 
 AT_CLEANUP
 
@@ -150,20 +170,64 @@ AT_CHECK([$AWK '{ print $NF; }' stderr], [0],
 
 AT_CLEANUP
 
+dnl Ensure that parse error messages for misplaced keywords correctly
+dnl include the keyword itself.
+AT_SETUP([cdecl99 unexpected keyword error messages])
+
+# We use the English syntax to reliably force a syntax error where we want
+# it, as the "declare" form takes an identifier and not any other token,
+AT_DATA([test.dat],
+[[declare signed as int
+declare typedef as int
+declare volatile as int
+declare inline as int
+]])
+
+AT_DATA([test.awk],
+[[{
+  for (i = 1; i <= $NF; i++) {
+    if ($i == "unexpected") {
+      sub(/,$/, "", $(i+1));
+      print $(i+1);
+      break;
+    }
+  }
+}
+]])
+
+AT_CHECK([LC_ALL=C cdecl99 -f test.dat || exit 42], [42], [], [stderr])
+AT_CHECK([$AWK -f test.awk stderr], [0],
+[[signed
+typedef
+volatile
+inline
+]])
+
+AT_CLEANUP
+
 AT_SETUP([cdecl99 interactive mode])
 
 AT_DATA([test.dat],
-[[explain int x;
+[[explain int () int
+explain int x;
 quit
 ]])
 
-AT_CHECK([cdecl99 --quiet --interactive <test.dat], [0], [stdout])
+AT_CHECK([cdecl99 --quiet --interactive <test.dat], [0], [stdout], [ignore])
 
 # If built with readline support, then the input commands (including their
 # trailing newlines) will be captured by AT_CHECK.  Otherwise, they are not:
 # the output just directly follows the prompt, and the final prompt will
 # not end with a newline.  Attempt to paper over these differences.
-AT_CHECK([echo >>stdout; sed '/> [[eq]]/d; s/^> //; /^$/d' stdout], [0],
+AT_DATA([check.sed],
+[[/> [eq]/d
+:loop
+s/^> //
+t loop
+/^$/d
+]])
+
+AT_CHECK([echo >>stdout; sed -f check.sed stdout], [0],
 [declare x as int
 ])