projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intersecting pcomputes
[pspp]
/
tests
/
language
/
lexer
/
scan.at
diff --git
a/tests/language/lexer/scan.at
b/tests/language/lexer/scan.at
index 53e96921f321b9b72c62d6b9d3038315fd7b46f8..c877628fdf9e43f420f4e6cd268c003d5e21d5ba 100644
(file)
--- a/
tests/language/lexer/scan.at
+++ b/
tests/language/lexer/scan.at
@@
-25,7
+25,7
@@
m4_define([PSPP_CHECK_SCAN],
AT_SETUP([identifiers])
AT_KEYWORDS([scan])
AT_DATA([input], [dnl
AT_SETUP([identifiers])
AT_KEYWORDS([scan])
AT_DATA([input], [dnl
-a aB i5 $x @efg @@. !abcd #.# .x _z.
+a aB i5 $x @efg @@. !abcd
!* !*a
#.# .x _z.
abcd. abcd.
QRSTUV./* end of line comment */
QrStUv./* end of line comment */ @&t@
abcd. abcd.
QRSTUV./* end of line comment */
QrStUv./* end of line comment */ @&t@
@@
-40,6
+40,9
@@
ID "$x"
ID "@efg"
ID "@@."
MACRO_ID "!abcd"
ID "@efg"
ID "@@."
MACRO_ID "!abcd"
+MACRO_ID "!*"
+MACRO_ID "!*"
+ID "a"
ID "#.#"
MACRO_PUNCT "."
ID "x"
ID "#.#"
MACRO_PUNCT "."
ID "x"
@@
-167,13
+170,13
@@
LBRACK
RBRACK
EXP
MACRO_PUNCT "%"
RBRACK
EXP
MACRO_PUNCT "%"
-MACRO_PUNCT ":"
-MACRO_PUNCT ";"
+COLON
+SEMICOLON
MACRO_PUNCT "?"
MACRO_PUNCT "_"
MACRO_PUNCT "`"
MACRO_PUNCT "?"
MACRO_PUNCT "_"
MACRO_PUNCT "`"
-MACRO_PUNCT "{"
-MACRO_PUNCT "}"
+LCURLY
+RCURLY
NOT
STOP
])
NOT
STOP
])
@@
-635,7
+638,7
@@
var1 var2 var3
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING "var1 var2 var3"
LPAREN
RPAREN
STRING "var1 var2 var3"
@@
-654,7
+657,7
@@
define !macro1() var1 var2 var3
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING " var1 var2 var3"
LPAREN
RPAREN
STRING " var1 var2 var3"
@@
-673,7
+676,7
@@
var1 var2 var3!enddefine.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING "var1 var2 var3"
LPAREN
RPAREN
STRING "var1 var2 var3"
@@
-691,7
+694,7
@@
define !macro1()var1 var2 var3!enddefine.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING "var1 var2 var3"
LPAREN
RPAREN
STRING "var1 var2 var3"
@@
-710,7
+713,7
@@
define !macro1()
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
MACRO_ID "!enddefine"
LPAREN
RPAREN
MACRO_ID "!enddefine"
@@
-730,7
+733,7
@@
define !macro1()
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING ""
LPAREN
RPAREN
STRING ""
@@
-750,7
+753,7
@@
define !macro1(a(), b(), c())
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
ID "a"
LPAREN
LPAREN
ID "a"
LPAREN
@@
-783,7
+786,7
@@
define !macro1(
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
ID "a"
LPAREN
LPAREN
ID "a"
LPAREN
@@
-816,7
+819,7
@@
content 2
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
ID "x"
COMMA
LPAREN
ID "x"
COMMA
@@
-841,7
+844,7
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
ENDCMD
ID "data"
ID "list"
ENDCMD
ID "data"
ID "list"
@@
-863,7
+866,7
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
ID "x"
ENDCMD
ID "data"
ID "x"
ENDCMD
ID "data"
@@
-886,7
+889,7
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
ENDCMD
ID "x"
LPAREN
ENDCMD
ID "x"
@@
-912,7
+915,7
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
ENDCMD
ID "data"
ID "list"
ENDCMD
ID "data"
ID "list"
@@
-934,7
+937,7
@@
content line 2
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-
MACRO_ID
"!macro1"
+
STRING
"!macro1"
LPAREN
RPAREN
STRING "content line 1"
LPAREN
RPAREN
STRING "content line 1"