projects
/
pspp-builds.git
/ 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-builds.git]
/
src
/
language
/
data-io
/
combine-files.c
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index d4b9bf58905cde762b12510d4506f797630918cb..aa6d3b98ec319b60f1efd31b3fcf299b7ed87654 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009
, 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
@@
-170,7
+170,7
@@
combine_files (enum comb_command_type command,
dict_set_case_limit (proc.dict, dict_get_case_limit (dataset_dict (ds)));
dict_set_case_limit (proc.dict, dict_get_case_limit (dataset_dict (ds)));
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
for (;;)
{
struct comb_file *file;
for (;;)
{
struct comb_file *file;
@@
-185,7
+185,7
@@
combine_files (enum comb_command_type command,
}
else
break;
}
else
break;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (proc.n_files >= allocated_files)
proc.files = x2nrealloc (proc.files, &allocated_files,
if (proc.n_files >= allocated_files)
proc.files = x2nrealloc (proc.files, &allocated_files,
@@
-203,7
+203,7
@@
combine_files (enum comb_command_type command,
file->in_name[0] = '\0';
file->in_var = NULL;
file->in_name[0] = '\0';
file->in_var = NULL;
- if (lex_match (lexer,
'*'
))
+ if (lex_match (lexer,
T_ASTERISK
))
{
if (!proc_has_active_file (ds))
{
{
if (!proc_has_active_file (ds))
{
@@
-230,7
+230,7
@@
combine_files (enum comb_command_type command,
goto error;
}
goto error;
}
- while (lex_match (lexer,
'/'
))
+ while (lex_match (lexer,
T_SLASH
))
if (lex_match_id (lexer, "RENAME"))
{
if (!parse_dict_rename (lexer, file->dict))
if (lex_match_id (lexer, "RENAME"))
{
if (!parse_dict_rename (lexer, file->dict))
@@
-238,7
+238,7
@@
combine_files (enum comb_command_type command,
}
else if (lex_match_id (lexer, "IN"))
{
}
else if (lex_match_id (lexer, "IN"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (lex_token (lexer) != T_ID)
{
lex_error (lexer, NULL);
if (lex_token (lexer) != T_ID)
{
lex_error (lexer, NULL);
@@
-251,7
+251,7
@@
combine_files (enum comb_command_type command,
"TABLE."));
goto error;
}
"TABLE."));
goto error;
}
- strcpy (file->in_name, lex_tok
id
(lexer));
+ strcpy (file->in_name, lex_tok
cstr
(lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "SORT"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "SORT"))
@@
-263,7
+263,7
@@
combine_files (enum comb_command_type command,
merge_dictionary (proc.dict, file);
}
merge_dictionary (proc.dict, file);
}
- while (lex_token (lexer) !=
'.'
)
+ while (lex_token (lexer) !=
T_ENDCMD
)
{
if (lex_match (lexer, T_BY))
{
{
if (lex_match (lexer, T_BY))
{
@@
-278,7
+278,7
@@
combine_files (enum comb_command_type command,
}
saw_by = true;
}
saw_by = true;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_sort_criteria (lexer, proc.dict, &proc.by_vars,
&by_vars, NULL))
goto error;
if (!parse_sort_criteria (lexer, proc.dict, &proc.by_vars,
&by_vars, NULL))
goto error;
@@
-322,10
+322,10
@@
combine_files (enum comb_command_type command,
goto error;
}
goto error;
}
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!lex_force_id (lexer))
goto error;
if (!lex_force_id (lexer))
goto error;
- strcpy (first_name, lex_tok
id
(lexer));
+ strcpy (first_name, lex_tok
cstr
(lexer));
lex_get (lexer);
}
else if (command != COMB_UPDATE && lex_match_id (lexer, "LAST"))
lex_get (lexer);
}
else if (command != COMB_UPDATE && lex_match_id (lexer, "LAST"))
@@
-336,10
+336,10
@@
combine_files (enum comb_command_type command,
goto error;
}
goto error;
}
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!lex_force_id (lexer))
goto error;
if (!lex_force_id (lexer))
goto error;
- strcpy (last_name, lex_tok
id
(lexer));
+ strcpy (last_name, lex_tok
cstr
(lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "MAP"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "MAP"))
@@
-362,7
+362,7
@@
combine_files (enum comb_command_type command,
goto error;
}
goto error;
}
- if (!lex_match (lexer,
'/') && lex_token (lexer) != '.'
)
+ if (!lex_match (lexer,
T_SLASH) && lex_token (lexer) != T_ENDCMD
)
{
lex_end_of_command (lexer);
goto error;
{
lex_end_of_command (lexer);
goto error;
@@
-562,7
+562,7
@@
merge_dictionary (struct dictionary *const m, struct comb_file *f)
ds_put_format (&s, _("In an earlier file, %s was a string "
"variable with width %d."),
var_name, var_get_width (mv));
ds_put_format (&s, _("In an earlier file, %s was a string "
"variable with width %d."),
var_name, var_get_width (mv));
- msg (SE, ds_cstr (&s));
+ msg (SE,
"%s",
ds_cstr (&s));
ds_destroy (&s);
return false;
}
ds_destroy (&s);
return false;
}
@@
-575,7
+575,7
@@
merge_dictionary (struct dictionary *const m, struct comb_file *f)
var_set_label (mv, var_get_label (dv));
}
else
var_set_label (mv, var_get_label (dv));
}
else
- mv = dict_clone_var_assert (m, dv
, var_get_name (dv)
);
+ mv = dict_clone_var_assert (m, dv);
}
return true;
}
return true;