/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 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
if (!lex_force_id (lexer))
return false;
if (dict_lookup_var (dict, lex_tokid (lexer)))
- msg (SW, _("Dummy variable name \"%s\" hides dictionary "
- "variable \"%s\"."),
+ msg (SW, _("Dummy variable name `%s' hides dictionary "
+ "variable `%s'."),
lex_tokid (lexer), lex_tokid (lexer));
if (find_macro (block, ss_cstr (lex_tokid (lexer))))
{
- msg (SE, _("Dummy variable name \"%s\" is given twice."),
+ msg (SE, _("Dummy variable name `%s' is given twice."),
lex_tokid (lexer));
return false;
}
count = parse_ids (lexer, dict, macro, block->pool);
else if (lex_is_number (lexer))
count = parse_numbers (lexer, macro, block->pool);
- else if (lex_token (lexer) == T_STRING)
+ else if (lex_is_string (lexer))
count = parse_strings (lexer, macro, block->pool);
else
{
}
else if (block->loop_cnt != count)
{
- msg (SE, _("Dummy variable \"%.*s\" had %d "
- "substitutions, so \"%.*s\" must also, but %d "
+ msg (SE, _("Dummy variable `%.*s' had %d "
+ "substitutions, so `%.*s' must also, but %d "
"were specified."),
(int) ss_length (first_name), ss_data (first_name),
block->loop_cnt,
{
struct substring id;
ss_ltrim (line, ss_cstr (CC_SPACES));
- ss_get_chars (line, lex_id_get_length (*line), &id);
+ ss_get_bytes (line, lex_id_get_length (*line), &id);
return lex_id_match (ss_cstr (keyword), id);
}
/* Retrieve an input line and make a copy of it. */
if (!lex_get_line_raw (lexer))
- return false;
+ {
+ msg (SE, _("DO REPEAT without END REPEAT."));
+ return false;
+ }
ds_init_string (&text, lex_entire_line_ds (lexer));
/* Record file name. */
{
char *string;
- if (lex_token (lexer) != T_STRING)
+ if (!lex_force_string (lexer))
{
msg (SE, _("String expected."));
return 0;
if (in_quote || in_apos || !lex_is_id1 (c))
{
- ds_put_char (&output, c);
+ ds_put_byte (&output, c);
ss_advance (&input, 1);
}
else
{
struct substring id;
- ss_get_chars (&input, lex_id_get_length (input), &id);
+ ss_get_bytes (&input, lex_id_get_length (input), &id);
ds_put_substring (&output, find_substitution (block, id));
}
}
if (dot)
- ds_put_char (&output, settings_get_endcmd ());
+ ds_put_byte (&output, settings_get_endcmd ());
ds_swap (line, &output);
ds_destroy (&output);
}
/* Returns the line number in the source file from which the
- previous line was originally obtained, or -1 if none. */
+ previous line was originally obtained, or 0 if none. */
static int
do_repeat_location (const struct getl_interface *interface)
{
struct repeat_line *line = current_line (interface);
- return line ? line->line_number : -1;
+ return line ? line->line_number : 0;
}