X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frepeat.c;h=0f5bb42f4dbc4aec79b75417b040f4c779314a57;hb=1f8dd363d6c20d07fcca14cb948018465fa5ed8b;hp=42467096808b98d9a6891584c383b41eb65ce6da;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp-builds.git diff --git a/src/repeat.c b/src/repeat.c index 42467096..0f5bb42f 100644 --- 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 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include #include "repeat.h" @@ -27,20 +27,23 @@ #include "command.h" #include "dictionary.h" #include "error.h" -#include "getline.h" +#include "getl.h" #include "lexer.h" #include "misc.h" #include "settings.h" #include "str.h" #include "var.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + #include "debug-print.h" /* Describes one DO REPEAT macro. */ struct repeat_entry { int type; /* 1=variable names, 0=any other. */ - char id[SHORT_NAME_LEN + 1]; /* Macro identifier. */ + char id[LONG_NAME_LEN + 1]; /* Macro identifier. */ char **replacement; /* Macro replacement. */ struct repeat_entry *next; }; @@ -125,7 +128,7 @@ static int internal_cmd_do_repeat (void) { /* Name of first DO REPEAT macro. */ - char first_name[SHORT_NAME_LEN + 1]; + char first_name[LONG_NAME_LEN + 1]; /* Current filename. */ const char *current_filename = NULL; @@ -146,7 +149,7 @@ internal_cmd_do_repeat (void) if (!lex_force_id ()) return 0; for (iter = repeat_tab; iter; iter = iter->next) - if (!strcmp (iter->id, tokid)) + if (!strcasecmp (iter->id, tokid)) { msg (SE, _("Identifier %s is given twice."), tokid); return 0; @@ -553,12 +556,12 @@ perform_DO_REPEAT_substitutions (void) /* Collect an identifier. */ { - char name[SHORT_NAME_LEN + 1]; + char name[LONG_NAME_LEN + 1]; char *start = cp; char *np = name; char *substitution; - while (CHAR_IS_IDN (*cp) && np < &name[SHORT_NAME_LEN]) + while (CHAR_IS_IDN (*cp) && np < &name[LONG_NAME_LEN]) *np++ = *cp++; while (CHAR_IS_IDN (*cp)) cp++;