X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Flexer.h;h=87b1e2e7233e624487a8f3d97111990d68c2919b;hb=ef28191d9249de6ba14312b4faabcb11d382cdb1;hp=0a3e6c37c03de317a25f107820dd313ef8f4bd7e;hpb=1d285151f02251f52039e903d1a1a7f2eb3beb2e;p=pspp

diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h
index 0a3e6c37c0..87b1e2e723 100644
--- a/src/language/lexer/lexer.h
+++ b/src/language/lexer/lexer.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011, 2013 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
@@ -38,7 +38,7 @@ enum lex_syntax_mode
 /* Handling of errors. */
 enum lex_error_mode
   {
-    LEX_ERROR_INTERACTIVE,     /* Always continue to next command. */
+    LEX_ERROR_TERMINAL,        /* Discard input line and continue reading. */
     LEX_ERROR_CONTINUE,        /* Continue to next command, except for
                                   cascading failures. */
     LEX_ERROR_STOP             /* Stop processing. */
@@ -128,6 +128,7 @@ bool lex_force_int (struct lexer *);
 bool lex_force_num (struct lexer *);
 bool lex_force_id (struct lexer *);
 bool lex_force_string (struct lexer *);
+bool lex_force_string_or_id (struct lexer *);
 
 /* Token accessors. */
 enum token_type lex_token (const struct lexer *);
@@ -155,8 +156,15 @@ void lex_next_error (struct lexer *, int n0, int n1, const char *, ...)
   PRINTF_FORMAT (4, 5);
 int lex_end_of_command (struct lexer *);
 
+void lex_error_expecting (struct lexer *, const char *, ...) SENTINEL(0);
+
 void lex_sbc_only_once (const char *);
-void lex_sbc_missing (struct lexer *, const char *);
+void lex_sbc_missing (const char *);
+
+void lex_spec_only_once (struct lexer *, const char *subcommand,
+                         const char *specification);
+void lex_spec_missing (struct lexer *, const char *subcommand,
+                       const char *specification);
 
 void lex_error_valist (struct lexer *, const char *, va_list)
   PRINTF_FORMAT (2, 0);