X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Flexer.h;h=91200ce6cd86488f7aa92e2fe4e5d22865e5c2bb;hb=9420449c40bb1307f6c31e50b61ba03825680e3a;hp=b9e936bf994c67cdb7d6952950196f57170b3cf3;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h index b9e936bf99..91200ce6cd 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, 2014 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 @@ -19,9 +19,11 @@ #include #include +#include #include "data/identifier.h" #include "data/variable.h" +#include "libpspp/cast.h" #include "libpspp/compiler.h" #include "libpspp/prompt.h" @@ -38,7 +40,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. */ @@ -52,8 +54,10 @@ struct lex_reader const struct lex_reader_class *class; enum lex_syntax_mode syntax; enum lex_error_mode error; + char *encoding; char *file_name; /* NULL if not associated with a file. */ int line_number; /* 1-based initial line number, 0 if none. */ + bool eof; }; /* An implementation of a lex_reader. */ @@ -72,7 +76,7 @@ struct lex_reader_class The caller will free the 'file_name' member of READER, so the implementation should not do so. */ - void (*close) (struct lex_reader *reader); + void (*destroy) (struct lex_reader *reader); }; /* Helper functions for lex_reader. */ @@ -84,10 +88,10 @@ struct lex_reader *lex_reader_for_file (const char *file_name, const char *encoding, enum lex_syntax_mode syntax, enum lex_error_mode error); -struct lex_reader *lex_reader_for_string (const char *); -struct lex_reader *lex_reader_for_format (const char *, ...) - PRINTF_FORMAT (1, 2); -struct lex_reader *lex_reader_for_substring_nocopy (struct substring); +struct lex_reader *lex_reader_for_string (const char *, const char *encoding); +struct lex_reader *lex_reader_for_format (const char *, const char *, ...) + PRINTF_FORMAT (1, 3); +struct lex_reader *lex_reader_for_substring_nocopy (struct substring, const char *encoding); /* Initialization. */ struct lexer *lex_create (void); @@ -101,18 +105,18 @@ void lex_append (struct lexer *, struct lex_reader *); void lex_get (struct lexer *); /* Token testing functions. */ -bool lex_is_number (struct lexer *); -double lex_number (struct lexer *); -bool lex_is_integer (struct lexer *); -long lex_integer (struct lexer *); -bool lex_is_string (struct lexer *); +bool lex_is_number (const struct lexer *); +double lex_number (const struct lexer *); +bool lex_is_integer (const struct lexer *); +long lex_integer (const struct lexer *); +bool lex_is_string (const struct lexer *); /* Token testing functions with lookahead. */ -bool lex_next_is_number (struct lexer *, int n); -double lex_next_number (struct lexer *, int n); -bool lex_next_is_integer (struct lexer *, int n); -long lex_next_integer (struct lexer *, int n); -bool lex_next_is_string (struct lexer *, int n); +bool lex_next_is_number (const struct lexer *, int n); +double lex_next_number (const struct lexer *, int n); +bool lex_next_is_integer (const struct lexer *, int n); +long lex_next_integer (const struct lexer *, int n); +bool lex_next_is_string (const struct lexer *, int n); /* Token matching functions. */ bool lex_match (struct lexer *, enum token_type); @@ -122,12 +126,13 @@ bool lex_match_int (struct lexer *, int); bool lex_match_phrase (struct lexer *, const char *s); /* Forcible matching functions. */ -bool lex_force_match (struct lexer *, enum token_type); -bool lex_force_match_id (struct lexer *, const char *); -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_match (struct lexer *, enum token_type) WARN_UNUSED_RESULT; +bool lex_force_match_id (struct lexer *, const char *) WARN_UNUSED_RESULT; +bool lex_force_int (struct lexer *) WARN_UNUSED_RESULT; +bool lex_force_num (struct lexer *) WARN_UNUSED_RESULT; +bool lex_force_id (struct lexer *) WARN_UNUSED_RESULT; +bool lex_force_string (struct lexer *) WARN_UNUSED_RESULT; +bool lex_force_string_or_id (struct lexer *) WARN_UNUSED_RESULT; /* Token accessors. */ enum token_type lex_token (const struct lexer *); @@ -148,6 +153,7 @@ int lex_get_last_line_number (const struct lexer *, int n); int lex_get_first_column (const struct lexer *, int n); int lex_get_last_column (const struct lexer *, int n); const char *lex_get_file_name (const struct lexer *); +const char *lex_get_encoding (const struct lexer *); /* Issuing errors. */ void lex_error (struct lexer *, const char *, ...) PRINTF_FORMAT (2, 3); @@ -155,8 +161,17 @@ 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); +#define lex_error_expecting(...) \ + lex_error_expecting(__VA_ARGS__, NULL_SENTINEL) + 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);