projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue work on bug 12859, plus some code cleanup.
[pspp]
/
src
/
repeat.c
diff --git
a/src/repeat.c
b/src/repeat.c
index 3b57b66a7398db1b391e5cadc38eb8daa1e76faf..5ca7dd9b2dcfdeee33675abd90b2526e26babfb2 100644
(file)
--- a/
src/repeat.c
+++ b/
src/repeat.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "repeat.h"
#include <config.h>
#include "repeat.h"
@@
-40,7
+40,7
@@
struct repeat_entry
{
int type; /* 1=variable names, 0=any other. */
struct repeat_entry
{
int type; /* 1=variable names, 0=any other. */
- char id[
9];
/* Macro identifier. */
+ char id[
LONG_NAME_LEN + 1];
/* Macro identifier. */
char **replacement; /* Macro replacement. */
struct repeat_entry *next;
};
char **replacement; /* Macro replacement. */
struct repeat_entry *next;
};
@@
-125,7
+125,7
@@
static int
internal_cmd_do_repeat (void)
{
/* Name of first DO REPEAT macro. */
internal_cmd_do_repeat (void)
{
/* Name of first DO REPEAT macro. */
- char first_name[
9
];
+ char first_name[
LONG_NAME_LEN + 1
];
/* Current filename. */
const char *current_filename = NULL;
/* Current filename. */
const char *current_filename = NULL;
@@
-146,7
+146,7
@@
internal_cmd_do_repeat (void)
if (!lex_force_id ())
return 0;
for (iter = repeat_tab; iter; iter = iter->next)
if (!lex_force_id ())
return 0;
for (iter = repeat_tab; iter; iter = iter->next)
- if (!strcmp (iter->id, tokid))
+ if (!strc
asec
mp (iter->id, tokid))
{
msg (SE, _("Identifier %s is given twice."), tokid);
return 0;
{
msg (SE, _("Identifier %s is given twice."), tokid);
return 0;
@@
-169,7
+169,7
@@
internal_cmd_do_repeat (void)
if (token == T_ID)
result = parse_ids (e);
if (token == T_ID)
result = parse_ids (e);
- else if (
token == T_NUM
)
+ else if (
lex_is_number ()
)
result = parse_numbers (e);
else if (token == T_STRING)
result = parse_strings (e);
result = parse_numbers (e);
else if (token == T_STRING)
result = parse_strings (e);
@@
-553,12
+553,12
@@
perform_DO_REPEAT_substitutions (void)
/* Collect an identifier. */
{
/* Collect an identifier. */
{
- char name[
9
];
+ char name[
LONG_NAME_LEN + 1
];
char *start = cp;
char *np = name;
char *substitution;
char *start = cp;
char *np = name;
char *substitution;
- while (CHAR_IS_IDN (*cp) && np < &name[
8
])
+ while (CHAR_IS_IDN (*cp) && np < &name[
LONG_NAME_LEN
])
*np++ = *cp++;
while (CHAR_IS_IDN (*cp))
cp++;
*np++ = *cp++;
while (CHAR_IS_IDN (*cp))
cp++;