X-Git-Url: http://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/663aa8d7a7aa6910f188ac6aa5ccb2c078ad90c8..72aedaedd7afa666f7c69dfe7ef4b7ec3dbc2458:/tests/general.at

diff --git a/tests/general.at b/tests/general.at
index 35c9dbb..21261ed 100644
--- a/tests/general.at
+++ b/tests/general.at
@@ -104,6 +104,7 @@ AT_DATA([input],
 [[explain int a b c
 simplify int a b c
 declare a as b c
+bad command
 ]])
 
 AT_DATA([check.awk],
@@ -116,6 +117,14 @@ 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])
 
+exec 3<input
+set x; shift
+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_CLEANUP
 
 AT_SETUP([cdecl99 invalid character error messages])
@@ -141,15 +150,65 @@ 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([sed '/^>/d' stdout], [0], [declare x as int
+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_DATA([check.sed],
+[[/> [eq]/d
+:loop
+s/^> //
+t loop
+/^$/d
+]])
+
+AT_CHECK([echo >>stdout; sed -f check.sed stdout], [0],
+[declare x as int
 ])
 
 AT_CLEANUP