projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: added help in recode.ui subdialog
[pspp]
/
src
/
language
/
control
/
repeat.c
diff --git
a/src/language/control/repeat.c
b/src/language/control/repeat.c
index 4f63ec69bade5f437538dc30515b3e225545fb64..c73d02827149290d9af9dd05dbf5992000e2600b 100644
(file)
--- a/
src/language/control/repeat.c
+++ b/
src/language/control/repeat.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009-201
1
Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009-201
2
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
@@
-30,12
+30,15
@@
#include "libpspp/cast.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
#include "libpspp/cast.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
+#include "libpspp/misc.h"
#include "gl/ftoastr.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#include "gl/ftoastr.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
+#include "gl/xmemdup0.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-44,6
+47,7
@@
struct dummy_var
{
struct hmap_node hmap_node;
char *name;
{
struct hmap_node hmap_node;
char *name;
+ size_t name_len;
char **values;
size_t n_values;
};
char **values;
size_t n_values;
};
@@
-77,7
+81,7
@@
cmd_do_repeat (struct lexer *lexer, struct dataset *ds)
static unsigned int
hash_dummy (const char *name, size_t name_len)
{
static unsigned int
hash_dummy (const char *name, size_t name_len)
{
- return hash_case_bytes (name, name_len, 0);
+ return
utf8_
hash_case_bytes (name, name_len, 0);
}
static const struct dummy_var *
}
static const struct dummy_var *
@@
-87,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)
HMAP_FOR_EACH_WITH_HASH (dv, struct dummy_var, hmap_node,
hash_dummy (name, name_len), hmap)
- if (
strcasecmp (dv->name, name
))
+ if (
!utf8_strncasecmp (dv->name, dv->name_len, name, name_len
))
return dv;
return NULL;
return dv;
return NULL;
@@
-115,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 (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;
{
msg (SE, _("Dummy variable name `%s' is given twice."), name);
goto error;
@@
-123,7
+129,8
@@
parse_specification (struct lexer *lexer, struct dictionary *dict,
/* Make a new macro. */
dv = xmalloc (sizeof *dv);
/* 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)));
dv->values = NULL;
dv->n_values = 0;
hmap_insert (dummies, &dv->hmap_node, hash_dummy (name, strlen (name)));
@@
-203,7
+210,7
@@
do_parse_commands (struct substring s, enum segmenter_mode mode,
enum segment_type type;
int n;
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)
assert (n >= 0);
if (type == SEG_DO_REPEAT_COMMAND)
@@
-213,7
+220,7
@@
do_parse_commands (struct substring s, enum segmenter_mode mode,
int k;
k = segmenter_push (&segmenter, s.string + n, s.length - n,
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;
if (type != SEG_NEWLINE && type != SEG_DO_REPEAT_COMMAND)
break;
@@
-249,7
+256,6
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
enum segmenter_mode mode;
struct string *outputs;
struct string input;
enum segmenter_mode mode;
struct string *outputs;
struct string input;
- size_t input_len;
size_t n_values;
char *file_name;
int line_number;
size_t n_values;
char *file_name;
int line_number;
@@
-269,10
+275,6
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
ds_put_byte (&input, '\n');
lex_get (lexer);
}
ds_put_byte (&input, '\n');
lex_get (lexer);
}
- if (ds_is_empty (&input))
- ds_put_byte (&input, '\n');
- ds_put_byte (&input, '\0');
- input_len = ds_length (&input);
n_values = count_values (dummies);
outputs = xmalloc (n_values * sizeof *outputs);
n_values = count_values (dummies);
outputs = xmalloc (n_values * sizeof *outputs);
@@
-305,9
+307,8
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
for (i = 0; i < n_values; i++)
{
struct string *output = &outputs[n_values - i - 1];
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);
lex_reader_set_file_name (reader, file_name);
reader->line_number = line_number;
lex_include (lexer, reader);
@@
-401,7
+402,7
@@
parse_numbers (struct lexer *lexer, struct dummy_var *dv)
{
char s[DBL_BUFSIZE_BOUND];
{
char s[DBL_BUFSIZE_BOUND];
- dtoastr (s, sizeof s, 0, 0, lex_number (lexer));
+
c_
dtoastr (s, sizeof s, 0, 0, lex_number (lexer));
add_replacement (dv, xstrdup (s), &allocated);
lex_get (lexer);
}
add_replacement (dv, xstrdup (s), &allocated);
lex_get (lexer);
}
@@
-439,6
+440,6
@@
parse_strings (struct lexer *lexer, struct dummy_var *dv)
int
cmd_end_repeat (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
{
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;
}
return CMD_CASCADING_FAILURE;
}