X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.h;h=5ccb7b3d7f2d2bc1533cb525cdcd25c6f6447802;hb=510cc9dd9baf3108ba55cfb7893384517c9930b4;hp=798851d1a7e33a434dbc45293109e53f4c2a901e;hpb=48ec61d954cc032c773daf96851cf3b78f27b112;p=pspp

diff --git a/src/language/lexer/variable-parser.h b/src/language/lexer/variable-parser.h
index 798851d1a7..5ccb7b3d7f 100644
--- a/src/language/lexer/variable-parser.h
+++ b/src/language/lexer/variable-parser.h
@@ -59,6 +59,8 @@ bool parse_variables_pool (struct lexer *, struct pool *, const struct dictionar
                           struct variable ***, size_t *, int opts);
 bool parse_var_set_vars (struct lexer *, const struct var_set *, struct variable ***, size_t *,
                         int opts);
+
+char *parse_DATA_LIST_var (struct lexer *, const struct dictionary *);
 bool parse_DATA_LIST_vars (struct lexer *, const struct dictionary *,
                            char ***names, size_t *cnt, int opts);
 bool parse_DATA_LIST_vars_pool (struct lexer *, const struct dictionary *,
@@ -69,7 +71,24 @@ bool parse_mixed_vars (struct lexer *, const struct dictionary *dict,
 bool parse_mixed_vars_pool (struct lexer *, const struct dictionary *dict,
 			    struct pool *,
                            char ***names, size_t *cnt, int opts);
+
+/* This variable parser supports the unusual situation where set of variables
+   has to be parsed before the associated dictionary is available.  Thus,
+   parsing proceeds in two phases: first, the variables are parsed in a vector
+   of "struct var_syntax"; second, when the dictionary becomes available, the
+   structs are turned into "struct variable"s. */
+
+struct var_syntax
+  {
+    char *first;                /* Always nonnull. */
+    char *last;                 /* Nonnull for var ranges (e.g. "a TO b"). */
+  };
+void var_syntax_destroy (struct var_syntax *, size_t n);
 
+bool var_syntax_parse (struct lexer *, struct var_syntax **, size_t *);
+bool var_syntax_evaluate (const struct var_syntax *, size_t,
+                          const struct dictionary *,
+                          struct variable ***, size_t *, int opts);
 
 /* Const wrappers */
 
@@ -122,7 +141,7 @@ parse_const_var_set_vars (struct lexer *l, const struct const_var_set *vs,
 static inline void
 const_var_set_destroy (struct const_var_set *vs)
 {
-  var_set_destroy ( (struct var_set *) vs);
+  var_set_destroy ((struct var_set *) vs);
 }
 
 /* Match a variable.
@@ -134,7 +153,7 @@ lex_match_variable (struct lexer *lexer, const struct dictionary *dict, const st
 struct interaction;
 
 /* Parse an interaction.
-   If not successfull return false.
+   If not successful return false.
    Otherwise, a newly created interaction will be placed in IACT.
    It is the caller's responsibility to destroy this interaction.
  */