projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
utilities
/
include.c
diff --git
a/src/language/utilities/include.c
b/src/language/utilities/include.c
index 52d0e09c91dec5b559e8c86104917f08cad2b5dd..f152684d41f73c6ba2091262ab368f3da7526c50 100644
(file)
--- a/
src/language/utilities/include.c
+++ b/
src/language/utilities/include.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007
, 2010
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
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
@@
-80,11
+80,11
@@
cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
lex_get (lexer);
lex_get (lexer);
- while (
'.'
!= lex_token (lexer))
+ while (
T_ENDCMD
!= lex_token (lexer))
{
if (lex_match_id (lexer, "SYNTAX"))
{
{
if (lex_match_id (lexer, "SYNTAX"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if ( lex_match_id (lexer, "INTERACTIVE") )
syntax_mode = GETL_INTERACTIVE;
else if ( lex_match_id (lexer, "BATCH"))
if ( lex_match_id (lexer, "INTERACTIVE") )
syntax_mode = GETL_INTERACTIVE;
else if ( lex_match_id (lexer, "BATCH"))
@@
-98,7
+98,7
@@
cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
}
else if (lex_match_id (lexer, "CD"))
{
}
else if (lex_match_id (lexer, "CD"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if ( lex_match_id (lexer, "YES") )
{
cd = true;
if ( lex_match_id (lexer, "YES") )
{
cd = true;
@@
-116,7
+116,7
@@
cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
}
else if (lex_match_id (lexer, "ERROR"))
{
}
else if (lex_match_id (lexer, "ERROR"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if ( lex_match_id (lexer, "CONTINUE") )
{
error_mode = ERRMODE_CONTINUE;
if ( lex_match_id (lexer, "CONTINUE") )
{
error_mode = ERRMODE_CONTINUE;
@@
-170,12
+170,12
@@
cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
static int
parse_insert (struct lexer *lexer, char **filename)
{
static int
parse_insert (struct lexer *lexer, char **filename)
{
- char *target_fn;
+ c
onst c
har *target_fn;
char *relative_filename;
/* Skip optional FILE=. */
if (lex_match_id (lexer, "FILE"))
char *relative_filename;
/* Skip optional FILE=. */
if (lex_match_id (lexer, "FILE"))
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
/* File name can be identifier or string. */
if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
/* File name can be identifier or string. */
if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
@@
-184,7
+184,7
@@
parse_insert (struct lexer *lexer, char **filename)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- target_fn =
ds_cstr (lex_tokstr (lexer)
);
+ target_fn =
lex_tokcstr (lexer
);
relative_filename =
fn_search_path (target_fn,
relative_filename =
fn_search_path (target_fn,