logical operator bug fixes

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

diff --git a/src/language/control/define.c b/src/language/control/define.c
index 686685fc9cb313c5e7b4456eedd021ccbcab050b..7e9e5f37d4273e59506fe549a5ea9867dbd25e28 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -23,6 +23,7 @@
 #include "language/lexer/macro.h"
 #include "language/lexer/scan.h"
 #include "language/lexer/token.h"
+#include "libpspp/message.h"
 
 #include "gl/xalloc.h"
 
@@ -36,12 +37,12 @@ force_macro_id (struct lexer *lexer)
 }
 
 static bool
-match_macro_id (struct lexer *lexer, const char *id)
+match_macro_id (struct lexer *lexer, const char *keyword)
 {
-  if (id[0] != '!')
-    return lex_match_id (lexer, id);
+  if (keyword[0] != '!')
+    return lex_match_id (lexer, keyword);
   else if (lex_token (lexer) == T_MACRO_ID
-           && ss_equals_case (lex_tokss (lexer), ss_cstr (id)))
+           && lex_id_match_n (ss_cstr (keyword), lex_tokss (lexer), 4))
     {
       lex_get (lexer);
       return true;
@@ -59,7 +60,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);
-  struct token another_token;
+  struct token another_token = { .type = T_STOP };
   if (!string_lexer_next (&slex, token)
       || string_lexer_next (&slex, &another_token))
     {
@@ -221,3 +222,20 @@ error:
   macro_destroy (m);
   return CMD_FAILURE;
 }
+
+int
+cmd_debug_expand (struct lexer *lexer, struct dataset *ds UNUSED)
+{
+  settings_set_mprint (true);
+
+  while (lex_token (lexer) != T_STOP)
+    {
+      if (!lex_next_is_from_macro (lexer, 0) && lex_token (lexer) != T_ENDCMD)
+        {
+          struct substring rep = lex_next_representation (lexer, 0, 0);
+          msg (MN, "unexpanded token \"%.*s\"", (int) rep.length, rep.string);
+        }
+      lex_get (lexer);
+    }
+  return CMD_SUCCESS;
+}