X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Frepeat.c;h=d7cc544fe6e8e001268b6c37643cacc91bce7daf;hb=638a86001fe7a237bd6c19a181d796305290d72a;hp=cb608f769d5d4b91adbb5c21fa5ae3d4403a2c08;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c
index cb608f769d..d7cc544fe6 100644
--- a/src/language/control/repeat.c
+++ b/src/language/control/repeat.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010 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
@@ -169,12 +169,12 @@ parse_specification (struct lexer *lexer, struct repeat_block *block)
       if (!lex_force_id (lexer))
 	return false;
       if (dict_lookup_var (dict, lex_tokid (lexer)))
-        msg (SW, _("Dummy variable name \"%s\" hides dictionary "
-                   "variable \"%s\"."),
+        msg (SW, _("Dummy variable name `%s' hides dictionary "
+                   "variable `%s'."),
              lex_tokid (lexer), lex_tokid (lexer));
       if (find_macro (block, ss_cstr (lex_tokid (lexer))))
 	  {
-	    msg (SE, _("Dummy variable name \"%s\" is given twice."),
+	    msg (SE, _("Dummy variable name `%s' is given twice."),
 		 lex_tokid (lexer));
 	    return false;
 	  }
@@ -195,7 +195,7 @@ parse_specification (struct lexer *lexer, struct repeat_block *block)
 	count = parse_ids (lexer, dict, macro, block->pool);
       else if (lex_is_number (lexer))
 	count = parse_numbers (lexer, macro, block->pool);
-      else if (lex_token (lexer) == T_STRING)
+      else if (lex_is_string (lexer))
 	count = parse_strings (lexer, macro, block->pool);
       else
 	{
@@ -220,8 +220,8 @@ parse_specification (struct lexer *lexer, struct repeat_block *block)
 	}
       else if (block->loop_cnt != count)
 	{
-	  msg (SE, _("Dummy variable \"%.*s\" had %d "
-                     "substitutions, so \"%.*s\" must also, but %d "
+	  msg (SE, _("Dummy variable `%.*s' had %d "
+                     "substitutions, so `%.*s' must also, but %d "
                      "were specified."),
 	       (int) ss_length (first_name), ss_data (first_name),
                block->loop_cnt,
@@ -476,7 +476,7 @@ parse_strings (struct lexer *lexer, struct repeat_macro *macro, struct pool *poo
     {
       char *string;
 
-      if (lex_token (lexer) != T_STRING)
+      if (!lex_force_string (lexer))
 	{
 	  msg (SE, _("String expected."));
 	  return 0;
@@ -618,10 +618,10 @@ do_repeat_name (const struct getl_interface *interface)
 }
 
 /* Returns the line number in the source file from which the
-   previous line was originally obtained, or -1 if none. */
+   previous line was originally obtained, or 0 if none. */
 static int
 do_repeat_location (const struct getl_interface *interface)
 {
   struct repeat_line *line = current_line (interface);
-  return line ? line->line_number : -1;
+  return line ? line->line_number : 0;
 }