X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Frepeat.c;h=8876c8fb9e2efeb9bbe9a90a5b284616e83d801c;hb=86e6b87d7ad411378c3204fe87504c7e6749be78;hp=b2c2bb413e501bda41721c95b8ded972fd02950b;hpb=23fd25fa0a2fb9d613f4f9445000e49cc3b83db1;p=pspp diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c index b2c2bb413e..8876c8fb9e 100644 --- a/src/language/control/repeat.c +++ b/src/language/control/repeat.c @@ -38,6 +38,7 @@ #include "gl/ftoastr.h" #include "gl/minmax.h" #include "gl/xalloc.h" +#include "gl/xmemdup0.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -46,6 +47,7 @@ struct dummy_var { struct hmap_node hmap_node; char *name; + size_t name_len; char **values; size_t n_values; }; @@ -89,7 +91,7 @@ find_dummy_var (struct hmap *hmap, const char *name, size_t name_len) 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; @@ -117,7 +119,9 @@ parse_specification (struct lexer *lexer, struct dictionary *dict, 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; @@ -125,7 +129,8 @@ parse_specification (struct lexer *lexer, struct dictionary *dict, /* 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))); @@ -196,16 +201,13 @@ do_parse_commands (struct substring s, enum segmenter_mode mode, 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) @@ -215,7 +217,7 @@ do_parse_commands (struct substring s, enum segmenter_mode mode, 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; @@ -247,13 +249,10 @@ do_parse_commands (struct substring s, enum segmenter_mode mode, 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; char *file_name; - int line_number; bool ok; size_t i; @@ -261,7 +260,7 @@ parse_commands (struct lexer *lexer, struct hmap *dummies) file_name = xstrdup (lex_get_file_name (lexer)); else file_name = NULL; - line_number = lex_get_first_line_number (lexer, 0); + int line_number = lex_ofs_start_point (lexer, lex_ofs (lexer)).line; ds_init_empty (&input); while (lex_is_string (lexer)) @@ -270,25 +269,14 @@ parse_commands (struct lexer *lexer, struct hmap *dummies) 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); @@ -305,9 +293,8 @@ parse_commands (struct lexer *lexer, struct hmap *dummies) for (i = 0; i < n_values; i++) { struct string *output = &outputs[n_values - i - 1]; - struct lex_reader *reader; - - reader = lex_reader_for_substring_nocopy (ds_ss (output)); + const char *encoding = lex_get_encoding (lexer); + struct lex_reader *reader = lex_reader_for_substring_nocopy (ds_ss (output), encoding); lex_reader_set_file_name (reader, file_name); reader->line_number = line_number; lex_include (lexer, reader); @@ -370,23 +357,20 @@ parse_numbers (struct lexer *lexer, struct dummy_var *dv) 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); @@ -394,7 +378,7 @@ parse_numbers (struct lexer *lexer, struct dummy_var *dv) } lex_get (lexer); - for (i = a; i <= b; i++) + for (long i = a; i <= b; i++) add_replacement (dv, xasprintf ("%ld", i), &allocated); } else @@ -439,6 +423,6 @@ parse_strings (struct lexer *lexer, struct dummy_var *dv) int cmd_end_repeat (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) { - msg (SE, _("No matching DO REPEAT.")); + msg (SE, _("No matching %s."), "DO REPEAT"); return CMD_CASCADING_FAILURE; }