projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
documentation
[pspp]
/
tests
/
language
/
lexer
/
scan.at
diff --git
a/tests/language/lexer/scan.at
b/tests/language/lexer/scan.at
index fe53f37a8f6d6fba8d56e19b53fbf229210924f4..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@
@@
-34,52
+34,32
@@
WXYZ. /* unterminated end of line comment
])
AT_DATA([expout-base], [dnl
ID "a"
])
AT_DATA([expout-base], [dnl
ID "a"
-SKIP
ID "aB"
ID "aB"
-SKIP
ID "i5"
ID "i5"
-SKIP
ID "$x"
ID "$x"
-SKIP
ID "@efg"
ID "@efg"
-SKIP
ID "@@."
ID "@@."
-SKIP
MACRO_ID "!abcd"
MACRO_ID "!abcd"
-SKIP
+MACRO_ID "!*"
+MACRO_ID "!*"
+ID "a"
ID "#.#"
ID "#.#"
-SKIP
MACRO_PUNCT "."
ID "x"
MACRO_PUNCT "."
ID "x"
-SKIP
MACRO_PUNCT "_"
ID "z"
ENDCMD
MACRO_PUNCT "_"
ID "z"
ENDCMD
-SKIP
ID "abcd."
ID "abcd."
-SKIP
ID "abcd"
ENDCMD
ID "abcd"
ENDCMD
-SKIP
ID "QRSTUV"
ENDCMD
ID "QRSTUV"
ENDCMD
-SKIP
-SKIP
ID "QrStUv"
ENDCMD
ID "QrStUv"
ENDCMD
-SKIP
-SKIP
-SKIP
ID "WXYZ"
ENDCMD
ID "WXYZ"
ENDCMD
-SKIP
-SKIP
-SKIP
-UNEXPECTED_CHAR 65533
+STOP "Bad character U+FFFD in input."
ENDCMD
ENDCMD
-SKIP
-SKIP
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-95,88
+75,47
@@
and. with.
])
AT_DATA([expout-base], [dnl
AND
])
AT_DATA([expout-base], [dnl
AND
-SKIP
OR
OR
-SKIP
NOT
NOT
-SKIP
EQ
EQ
-SKIP
GE
GE
-SKIP
GT
GT
-SKIP
LE
LE
-SKIP
LT
LT
-SKIP
NE
NE
-SKIP
ALL
ALL
-SKIP
BY
BY
-SKIP
TO
TO
-SKIP
WITH
WITH
-SKIP
AND
AND
-SKIP
OR
OR
-SKIP
NOT
NOT
-SKIP
EQ
EQ
-SKIP
GE
GE
-SKIP
GT
GT
-SKIP
LE
LE
-SKIP
LT
LT
-SKIP
NE
NE
-SKIP
ALL
ALL
-SKIP
BY
BY
-SKIP
TO
TO
-SKIP
WITH
WITH
-SKIP
ID "andx"
ID "andx"
-SKIP
ID "orx"
ID "orx"
-SKIP
ID "notx"
ID "notx"
-SKIP
ID "eqx"
ID "eqx"
-SKIP
ID "gex"
ID "gex"
-SKIP
ID "gtx"
ID "gtx"
-SKIP
ID "lex"
ID "lex"
-SKIP
ID "ltx"
ID "ltx"
-SKIP
ID "nex"
ID "nex"
-SKIP
ID "allx"
ID "allx"
-SKIP
ID "byx"
ID "byx"
-SKIP
ID "tox"
ID "tox"
-SKIP
ID "withx"
ID "withx"
-SKIP
ID "and."
ID "and."
-SKIP
WITH
ENDCMD
WITH
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-191,45
+130,25
@@
AT_DATA([input], [dnl
])
AT_DATA([expout-base], [dnl
NOT
])
AT_DATA([expout-base], [dnl
NOT
-SKIP
AND
AND
-SKIP
OR
OR
-SKIP
EQUALS
EQUALS
-SKIP
GE
GE
-SKIP
GT
GT
-SKIP
LE
LE
-SKIP
LT
LT
-SKIP
NE
NE
-SKIP
NE
NE
-SKIP
LPAREN
LPAREN
-SKIP
RPAREN
RPAREN
-SKIP
COMMA
COMMA
-SKIP
DASH
DASH
-SKIP
PLUS
PLUS
-SKIP
ASTERISK
ASTERISK
-SKIP
SLASH
SLASH
-SKIP
LBRACK
LBRACK
-SKIP
RBRACK
RBRACK
-SKIP
EXP
EXP
-SKIP
NOT
AND
OR
NOT
AND
OR
@@
-250,25
+169,15
@@
SLASH
LBRACK
RBRACK
EXP
LBRACK
RBRACK
EXP
-SKIP
MACRO_PUNCT "%"
MACRO_PUNCT "%"
-SKIP
-MACRO_PUNCT ":"
-SKIP
-MACRO_PUNCT ";"
-SKIP
+COLON
+SEMICOLON
MACRO_PUNCT "?"
MACRO_PUNCT "?"
-SKIP
MACRO_PUNCT "_"
MACRO_PUNCT "_"
-SKIP
MACRO_PUNCT "`"
MACRO_PUNCT "`"
-SKIP
-MACRO_PUNCT "{"
-SKIP
-MACRO_PUNCT "}"
-SKIP
+LCURLY
+RCURLY
NOT
NOT
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-287,73
+196,39
@@
AT_DATA([input], [dnl
])
AT_DATA([expout-base], [dnl
POS_NUM
])
AT_DATA([expout-base], [dnl
POS_NUM
-SKIP
POS_NUM 1
POS_NUM 1
-SKIP
POS_NUM 1
POS_NUM 1
-SKIP
POS_NUM 1
POS_NUM 1
-SKIP
POS_NUM 1
ENDCMD
POS_NUM 1
ENDCMD
-SKIP
POS_NUM 123
ENDCMD
POS_NUM 123
ENDCMD
-SKIP
-SKIP
-SKIP
-SKIP
-SKIP
ENDCMD
POS_NUM 1
ENDCMD
POS_NUM 1
-SKIP
POS_NUM 0.1
POS_NUM 0.1
-SKIP
POS_NUM 0.1
POS_NUM 0.1
-SKIP
POS_NUM 0.1
POS_NUM 0.1
-SKIP
POS_NUM 50
POS_NUM 50
-SKIP
POS_NUM 0.6
POS_NUM 0.6
-SKIP
POS_NUM 70
POS_NUM 70
-SKIP
POS_NUM 60
POS_NUM 60
-SKIP
POS_NUM 0.006
POS_NUM 0.006
-SKIP
ENDCMD
POS_NUM 30
ENDCMD
POS_NUM 30
-SKIP
POS_NUM 0.04
POS_NUM 0.04
-SKIP
POS_NUM 5
POS_NUM 5
-SKIP
POS_NUM 6
POS_NUM 6
-SKIP
POS_NUM 0.0007
POS_NUM 0.0007
-SKIP
POS_NUM 12.3
POS_NUM 12.3
-SKIP
POS_NUM 4.56
POS_NUM 4.56
-SKIP
POS_NUM 789
POS_NUM 789
-SKIP
POS_NUM 999
POS_NUM 999
-SKIP
POS_NUM 0.0112
POS_NUM 0.0112
-SKIP
ENDCMD
ENDCMD
-SKIP
-EXPECTED_EXPONENT "1e"
-SKIP
+STOP "Missing exponent following `1e'."
ID "e1"
ID "e1"
-SKIP
-EXPECTED_EXPONENT "1e+"
-SKIP
-EXPECTED_EXPONENT "1e-"
--SKIP
+STOP "Missing exponent following `1e+'."
+STOP "Missing exponent following `1e-'."
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-372,101
+247,52
@@
AT_DATA([input-base], [dnl
-. -1e -e1 -1e+ -1e- -1.
])
AT_DATA([expout-base0], [dnl
-. -1e -e1 -1e+ -1e- -1.
])
AT_DATA([expout-base0], [dnl
-SKIP
NEG_NUM
NEG_NUM
-SKIP
NEG_NUM -1
NEG_NUM -1
-SKIP
NEG_NUM -1
NEG_NUM -1
-SKIP
NEG_NUM -1
NEG_NUM -1
-SKIP
NEG_NUM -1
ENDCMD
NEG_NUM -1
ENDCMD
-SKIP
-SKIP
NEG_NUM -123
ENDCMD
NEG_NUM -123
ENDCMD
-SKIP
-SKIP
-SKIP
-SKIP
-SKIP
-SKIP
NEG_NUM -0.1
NEG_NUM -0.1
-SKIP
NEG_NUM -0.1
NEG_NUM -0.1
-SKIP
NEG_NUM -0.1
NEG_NUM -0.1
-SKIP
NEG_NUM -0.1
NEG_NUM -0.1
-SKIP
-SKIP
NEG_NUM -50
NEG_NUM -50
-SKIP
NEG_NUM -0.6
NEG_NUM -0.6
-SKIP
NEG_NUM -70
NEG_NUM -70
-SKIP
NEG_NUM -60
NEG_NUM -60
-SKIP
NEG_NUM -0.006
NEG_NUM -0.006
-SKIP
-SKIP
NEG_NUM -3
NEG_NUM -3
-SKIP
NEG_NUM -0.04
NEG_NUM -0.04
-SKIP
NEG_NUM -5
NEG_NUM -5
-SKIP
NEG_NUM -6
NEG_NUM -6
-SKIP
NEG_NUM -0.0007
NEG_NUM -0.0007
-SKIP
-SKIP
NEG_NUM -12.3
NEG_NUM -12.3
-SKIP
NEG_NUM -4.56
NEG_NUM -4.56
-SKIP
NEG_NUM -789
NEG_NUM -789
-SKIP
NEG_NUM -999
NEG_NUM -999
-SKIP
NEG_NUM -0.0112
NEG_NUM -0.0112
-SKIP
-SKIP
NEG_NUM -1
NEG_NUM -1
-SKIP
-SKIP
DASH
DASH
-+SKIP
MACRO_PUNCT "."
MACRO_PUNCT "."
-SKIP
-EXPECTED_EXPONENT "-1e"
-SKIP
+STOP "Missing exponent following `-1e'."
DASH
DASH
-+SKIP
ID "e1"
ID "e1"
-SKIP
-EXPECTED_EXPONENT "-1e+"
-SKIP
-EXPECTED_EXPONENT "-1e-"
-SKIP
+STOP "Missing exponent following `-1e+'."
+STOP "Missing exponent following `-1e-'."
NEG_NUM -1
ENDCMD
NEG_NUM -1
ENDCMD
--SKIP
STOP
])
STOP
])
-AS_BOX([without extra spaces])
cp input-base input
cp input-base input
-
sed '/^+/d' < expout-base0 >
expout-base
+
cp expout-base0
expout-base
PSPP_CHECK_SCAN([-i])
PSPP_CHECK_SCAN([-i])
-AS_BOX([with extra spaces])
sed 's/ -/ - /g' < input-base > input
sed 's/ -/ - /g' < input-base > input
-sed 's/EXPONENT "-/EXPONENT "- /
- s/^+//' < expout-base0 > expout-base
+sed 's/following `-/following `- /' < expout-base0 > expout-base
PSPP_CHECK_SCAN([-i])
AT_CLEANUP
\f
PSPP_CHECK_SCAN([-i])
AT_CLEANUP
\f
@@
-505,61
+331,33
@@
x"4142"
])
AT_DATA([expout-base], [dnl
STRING "x"
])
AT_DATA([expout-base], [dnl
STRING "x"
-SKIP
STRING "y"
STRING "y"
-SKIP
STRING "abc"
STRING "abc"
-SKIP
STRING "Don't"
STRING "Don't"
-SKIP
STRING "Can't"
STRING "Can't"
-SKIP
STRING "Won't"
STRING "Won't"
-SKIP
STRING ""quoted""
STRING ""quoted""
-SKIP
STRING ""quoted""
STRING ""quoted""
-SKIP
STRING ""
STRING ""
-SKIP
STRING ""
STRING ""
-SKIP
STRING "'"
STRING "'"
-SKIP
STRING """
STRING """
-SKIP
-EXPECTED_QUOTE
-SKIP
-EXPECTED_QUOTE
-SKIP
+STOP "Unterminated string constant."
+STOP "Unterminated string constant."
STRING "xyzabcde"
STRING "xyzabcde"
-SKIP
STRING "foobar"
STRING "foobar"
-SKIP
STRING "foobar"
STRING "foobar"
-SKIP
STRING "foo"
STRING "foo"
-SKIP
PLUS
PLUS
-SKIP
ENDCMD
ENDCMD
-SKIP
STRING "bar"
STRING "bar"
-SKIP
ENDCMD
ENDCMD
-SKIP
PLUS
PLUS
-SKIP
STRING "AB5152"
STRING "AB5152"
-SKIP
STRING "4142QR"
STRING "4142QR"
-SKIP
STRING "ABお"
STRING "ABお"
-SKIP
STRING "�あいうえお"
STRING "�あいうえお"
-SKIP
STRING "abc�えxyz"
STRING "abc�えxyz"
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-572,18
+370,14
@@
AT_DATA([input], [dnl
#! /usr/bin/pspp
])
AT_DATA([expout-base], [dnl
#! /usr/bin/pspp
])
AT_DATA([expout-base], [dnl
-SKIP
-SKIP
ID "#"
MACRO_ID "!"
ID "#"
MACRO_ID "!"
-SKIP
SLASH
ID "usr"
SLASH
ID "bin"
SLASH
ID "pspp"
SLASH
ID "usr"
SLASH
ID "bin"
SLASH
ID "pspp"
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-610,57
+404,27
@@
next command.
])
AT_DATA([expout-base], [dnl
])
AT_DATA([expout-base], [dnl
-SKIP
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
ID "com"
ID "com"
-SKIP
ID "is"
ID "is"
-SKIP
ID "ambiguous"
ID "ambiguous"
-SKIP
WITH
WITH
-SKIP
ID "COMPUTE"
ENDCMD
ID "COMPUTE"
ENDCMD
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
ENDCMD
ENDCMD
-SKIP
-SKIP
-SKIP
ENDCMD
ENDCMD
-SKIP
ID "next"
ID "next"
-SKIP
ID "command"
ENDCMD
ID "command"
ENDCMD
-SKIP
-ENDCMD
-ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-685,31
+449,21
@@
ID "DOCUMENT"
STRING "DOCUMENT one line."
ENDCMD
ENDCMD
STRING "DOCUMENT one line."
ENDCMD
ENDCMD
-SKIP
ID "DOCUMENT"
STRING "DOC more"
ID "DOCUMENT"
STRING "DOC more"
-SKIP
STRING " than"
STRING " than"
-SKIP
STRING " one"
STRING " one"
-SKIP
STRING " line."
ENDCMD
ENDCMD
STRING " line."
ENDCMD
ENDCMD
-SKIP
ID "DOCUMENT"
STRING "docu"
ID "DOCUMENT"
STRING "docu"
-SKIP
STRING "first.paragraph"
STRING "first.paragraph"
-SKIP
STRING "isn't parsed as tokens"
STRING "isn't parsed as tokens"
-SKIP
STRING ""
STRING ""
-SKIP
STRING "second paragraph."
-ENDCMD
-ENDCMD
STRING "second paragraph."
-ENDCMD
-ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-727,32
+481,17
@@
FILE /*
])
AT_DATA([expout-base], [dnl
ID "FIL"
])
AT_DATA([expout-base], [dnl
ID "FIL"
-SKIP
ID "label"
ID "label"
-SKIP
STRING "isn't quoted"
ENDCMD
STRING "isn't quoted"
ENDCMD
-SKIP
ID "FILE"
ID "FILE"
-SKIP
-SKIP
ID "lab"
ID "lab"
-SKIP
STRING "is quoted"
ENDCMD
STRING "is quoted"
ENDCMD
-SKIP
ID "FILE"
ID "FILE"
-SKIP
-SKIP
-SKIP
-SKIP
-SKIP
ID "lab"
ID "lab"
-SKIP
STRING "not quoted here either"
STRING "not quoted here either"
-SKIP
-ENDCMD
-ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-775,41
+514,22
@@
end data
])
AT_DATA([expout-base], [dnl
ID "begin"
])
AT_DATA([expout-base], [dnl
ID "begin"
-SKIP
ID "data"
ENDCMD
ID "data"
ENDCMD
-SKIP
STRING "123"
STRING "123"
-SKIP
STRING "xxx"
STRING "xxx"
-SKIP
ID "end"
ID "end"
-SKIP
ID "data"
ENDCMD
ID "data"
ENDCMD
-SKIP
ENDCMD
ENDCMD
-SKIP
ID "BEG"
ID "BEG"
-SKIP
-SKIP
-SKIP
ID "DAT"
ID "DAT"
-SKIP
-SKIP
-SKIP
STRING "5 6 7 /* x"
STRING "5 6 7 /* x"
-SKIP
STRING ""
STRING ""
-SKIP
STRING "end data"
STRING "end data"
-SKIP
ID "end"
ID "end"
-SKIP
ID "data"
ID "data"
-SKIP
ENDCMD
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-830,43
+550,26
@@
end
])
AT_DATA([expout-base], [dnl
ID "do"
])
AT_DATA([expout-base], [dnl
ID "do"
-SKIP
ID "repeat"
ID "repeat"
-SKIP
ID "x"
EQUALS
ID "a"
ID "x"
EQUALS
ID "a"
-SKIP
ID "b"
ID "b"
-SKIP
ID "c"
ID "c"
-SKIP
-SKIP
ID "y"
EQUALS
ID "d"
ID "y"
EQUALS
ID "d"
-SKIP
ID "e"
ID "e"
-SKIP
ID "f"
ENDCMD
ID "f"
ENDCMD
-SKIP
STRING " do repeat a=1 thru 5."
STRING " do repeat a=1 thru 5."
-SKIP
STRING "another command."
STRING "another command."
-SKIP
STRING "second command"
STRING "second command"
-SKIP
STRING "+ third command."
STRING "+ third command."
-SKIP
STRING "end /* x */ /* y */ repeat print."
STRING "end /* x */ /* y */ repeat print."
-SKIP
ID "end"
ID "end"
-SKIP
-SKIP
ID "repeat"
ENDCMD
ID "repeat"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-892,60
+595,35
@@
end repeat
])
AT_DATA([expout-base], [dnl
ID "do"
])
AT_DATA([expout-base], [dnl
ID "do"
-SKIP
ID "repeat"
ID "repeat"
-SKIP
ID "x"
EQUALS
ID "a"
ID "x"
EQUALS
ID "a"
-SKIP
ID "b"
ID "b"
-SKIP
ID "c"
ID "c"
-SKIP
-SKIP
ID "y"
EQUALS
ID "d"
ID "y"
EQUALS
ID "d"
-SKIP
ID "e"
ID "e"
-SKIP
ID "f"
ID "f"
-SKIP
ENDCMD
STRING "do repeat a=1 thru 5"
ENDCMD
STRING "do repeat a=1 thru 5"
-SKIP
STRING "another command"
STRING "another command"
-SKIP
STRING "second command"
STRING "second command"
-SKIP
STRING "+ third command"
STRING "+ third command"
-SKIP
STRING "end /* x */ /* y */ repeat print"
STRING "end /* x */ /* y */ repeat print"
-SKIP
ID "end"
ID "end"
-SKIP
-SKIP
ID "repeat"
ID "repeat"
-SKIP
ENDCMD
ID "do"
ENDCMD
ID "do"
-SKIP
-SKIP
ID "repeat"
ID "repeat"
-SKIP
ID "#a"
EQUALS
POS_NUM 1
ID "#a"
EQUALS
POS_NUM 1
-SKIP
ENDCMD
ENDCMD
-SKIP
STRING " inner command"
STRING " inner command"
-SKIP
ID "end"
ID "end"
-SKIP
ID "repeat"
ID "repeat"
--SKIP
STOP
])
PSPP_CHECK_SCAN([-b])
STOP
])
PSPP_CHECK_SCAN([-b])
@@
-960,17
+638,12
@@
var1 var2 var3
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
LPAREN
RPAREN
-SKIP
-SKIP
STRING "var1 var2 var3"
STRING "var1 var2 var3"
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-984,15
+657,12
@@
define !macro1() var1 var2 var3
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
STRING " var1 var2 var3"
LPAREN
RPAREN
STRING " var1 var2 var3"
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1006,16
+676,12
@@
var1 var2 var3!enddefine.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
LPAREN
RPAREN
-SKIP
-SKIP
STRING "var1 var2 var3"
MACRO_ID "!enddefine"
ENDCMD
STRING "var1 var2 var3"
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1028,14
+694,12
@@
define !macro1()var1 var2 var3!enddefine.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
STRING "var1 var2 var3"
MACRO_ID "!enddefine"
ENDCMD
LPAREN
RPAREN
STRING "var1 var2 var3"
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1049,15
+713,11
@@
define !macro1()
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
LPAREN
RPAREN
-SKIP
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1073,19
+733,13
@@
define !macro1()
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
LPAREN
RPAREN
-SKIP
-SKIP
STRING ""
STRING ""
-SKIP
STRING ""
STRING ""
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1099,28
+753,22
@@
define !macro1(a(), b(), c())
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
ID "a"
LPAREN
RPAREN
COMMA
LPAREN
ID "a"
LPAREN
RPAREN
COMMA
-SKIP
ID "b"
LPAREN
RPAREN
COMMA
ID "b"
LPAREN
RPAREN
COMMA
-SKIP
ID "c"
LPAREN
RPAREN
RPAREN
ID "c"
LPAREN
RPAREN
RPAREN
-SKIP
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1138,34
+786,22
@@
define !macro1(
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
LPAREN
-SKIP
-SKIP
ID "a"
LPAREN
RPAREN
COMMA
ID "a"
LPAREN
RPAREN
COMMA
-SKIP
ID "b"
LPAREN
ID "b"
LPAREN
-SKIP
-SKIP
RPAREN
COMMA
RPAREN
COMMA
-SKIP
-SKIP
ID "c"
LPAREN
RPAREN
ID "c"
LPAREN
RPAREN
-SKIP
RPAREN
RPAREN
-SKIP
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1183,26
+819,18
@@
content 2
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
-SKIP
+STRING "!macro1"
LPAREN
ID "x"
COMMA
ID "y"
COMMA
ID "z"
LPAREN
ID "x"
COMMA
ID "y"
COMMA
ID "z"
-SKIP
RPAREN
RPAREN
-SKIP
-SKIP
STRING "content 1"
STRING "content 1"
-SKIP
STRING "content 2"
STRING "content 2"
-SKIP
MACRO_ID "!enddefine"
ENDCMD
MACRO_ID "!enddefine"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1216,20
+844,14
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
ENDCMD
ENDCMD
-SKIP
ID "data"
ID "data"
-SKIP
ID "list"
ID "list"
-SKIP
SLASH
ID "x"
SLASH
ID "x"
-SKIP
POS_NUM 1
ENDCMD
POS_NUM 1
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1244,22
+866,15
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
-SKIP
+STRING "!macro1"
ID "x"
ENDCMD
ID "x"
ENDCMD
-SKIP
ID "data"
ID "data"
-SKIP
ID "list"
ID "list"
-SKIP
SLASH
ID "x"
SLASH
ID "x"
-SKIP
POS_NUM 1
ENDCMD
POS_NUM 1
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1274,24
+889,17
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
ENDCMD
LPAREN
ENDCMD
-SKIP
ID "x"
ENDCMD
ID "x"
ENDCMD
-SKIP
ID "data"
ID "data"
-SKIP
ID "list"
ID "list"
-SKIP
SLASH
ID "x"
SLASH
ID "x"
-SKIP
POS_NUM 1
ENDCMD
POS_NUM 1
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1307,20
+915,14
@@
data list /x 1.
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
ENDCMD
ENDCMD
-SKIP
ID "data"
ID "data"
-SKIP
ID "list"
ID "list"
-SKIP
SLASH
ID "x"
SLASH
ID "x"
-SKIP
POS_NUM 1
ENDCMD
POS_NUM 1
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1335,16
+937,11
@@
content line 2
])
AT_DATA([expout-base], [dnl
ID "define"
])
AT_DATA([expout-base], [dnl
ID "define"
-SKIP
-MACRO_ID "!macro1"
+STRING "!macro1"
LPAREN
RPAREN
LPAREN
RPAREN
-SKIP
-SKIP
STRING "content line 1"
STRING "content line 1"
-SKIP
STRING "content line 2"
STRING "content line 2"
--SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-1363,44
+960,25
@@
fourth command.
])
AT_DATA([expout-base], [dnl
ID "first"
])
AT_DATA([expout-base], [dnl
ID "first"
-SKIP
ID "command"
ID "command"
-SKIP
-SKIP
ID "another"
ID "another"
-SKIP
ID "line"
ID "line"
-SKIP
ID "of"
ID "of"
-SKIP
ID "first"
ID "first"
-SKIP
ID "command"
ID "command"
-SKIP
ENDCMD
ENDCMD
-SKIP
ID "second"
ID "second"
-SKIP
ID "command"
ID "command"
-SKIP
ENDCMD
ID "third"
ENDCMD
ID "third"
-SKIP
ID "command"
ID "command"
-SKIP
ENDCMD
ENDCMD
-SKIP
ID "fourth"
ID "fourth"
-SKIP
ID "command"
ENDCMD
ID "command"
ENDCMD
-SKIP
-SKIP
ID "fifth"
ID "fifth"
-SKIP
ID "command"
ENDCMD
ID "command"
ENDCMD
--SKIP
STOP
])
PSPP_CHECK_SCAN([-b])
STOP
])
PSPP_CHECK_SCAN([-b])