MATCH FILES, UPDATE, ADD FILES: Improve error messages.

[pspp] / src / language / lexer / macro.h

diff --git a/src/language/lexer/macro.h b/src/language/lexer/macro.h
index 72a4138505bca9c520f3fae385bdba34349a48c2..db6edd83a9d67f14724288ef47dbb68742a5f0aa 100644 (file)
--- a/src/language/lexer/macro.h
+++ b/src/language/lexer/macro.h
@@ -57,9 +57,6 @@ void macro_tokens_uninit (struct macro_tokens *);
 struct macro_token *macro_tokens_add_uninit (struct macro_tokens *);
 void macro_tokens_add (struct macro_tokens *, const struct macro_token *);
 
-void macro_tokens_from_string (struct macro_tokens *, const struct substring,
-                               enum segmenter_mode);
-
 void macro_tokens_to_syntax (struct macro_tokens *, struct string *,
                              size_t *ofs, size_t *len);
 
@@ -81,12 +78,10 @@ struct macro_param
         ARG_CMDEND
       }
     arg_type;
-    union
-      {
-        int n_tokens;            /* ARG_N_TOKENS. */
-        struct token charend;    /* ARG_CHAREND. */
-        struct token enclose[2]; /* ARG_ENCLOSE. */
-      };
+
+    int n_tokens;               /* ARG_N_TOKENS only. */
+    struct token start;         /* ARG_ENCLOSE only. */
+    struct token end;           /* ARG_ENCLOSE and ARG_CHAREND only. */
   };
 
 /* A macro. */