projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework the spreadsheet import feature of the grapic user interface
[pspp]
/
tests
/
language
/
lexer
/
scan.at
diff --git
a/tests/language/lexer/scan.at
b/tests/language/lexer/scan.at
index a6b0e62881663c00ba87075203e08d067d3ef2c0..9eded70f8756c789aa5c04e45d656fcd6b8242fb 100644
(file)
--- a/
tests/language/lexer/scan.at
+++ b/
tests/language/lexer/scan.at
@@
-1,22
+1,26
@@
dnl PSPP - a program for statistical analysis.
dnl Copyright (C) 2017 Free Software Foundation, Inc.
dnl PSPP - a program for statistical analysis.
dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl
+dnl
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation, either version 3 of the License, or
dnl (at your option) any later version.
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation, either version 3 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
+dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl
AT_BANNER([syntax scanning])
m4_define([PSPP_CHECK_SCAN],
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl
AT_BANNER([syntax scanning])
m4_define([PSPP_CHECK_SCAN],
- [AT_CHECK([scan-test $1 input], [0], [expout])])
+ [sed 's/^-//' < expout-base > expout
+ AT_CHECK([scan-test $1 input], [0], [expout])
+
+ sed '/^-/d' < expout-base > expout
+ AT_CHECK([scan-test -s $1 input], [0], [expout])])
\f
AT_SETUP([identifiers])
AT_KEYWORDS([scan])
\f
AT_SETUP([identifiers])
AT_KEYWORDS([scan])
@@
-28,7
+32,7
@@
QrStUv./* end of line comment */ @&t@
WXYZ. /* unterminated end of line comment
�. /* U+FFFD is not valid in an identifier
])
WXYZ. /* unterminated end of line comment
�. /* U+FFFD is not valid in an identifier
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "a"
SKIP
ID "aB"
ID "a"
SKIP
ID "aB"
@@
-73,7
+77,7
@@
UNEXPECTED_CHAR 65533
ENDCMD
SKIP
SKIP
ENDCMD
SKIP
SKIP
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-87,7
+91,7
@@
AND OR NOT EQ GE GT LE LT NE ALL BY TO WITH
andx orx notx eqx gex gtx lex ltx nex allx byx tox withx
and. with.
])
andx orx notx eqx gex gtx lex ltx nex allx byx tox withx
and. with.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
AND
SKIP
OR
AND
SKIP
OR
@@
-170,7
+174,7
@@
ID "and."
SKIP
WITH
ENDCMD
SKIP
WITH
ENDCMD
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-182,7
+186,7
@@
AT_DATA([input], [dnl
~ & | = >= > <= < ~= <> ( ) , - + * / [[ ]] **
~&|=>=><=<~=<>(),-+*/[[]]**
])
~ & | = >= > <= < ~= <> ( ) , - + * / [[ ]] **
~&|=>=><=<~=<>(),-+*/[[]]**
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
NOT
SKIP
AND
NOT
SKIP
AND
@@
-243,7
+247,7
@@
SLASH
LBRACK
RBRACK
EXP
LBRACK
RBRACK
EXP
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-260,7
+264,7
@@
AT_DATA([input], [dnl
1.23e1 45.6E-1 78.9e+1 99.9E+01 11.2e-03
. 1e e1 1e+ 1e-
])
1.23e1 45.6E-1 78.9e+1 99.9E+01 11.2e-03
. 1e e1 1e+ 1e-
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
POS_NUM
SKIP
POS_NUM 1
POS_NUM
SKIP
POS_NUM 1
@@
-328,7
+332,7
@@
SKIP
EXPECTED_EXPONENT "1e+"
SKIP
EXPECTED_EXPONENT "1e-"
EXPECTED_EXPONENT "1e+"
SKIP
EXPECTED_EXPONENT "1e-"
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-367,7
+371,7
@@
x"4142"
"�あいうえお"
"abc"+U"FFFD"+u'3048'+"xyz"
])
"�あいうえお"
"abc"+U"FFFD"+u'3048'+"xyz"
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
STRING "x"
SKIP
STRING "y"
STRING "x"
SKIP
STRING "y"
@@
-423,7
+427,7
@@
SKIP
STRING "�あいうえお"
SKIP
STRING "abc�えxyz"
STRING "�あいうえお"
SKIP
STRING "abc�えxyz"
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-435,7
+439,7
@@
AT_DATA([input], [dnl
#! /usr/bin/pspp
#! /usr/bin/pspp
])
#! /usr/bin/pspp
#! /usr/bin/pspp
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
SKIP
SKIP
ID "#"
SKIP
SKIP
ID "#"
@@
-447,7
+451,7
@@
SLASH
ID "bin"
SLASH
ID "pspp"
ID "bin"
SLASH
ID "pspp"
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-473,7
+477,7
@@
com is ambiguous with COMPUTE.
next command.
])
next command.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
SKIP
SKIP
SKIP
SKIP
SKIP
SKIP
@@
-523,8
+527,8
@@
SKIP
ID "command"
ENDCMD
SKIP
ID "command"
ENDCMD
SKIP
-ENDCMD
-SKIP
+
-
ENDCMD
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-544,7
+548,7
@@
isn't parsed as tokens
second paragraph.
])
second paragraph.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "DOCUMENT"
STRING "DOCUMENT one line."
ENDCMD
ID "DOCUMENT"
STRING "DOCUMENT one line."
ENDCMD
@@
-571,9
+575,9
@@
SKIP
STRING ""
SKIP
STRING "second paragraph."
STRING ""
SKIP
STRING "second paragraph."
-ENDCMD
-ENDCMD
-SKIP
+
-
ENDCMD
+
-
ENDCMD
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-598,7
+602,7
@@
FILE /*
/**/ lab not quoted here either
])
/**/ lab not quoted here either
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "title"
SKIP
STRING "Quoted string title"
ID "title"
SKIP
STRING "Quoted string title"
@@
-656,8
+660,8
@@
ID "lab"
SKIP
STRING "not quoted here either"
SKIP
SKIP
STRING "not quoted here either"
SKIP
-ENDCMD
-SKIP
+
-
ENDCMD
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-678,7
+682,7
@@
end data
end data
.
])
end data
.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "begin"
SKIP
ID "data"
ID "begin"
SKIP
ID "data"
@@
-714,7
+718,7
@@
SKIP
ID "data"
SKIP
ENDCMD
ID "data"
SKIP
ENDCMD
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-733,7
+737,7
@@
end /* x */ /* y */ repeat print.
end
repeat.
])
end
repeat.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "do"
SKIP
ID "repeat"
ID "do"
SKIP
ID "repeat"
@@
-771,7
+775,7
@@
SKIP
SKIP
ID "repeat"
ENDCMD
SKIP
ID "repeat"
ENDCMD
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-i])
STOP
])
PSPP_CHECK_SCAN([-i])
@@
-788,7
+792,7
@@
third command
fourth command.
fifth command.
])
fourth command.
fifth command.
])
-AT_DATA([expout], [dnl
+AT_DATA([expout
-base
], [dnl
ID "first"
SKIP
ID "command"
ID "first"
SKIP
ID "command"
@@
-827,7
+831,7
@@
ID "fifth"
SKIP
ID "command"
ENDCMD
SKIP
ID "command"
ENDCMD
-SKIP
+
-
SKIP
STOP
])
PSPP_CHECK_SCAN([-b])
STOP
])
PSPP_CHECK_SCAN([-b])