Macro arguments and the !length function work.

[pspp] / src / language / lexer / lexer.c

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index 1b5ba2244f02c71245a649dd9d42a4bfacccd950..ff3c43e35edd4c01ee555e721ee930f0416f5ba1 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -1668,6 +1668,9 @@ lex_source_get (const struct lex_source *src_)
   if (!lex_source_get__ (src))
     return false;
 
+  if (!settings_get_mexpand ())
+    return true;
+
   struct macro_expander *me;
   int retval = macro_expander_create (src->lexer->macros,
                                       &lex_source_front (src)->token, &me);