X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Flexer%2Fscan.at;h=d778d07fa2097af516b0086748c14ee582997202;hb=012b9e4ecf47d844aea352b2c0b7dda80a7194bd;hp=d263352d88f686adcfe9641feab967cf59c3c999;hpb=7972d570c028fabe0d281f2aafbb9e4a8f797239;p=pspp

diff --git a/tests/language/lexer/scan.at b/tests/language/lexer/scan.at
index d263352d88..d778d07fa2 100644
--- a/tests/language/lexer/scan.at
+++ b/tests/language/lexer/scan.at
@@ -894,6 +894,7 @@ SKIP
 MACRO_ID "!macro1"
 LPAREN
 RPAREN
+STRING ""
 SKIP
 STRING "var1 var2 var3"
 SKIP
@@ -905,6 +906,71 @@ STOP
 PSPP_CHECK_SCAN([-i])
 AT_CLEANUP
 
+AT_SETUP([DEFINE command - no newline after parentheses])
+AT_KEYWORDS([scan])
+AT_DATA([input], [dnl
+define !macro1() var1 var2 var3
+!enddefine.
+])
+AT_DATA([expout-base], [dnl
+ID "define"
+SKIP
+MACRO_ID "!macro1"
+LPAREN
+RPAREN
+STRING " var1 var2 var3"
+SKIP
+MACRO_ID "!enddefine"
+ENDCMD
+-SKIP
+STOP
+])
+PSPP_CHECK_SCAN([-i])
+AT_CLEANUP
+
+AT_SETUP([DEFINE command - no newline before !ENDDEFINE])
+AT_KEYWORDS([scan ENDDEFINE])
+AT_DATA([input], [dnl
+define !macro1()
+var1 var2 var3!enddefine.
+])
+AT_DATA([expout-base], [dnl
+ID "define"
+SKIP
+MACRO_ID "!macro1"
+LPAREN
+RPAREN
+STRING ""
+SKIP
+STRING "var1 var2 var3"
+MACRO_ID "!enddefine"
+ENDCMD
+-SKIP
+STOP
+])
+PSPP_CHECK_SCAN([-i])
+AT_CLEANUP
+
+AT_SETUP([DEFINE command - all on one line])
+AT_KEYWORDS([scan])
+AT_DATA([input], [dnl
+define !macro1()var1 var2 var3!enddefine.
+])
+AT_DATA([expout-base], [dnl
+ID "define"
+SKIP
+MACRO_ID "!macro1"
+LPAREN
+RPAREN
+STRING "var1 var2 var3"
+MACRO_ID "!enddefine"
+ENDCMD
+-SKIP
+STOP
+])
+PSPP_CHECK_SCAN([-i])
+AT_CLEANUP
+
 AT_SETUP([DEFINE command - empty])
 AT_KEYWORDS([scan])
 AT_DATA([input], [dnl
@@ -917,6 +983,7 @@ SKIP
 MACRO_ID "!macro1"
 LPAREN
 RPAREN
+STRING ""
 SKIP
 MACRO_ID "!enddefine"
 ENDCMD
@@ -951,6 +1018,7 @@ ID "c"
 LPAREN
 RPAREN
 RPAREN
+STRING ""
 SKIP
 MACRO_ID "!enddefine"
 ENDCMD
@@ -995,6 +1063,7 @@ LPAREN
 RPAREN
 SKIP
 RPAREN
+STRING ""
 SKIP
 MACRO_ID "!enddefine"
 ENDCMD
@@ -1027,6 +1096,7 @@ COMMA
 ID "z"
 SKIP
 RPAREN
+STRING ""
 SKIP
 STRING "content 1"
 SKIP
@@ -1171,6 +1241,7 @@ SKIP
 MACRO_ID "!macro1"
 LPAREN
 RPAREN
+STRING ""
 SKIP
 STRING "content line 1"
 SKIP