#include "gl/ftoastr.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
+#include "gl/xmemdup0.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
{
struct hmap_node hmap_node;
char *name;
+ size_t name_len;
char **values;
size_t n_values;
};
HMAP_FOR_EACH_WITH_HASH (dv, struct dummy_var, hmap_node,
hash_dummy (name, name_len), hmap)
- if (utf8_strcasecmp (dv->name, name))
+ if (!utf8_strncasecmp (dv->name, dv->name_len, name, name_len))
return dv;
return NULL;
if (dict_lookup_var (dict, name))
msg (SW, _("Dummy variable name `%s' hides dictionary variable `%s'."),
name, name);
- if (find_dummy_var (dummies, name, strlen (name)))
+
+ size_t name_len = strlen (name);
+ if (find_dummy_var (dummies, name, name_len))
{
msg (SE, _("Dummy variable name `%s' is given twice."), name);
goto error;
/* Make a new macro. */
dv = xmalloc (sizeof *dv);
- dv->name = xstrdup (name);
+ dv->name = xmemdup0 (name, name_len);
+ dv->name_len = name_len;
dv->values = NULL;
dv->n_values = 0;
hmap_insert (dummies, &dv->hmap_node, hash_dummy (name, strlen (name)));
struct hmap *dummies,
struct string *outputs, size_t n_outputs)
{
- struct segmenter segmenter;
-
- segmenter_init (&segmenter, mode);
-
+ struct segmenter segmenter = segmenter_init (mode, false);
while (!ss_is_empty (s))
{
enum segment_type type;
int n;
- n = segmenter_push (&segmenter, s.string, s.length, &type);
+ n = segmenter_push (&segmenter, s.string, s.length, true, &type);
assert (n >= 0);
if (type == SEG_DO_REPEAT_COMMAND)
int k;
k = segmenter_push (&segmenter, s.string + n, s.length - n,
- &type);
+ true, &type);
if (type != SEG_NEWLINE && type != SEG_DO_REPEAT_COMMAND)
break;
static bool
parse_commands (struct lexer *lexer, struct hmap *dummies)
{
- enum lex_syntax_mode syntax_mode;
- enum segmenter_mode mode;
struct string *outputs;
struct string input;
size_t n_values;
ds_put_byte (&input, '\n');
lex_get (lexer);
}
- if (ds_is_empty (&input))
- ds_put_byte (&input, '\n');
- ds_put_byte (&input, '\0');
n_values = count_values (dummies);
outputs = xmalloc (n_values * sizeof *outputs);
for (i = 0; i < n_values; i++)
ds_init_empty (&outputs[i]);
- syntax_mode = lex_get_syntax_mode (lexer);
- if (syntax_mode == LEX_SYNTAX_AUTO)
- mode = SEG_MODE_AUTO;
- else if (syntax_mode == LEX_SYNTAX_INTERACTIVE)
- mode = SEG_MODE_INTERACTIVE;
- else if (syntax_mode == LEX_SYNTAX_BATCH)
- mode = SEG_MODE_BATCH;
- else
- NOT_REACHED ();
- do_parse_commands (ds_ss (&input), mode, dummies, outputs, n_values);
+ do_parse_commands (ds_ss (&input), lex_get_syntax_mode (lexer),
+ dummies, outputs, n_values);
ds_destroy (&input);
if (lex_next_token (lexer, 1) == T_TO)
{
- long int a, b;
- long int i;
-
if (!lex_is_integer (lexer))
{
msg (SE, _("Ranges may only have integer bounds."));
return false;
}
- a = lex_integer (lexer);
+ long a = lex_integer (lexer);
lex_get (lexer);
lex_get (lexer);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, NULL, a, LONG_MAX))
return false;
- b = lex_integer (lexer);
+ long b = lex_integer (lexer);
if (b < a)
{
msg (SE, _("%ld TO %ld is an invalid range."), a, b);
}
lex_get (lexer);
- for (i = a; i <= b; i++)
+ for (long i = a; i <= b; i++)
add_replacement (dv, xasprintf ("%ld", i), &allocated);
}
else