projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXAMINE: Convert another test to Autotest framework.
[pspp]
/
src
/
data
/
identifier.c
diff --git
a/src/data/identifier.c
b/src/data/identifier.c
index a95a157d78cd0f0c2dcfe1844c152ec88782f4e5..7bd2261e60f15ac8f162996b7ee346c1b0eb5468 100644
(file)
--- a/
src/data/identifier.c
+++ b/
src/data/identifier.c
@@
-1,20
+1,18
@@
-/* PSPP -
computes sample statistic
s.
- Copyright (C) 1997-9, 2000, 2005 Free Software Foundation, Inc.
+/* PSPP -
a program for statistical analysi
s.
+ Copyright (C) 1997-9, 2000, 2005
, 2009
Free Software Foundation, Inc.
- This program is free software
; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ This program is free software
: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/*
This file is concerned with the definition of the PSPP syntax, NOT the
/*
This file is concerned with the definition of the PSPP syntax, NOT the
@@
-37,7
+35,7
@@
bool
lex_is_id1 (char c_)
{
unsigned char c = c_;
lex_is_id1 (char c_)
{
unsigned char c = c_;
- return isalpha (c) || c == '@' || c == '#' || c == '$';
+ return isalpha (c) || c == '@' || c == '#' || c == '$'
|| c >= 128
;
}
}
@@
-76,11
+74,19
@@
lex_id_get_length (struct substring string)
and those characters are identical to KEYWORD. */
bool
lex_id_match (struct substring keyword, struct substring token)
and those characters are identical to KEYWORD. */
bool
lex_id_match (struct substring keyword, struct substring token)
+{
+ return lex_id_match_n (keyword, token, 3);
+}
+
+/* Returns true if TOKEN is a case-insensitive match for at least
+ the first N characters of KEYWORD. */
+bool
+lex_id_match_n (struct substring keyword, struct substring token, size_t n)
{
size_t token_len = ss_length (token);
size_t keyword_len = ss_length (keyword);
{
size_t token_len = ss_length (token);
size_t keyword_len = ss_length (keyword);
- if (token_len >=
3
&& token_len < keyword_len)
+ if (token_len >=
n
&& token_len < keyword_len)
return ss_equals_case (ss_head (keyword, token_len), token);
else
return ss_equals_case (keyword, token);
return ss_equals_case (ss_head (keyword, token_len), token);
else
return ss_equals_case (keyword, token);