X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fidentifier.h;h=dcbce970cda97168ab96a22c3e51660d33efc763;hb=0891406f7c1039af8c769b8069691246566fd894;hp=fe030d1c08ffb680cfe4f48855a50583912fb742;hpb=e7e2a9e79da2f6c9ae534c5ad067acf49d84a75b;p=pspp diff --git a/src/data/identifier.h b/src/data/identifier.h index fe030d1c08..dcbce970cd 100644 --- a/src/data/identifier.h +++ b/src/data/identifier.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2010, 2011 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 @@ -21,58 +21,77 @@ #include #include #include "libpspp/str.h" +#include "gl/verify.h" #define TOKEN_TYPES \ - TOKEN_TYPE(ID) /* Identifier. */ \ - TOKEN_TYPE(POS_NUM) /* Positive number. */ \ - TOKEN_TYPE(NEG_NUM) /* Negative number. */ \ - TOKEN_TYPE(STRING) /* Quoted string. */ \ - TOKEN_TYPE(STOP) /* End of input. */ \ + TOKEN_TYPE(STOP) /* End of input. */ \ \ - TOKEN_TYPE(ENDCMD) /* . */ \ - TOKEN_TYPE(PLUS) /* + */ \ - TOKEN_TYPE(DASH) /* - */ \ - TOKEN_TYPE(ASTERISK) /* * */ \ - TOKEN_TYPE(SLASH) /* / */ \ - TOKEN_TYPE(EQUALS) /* = */ \ - TOKEN_TYPE(LPAREN) /* ( */ \ - TOKEN_TYPE(RPAREN) /* ) */ \ - TOKEN_TYPE(LBRACK) /* [ */ \ - TOKEN_TYPE(RBRACK) /* ] */ \ - TOKEN_TYPE(COMMA) /* , */ \ + TOKEN_TYPE(ID) /* Identifier. */ \ + TOKEN_TYPE(POS_NUM) /* Positive number. */ \ + TOKEN_TYPE(NEG_NUM) /* Negative number. */ \ + TOKEN_TYPE(STRING) /* Quoted string. */ \ \ - TOKEN_TYPE(AND) /* AND */ \ - TOKEN_TYPE(OR) /* OR */ \ - TOKEN_TYPE(NOT) /* NOT */ \ + TOKEN_TYPE(ENDCMD) /* . */ \ + TOKEN_TYPE(PLUS) /* + */ \ + TOKEN_TYPE(DASH) /* - */ \ + TOKEN_TYPE(ASTERISK) /* * */ \ + TOKEN_TYPE(SLASH) /* / */ \ + TOKEN_TYPE(EQUALS) /* = */ \ + TOKEN_TYPE(LPAREN) /* (*/ \ + TOKEN_TYPE(RPAREN) /* ) */ \ + TOKEN_TYPE(LBRACK) /* [ */ \ + TOKEN_TYPE(RBRACK) /* ] */ \ + TOKEN_TYPE(LCURLY) /* { */ \ + TOKEN_TYPE(RCURLY) /* } */ \ + TOKEN_TYPE(COMMA) /* , */ \ + TOKEN_TYPE(SEMICOLON) /* ; */ \ + TOKEN_TYPE(COLON) /* : */ \ \ - TOKEN_TYPE(EQ) /* EQ */ \ - TOKEN_TYPE(GE) /* GE or >= */ \ - TOKEN_TYPE(GT) /* GT or > */ \ - TOKEN_TYPE(LE) /* LE or <= */ \ - TOKEN_TYPE(LT) /* LT or < */ \ - TOKEN_TYPE(NE) /* NE or ~= */ \ + TOKEN_TYPE(AND) /* AND */ \ + TOKEN_TYPE(OR) /* OR */ \ + TOKEN_TYPE(NOT) /* NOT */ \ \ - TOKEN_TYPE(ALL) /* ALL */ \ - TOKEN_TYPE(BY) /* BY */ \ - TOKEN_TYPE(TO) /* TO */ \ - TOKEN_TYPE(WITH) /* WITH */ \ + TOKEN_TYPE(EQ) /* EQ */ \ + TOKEN_TYPE(GE) /* GE or >= */ \ + TOKEN_TYPE(GT) /* GT or > */ \ + TOKEN_TYPE(LE) /* LE or <= */ \ + TOKEN_TYPE(LT) /* LT or < */ \ + TOKEN_TYPE(NE) /* NE or ~= */ \ \ - TOKEN_TYPE(EXP) /* ** */ - + TOKEN_TYPE(ALL) /* ALL */ \ + TOKEN_TYPE(BY) /* BY */ \ + TOKEN_TYPE(TO) /* TO */ \ + TOKEN_TYPE(WITH) /* WITH */ \ + \ + TOKEN_TYPE(EXP) /* ** */ \ + \ + TOKEN_TYPE(MACRO_ID) /* Identifier starting with '!'. */ \ + TOKEN_TYPE(MACRO_PUNCT) /* Miscellaneous punctuator. */ /* Token types. */ enum token_type { #define TOKEN_TYPE(TYPE) T_##TYPE, TOKEN_TYPES - TOKEN_N_TYPES #undef TOKEN_TYPE }; +verify(T_STOP == 0); + +#define TOKEN_TYPE(TYPE) + 1 +enum { TOKEN_N_TYPES = TOKEN_TYPES }; +#undef TOKEN_TYPE +const char *token_type_to_name (enum token_type); const char *token_type_to_string (enum token_type); /* Tokens. */ bool lex_is_keyword (enum token_type); +/* Validating identifiers. */ +#define ID_MAX_LEN 64 /* Maximum length of identifier, in bytes. */ + +bool id_is_valid (const char *id, const char *dict_encoding, bool issue_error); +bool id_is_plausible (const char *id, bool issue_error); + /* Recognizing identifiers. */ bool lex_is_id1 (char); bool lex_is_idn (char); @@ -87,7 +106,4 @@ bool lex_id_match_n (struct substring keyword, struct substring token, size_t n); int lex_id_to_token (struct substring); -/* Identifier names. */ -const char *lex_id_name (enum token_type); - #endif /* !data/identifier.h */