projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add assertions.
[pspp]
/
src
/
command.c
diff --git
a/src/command.c
b/src/command.c
index dc53eba8b0d911bbc1c3e36ca13e1ab9bf16a7ca..1e9fd570a6d8b3fbb0c7a11cb6d51273d2dda6ba 100644
(file)
--- a/
src/command.c
+++ b/
src/command.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-74,7
+74,7
@@
struct command
{NAME, {T1, T2, T3, T4}, FUNC, 1, 1},
#define SPCCMD(NAME, T1, T2, T3, T4, FUNC) \
{NAME, {T1, T2, T3, T4}, FUNC, 0, 0},
{NAME, {T1, T2, T3, T4}, FUNC, 1, 1},
#define SPCCMD(NAME, T1, T2, T3, T4, FUNC) \
{NAME, {T1, T2, T3, T4}, FUNC, 0, 0},
-#define UNIMPL(NAME, T1, T2, T3, T4
)
\
+#define UNIMPL(NAME, T1, T2, T3, T4
, DESC)
\
{NAME, {T1, T2, T3, T4}, NULL, 1, 0},
static const struct command commands[] =
{
{NAME, {T1, T2, T3, T4}, NULL, 1, 0},
static const struct command commands[] =
{
@@
-134,7
+134,8
@@
static const struct command *parse_command_name (void);
/* Determines whether command C is appropriate to call in this
part of a FILE TYPE structure. */
static int
/* Determines whether command C is appropriate to call in this
part of a FILE TYPE structure. */
static int
-FILE_TYPE_okay (const struct command *c)
+FILE_TYPE_okay (const struct command *c UNUSED)
+#if 0
{
int okay = 0;
{
int okay = 0;
@@
-143,7
+144,6
@@
FILE_TYPE_okay (const struct command *c)
&& c->func != cmd_repeating_data
&& c->func != cmd_end_file_type)
msg (SE, _("%s not allowed inside FILE TYPE/END FILE TYPE."), c->name);
&& c->func != cmd_repeating_data
&& c->func != cmd_end_file_type)
msg (SE, _("%s not allowed inside FILE TYPE/END FILE TYPE."), c->name);
-#if 0
/* FIXME */
else if (c->func == cmd_repeating_data && fty.type == FTY_GROUPED)
msg (SE, _("%s not allowed inside FILE TYPE GROUPED/END FILE TYPE."),
/* FIXME */
else if (c->func == cmd_repeating_data && fty.type == FTY_GROUPED)
msg (SE, _("%s not allowed inside FILE TYPE GROUPED/END FILE TYPE."),
@@
-151,17
+151,19
@@
FILE_TYPE_okay (const struct command *c)
else if (!fty.had_rec_type && c->func != cmd_record_type)
msg (SE, _("RECORD TYPE must be the first command inside a "
"FILE TYPE structure."));
else if (!fty.had_rec_type && c->func != cmd_record_type)
msg (SE, _("RECORD TYPE must be the first command inside a "
"FILE TYPE structure."));
-#endif
else
okay = 1;
else
okay = 1;
-#if 0
if (c->func == cmd_record_type)
fty.had_rec_type = 1;
if (c->func == cmd_record_type)
fty.had_rec_type = 1;
-#endif
return okay;
}
return okay;
}
+#else
+{
+ return 1;
+}
+#endif
/* Parses an entire PSPP command. This includes everything from the
command name to the terminating dot. Does most of its work by
/* Parses an entire PSPP command. This includes everything from the
command name to the terminating dot. Does most of its work by
@@
-183,7
+185,7
@@
cmd_parse (void)
return CMD_SUCCESS;
/* Parse comments. */
return CMD_SUCCESS;
/* Parse comments. */
- if ((token == T_ID && !strcmp (tokid, "COMMENT"))
+ if ((token == T_ID && !strc
asec
mp (tokid, "COMMENT"))
|| token == T_EXP || token == '*' || token == '[')
{
lex_skip_comment ();
|| token == T_EXP || token == '*' || token == '[')
{
lex_skip_comment ();
@@
-281,7
+283,7
@@
match_strings (const char *a, size_t a_len,
while (a_len > 0 && b_len > 0)
{
/* Mismatch always returns zero. */
while (a_len > 0 && b_len > 0)
{
/* Mismatch always returns zero. */
- if (
*a++ != *b++
)
+ if (
toupper ((unsigned char) *a++) != toupper ((unsigned char) *b++)
)
return 0;
/* Advance. */
return 0;
/* Advance. */
@@
-341,14
+343,14
@@
conflicting_3char_prefixes (const char *a, const char *b)
assert (aw != NULL && bw != NULL);
/* Words that are the same don't conflict. */
assert (aw != NULL && bw != NULL);
/* Words that are the same don't conflict. */
- if (aw_len == bw_len && !m
emcmp
(aw, bw, aw_len))
+ if (aw_len == bw_len && !m
m_case_compare
(aw, bw, aw_len))
return 0;
/* Words that are otherwise the same in the first three letters
do conflict. */
return ((aw_len > 3 && bw_len > 3)
|| (aw_len == 3 && bw_len > 3)
return 0;
/* Words that are otherwise the same in the first three letters
do conflict. */
return ((aw_len > 3 && bw_len > 3)
|| (aw_len == 3 && bw_len > 3)
- || (bw_len == 3 && aw_len > 3)) && !m
emcmp
(aw, bw, 3);
+ || (bw_len == 3 && aw_len > 3)) && !m
m_case_compare
(aw, bw, 3);
}
/* Returns nonzero if CMD can be confused with another command
}
/* Returns nonzero if CMD can be confused with another command
@@
-390,7
+392,7
@@
cmd_match_words (const struct command *cmd,
word != NULL && word_idx < word_cnt;
word = find_word (word + word_len, &word_len), word_idx++)
if (word_len != strlen (words[word_idx])
word != NULL && word_idx < word_cnt;
word = find_word (word + word_len, &word_len), word_idx++)
if (word_len != strlen (words[word_idx])
- || m
emcmp
(word, words[word_idx], word_len))
+ || m
m_case_compare
(word, words[word_idx], word_len))
{
size_t match_chars = match_strings (word, word_len,
words[word_idx],
{
size_t match_chars = match_strings (word, word_len,
words[word_idx],