refactoring

[pspp] / tests / language / lexer / command-name.at

diff --git a/tests/language/lexer/command-name.at b/tests/language/lexer/command-name.at
index ef17cfb0752b30a4f2c46430a6b31fcdd7bad4e3..395aa05cc5210b81157e21b7f5d760ee22e6e474 100644 (file)
--- a/tests/language/lexer/command-name.at
+++ b/tests/language/lexer/command-name.at
@@ -1,23 +1,24 @@
 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 
+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 
+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([command name matching])
+dnl
+AT_BANNER([command name matching])
 \f
 AT_SETUP([single words])
 AT_KEYWORDS([command name matching])
-AT_CHECK([command-name-test DESCRIPTIVES , DESCRIPTIVESX DESCRIPTIVES descr Des DEX DE '' 'DESCRIPTIVES MORE' 'DESCRIPTIVES@<00A0>@MORE'],
+AT_CHECK([command-name-test DESCRIPTIVES , DESCRIPTIVESX DESCRIPTIVES descr Des DEX DE '' 'DESCRIPTIVES MORE' 'DESCRIPTIVES++MORE'],
   [0], [dnl
 string="DESCRIPTIVESX":
        command="DESCRIPTIVES" match=no
@@ -59,7 +60,7 @@ AT_CLEANUP
 \f
 AT_SETUP([two words without prefix match])
 AT_KEYWORDS([command name matching])
-AT_CHECK([command-name-test 'DO IF' 'DO REPEAT' , 'DO@<00A0>@IF' 'DO REPEAT' 'DO REP' 'DO OTHER' 'D IF' 'DO I' DO],
+AT_CHECK([command-name-test 'DO IF' 'DO REPEAT' , 'DO++IF' 'DO REPEAT' 'DO REP' 'DO OTHER' 'D IF' 'DO I' DO],
   [0], [dnl
 string="DO@<00A0>@IF":
        command="DO IF" match=yes exact=yes missing_words=0
@@ -152,7 +153,7 @@ AT_CLEANUP
 
 AT_SETUP([ambiguous two-word names])
 AT_KEYWORDS([command name matching])
-AT_CHECK([command-name-test VARCOMP VARSTOCASES 'VARIABLE ATTRIBUTE' , VAR VARC VARS VARI 'VAR@<00A0>@ATT'],
+AT_CHECK([command-name-test VARCOMP VARSTOCASES 'VARIABLE ATTRIBUTE' , VAR VARC VARS VARI 'VAR++ATT'],
   [0], [dnl
 string="VAR":
        command="VARCOMP" match=yes exact=no missing_words=0
@@ -224,7 +225,7 @@ AT_CLEANUP
 \f
 AT_SETUP([off by more than one word])
 AT_KEYWORDS([command name matching])
-AT_CHECK([command-name-test 'a@<00A0>@b c' , a 'a b' 'a b c' 'a@<00A0>@b c d' 'a b c@<00A0>@d e'],
+AT_CHECK([command-name-test 'a++b c' , a 'a b' 'a b c' 'a++b c d' 'a b c++d e'],
   [0], [dnl
 string="a":
        command="a@<00A0>@b c" match=yes exact=yes missing_words=2