tons of progress on macros

[pspp] / src / language / control / define.c

diff --git a/src/language/control/define.c b/src/language/control/define.c
index 7e9e5f37d4273e59506fe549a5ea9867dbd25e28..e91505c726ee271a84891c601e8d453f183a41e7 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -59,7 +59,7 @@ parse_quoted_token (struct lexer *lexer, struct token *token)
 
   struct substring s = lex_tokss (lexer);
   struct string_lexer slex;
-  string_lexer_init (&slex, s.string, s.length, SEG_MODE_INTERACTIVE);
+  string_lexer_init (&slex, s.string, s.length, SEG_MODE_INTERACTIVE, true);
   struct token another_token = { .type = T_STOP };
   if (!string_lexer_next (&slex, token)
       || string_lexer_next (&slex, &another_token))
@@ -113,9 +113,23 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
         }
       else
         {
+          if (lex_token (lexer) == T_MACRO_ID)
+            {
+              lex_error (lexer, _("Keyword macro parameter must be named in "
+                                  "definition without \"!\" prefix."));
+              goto error;
+            }
           if (!lex_force_id (lexer))
             goto error;
 
+          if (is_macro_keyword (lex_tokss (lexer)))
+            {
+              lex_error (lexer, _("Cannot use macro keyword \"%s\" "
+                                  "as an argument name."),
+                         lex_tokcstr (lexer));
+              goto error;
+            }
+
           p->positional = false;
           p->name = xasprintf ("!%s", lex_tokcstr (lexer));
           lex_get (lexer);