Macro arguments and the !length function work.

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

diff --git a/src/language/control/define.c b/src/language/control/define.c
index 5532d60b8bc0287be5900a4b377d88f5220be903..2f5ffd9d6b7d0ed9b6b4516c2792a7bd5bd1f5a0 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -72,6 +72,64 @@ parse_quoted_token (struct lexer *lexer, struct token *token)
   return true;
 }
 
+static void
+macro_tokenize (struct macro *m, struct lexer *lexer)
+{
+  struct state
+    {
+      struct segmenter segmenter;
+      struct substring body;
+    };
+
+  struct state state = {
+    .segmenter = SEGMENTER_INIT (lex_get_syntax_mode (lexer)),
+    .body = m->body,
+  };
+  struct state saved = state;
+
+  struct token token = { .type = T_STOP };
+
+  while (state.body.length > 0)
+    {
+      struct scanner scanner;
+      scanner_init (&scanner, &token);
+
+      for (;;)
+        {
+          enum segment_type type;
+          int seg_len = segmenter_push (&state.segmenter, state.body.string,
+                                        state.body.length, true, &type);
+          assert (seg_len >= 0);
+
+          struct substring segment = ss_head (state.body, seg_len);
+          ss_advance (&state.body, seg_len);
+
+          enum scan_result result = scanner_push (&scanner, type, segment, &token);
+          if (result == SCAN_SAVE)
+            saved = state;
+          else if (result == SCAN_BACK)
+            {
+              state = saved;
+              break;
+            }
+          else if (result == SCAN_DONE)
+            break;
+        }
+
+      /* We have a token in 'token'. */
+      if (is_scan_type (token.type))
+        {
+          if (token.type != SCAN_SKIP)
+            {
+              /* XXX report error */
+            }
+        }
+      else
+        tokens_add (&m->body_tokens, &token);
+      token_destroy (&token);
+    }
+}
+
 int
 cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
 {
@@ -87,35 +145,36 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
     goto error;
 
   size_t allocated_params = 0;
-  size_t n_keywords = 0;
   while (!lex_match (lexer, T_RPAREN))
     {
       if (m->n_params >= allocated_params)
         m->params = x2nrealloc (m->params, &allocated_params,
                                 sizeof *m->params);
 
-      struct macro_param *p = &m->params[m->n_params++];
+      size_t param_index = m->n_params++;
+      struct macro_param *p = &m->params[param_index];
       *p = (struct macro_param) { .expand_arg = true };
 
       /* Parse parameter name. */
       if (match_macro_id (lexer, "!POSITIONAL"))
         {
-          if (n_keywords)
+          if (param_index > 0 && !m->params[param_index - 1].positional)
             {
               lex_error (lexer, _("Positional parameters must precede "
                                   "keyword parameters."));
               goto error;
             }
-          p->name = NULL;
+
+          p->positional = true;
+          p->name = xasprintf ("!%zu", param_index + 1);
         }
       else
         {
-          n_keywords++;
-
           if (!lex_force_id (lexer))
             goto error;
 
-          p->name = ss_xstrdup (lex_tokss (lexer));
+          p->positional = false;
+          p->name = xasprintf ("!%s", lex_tokcstr (lexer));
           lex_get (lexer);
 
           if (!lex_force_match (lexer, T_EQUALS))
@@ -206,6 +265,8 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
     }
   m->body = ds_ss (&body);
 
+  macro_tokenize (m, lexer);
+
   lex_define_macro (lexer, m);
 
   return CMD_SUCCESS;