From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 21 Feb 2018 19:33:23 +0000 (-0800)
Subject: lexer: Fix implementation of lex_force_string_or_id().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=b6d66ec3f328d0e8bf35b71f29332695121f7173

lexer: Fix implementation of lex_force_string_or_id().

Change a test to make sure that it works.

Found by inspection.
---

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index 5c61c8def4..a3642f8a6c 100644
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -644,7 +644,7 @@ lex_force_string (struct lexer *lexer)
 bool
 lex_force_string_or_id (struct lexer *lexer)
 {
-  return lex_is_integer (lexer) || lex_force_string (lexer);
+  return lex_token (lexer) == T_ID || lex_force_string (lexer);
 }
 
 /* If the current token is an integer, does nothing and returns true.
diff --git a/tests/language/control/do-repeat.at b/tests/language/control/do-repeat.at
index 4afd5eaf52..e52b7ad999 100644
--- a/tests/language/control/do-repeat.at
+++ b/tests/language/control/do-repeat.at
@@ -88,7 +88,7 @@ END FILE.
 END INPUT PROGRAM.
 
 DO REPEAT x = 1 2 3.
-INCLUDE 'include.sps'.
+INCLUDE include.sps.
 END REPEAT.
 
 LIST.