cleanup

[pspp] / src / data / identifier.h

diff --git a/src/data/identifier.h b/src/data/identifier.h
index d694a5201d815997d4ca53126875320bdfad686e..4a23dd7dd5db1079f47e9edab4d2e9a172e1ed96 100644 (file)
--- a/src/data/identifier.h
+++ b/src/data/identifier.h
@@ -41,7 +41,11 @@
     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(AND)                 /* AND */                           \
     TOKEN_TYPE(OR)                  /* OR */                            \
@@ -85,8 +89,11 @@ 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);
+bool id_is_valid (const char *id, const char *dict_encoding);
+bool id_is_plausible (const char *id);
+char *id_is_valid__ (const char *id, const char *dict_encoding)
+  WARN_UNUSED_RESULT;
+char *id_is_plausible__ (const char *id) WARN_UNUSED_RESULT;
 
 /* Recognizing identifiers. */
 bool lex_is_id1 (char);