Encapsulated lexer and updated calling functions accordingly.

[pspp-builds.git] / src / language / dictionary / variable-display.c

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index b7dd8126c25a157a632ce71d363b96c12a32c6d5..e6afcb98f596a547c32716a8d7b6e132ef4a858e 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -18,23 +18,25 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
 
-#include "debug-print.h"
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
 
 /* Set variables' alignment
    This is the alignment for GUI display only.
    It affects nothing but GUIs
 */
 int
-cmd_variable_alignment (void)
+cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
 {
   do
     {
@@ -44,17 +46,16 @@ cmd_variable_alignment (void)
       size_t i;
       enum alignment align;
 
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
-
-      if ( lex_force_match('(') ) 
+      if ( lex_force_match (lexer, '(') ) 
        {
-         if ( lex_match_id("LEFT"))
+         if ( lex_match_id (lexer, "LEFT"))
            align = ALIGN_LEFT;
-         else if ( lex_match_id("RIGHT"))
+         else if ( lex_match_id (lexer, "RIGHT"))
            align = ALIGN_RIGHT;
-         else if ( lex_match_id("CENTER"))
+         else if ( lex_match_id (lexer, "CENTER"))
            align = ALIGN_CENTRE;
          else 
             {
@@ -62,7 +63,7 @@ cmd_variable_alignment (void)
               return CMD_FAILURE; 
             }
 
-         lex_force_match(')');
+         lex_force_match (lexer, ')');
        }
       else 
         {
@@ -74,12 +75,12 @@ cmd_variable_alignment (void)
        v[i]->alignment = align;
 
 
-      while (token == '/')
-       lex_get ();
+      while (lex_token (lexer) == '/')
+       lex_get (lexer);
       free (v);
 
     }
-  while (token != '.');
+  while (lex_token (lexer) != '.');
   return CMD_SUCCESS;
 }
 
@@ -88,7 +89,7 @@ cmd_variable_alignment (void)
    It affects nothing but GUIs
 */
 int
-cmd_variable_width (void)
+cmd_variable_width (struct lexer *lexer, struct dataset *ds)
 {
   do
     {
@@ -96,33 +97,33 @@ cmd_variable_width (void)
       size_t nv;
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
-      if ( lex_force_match('(') ) 
+      if ( lex_force_match (lexer, '(') ) 
        {
-         if ( lex_force_int()) 
-           lex_get();
+         if ( lex_force_int (lexer)) 
+           lex_get (lexer);
          else
            return CMD_FAILURE;
-         lex_force_match(')');
+         lex_force_match (lexer, ')');
        }
 
       for( i = 0 ; i < nv ; ++i ) 
-         v[i]->display_width = tokval;
+         v[i]->display_width = lex_tokval (lexer);
 
-      while (token == '/')
-       lex_get ();
+      while (lex_token (lexer) == '/')
+       lex_get (lexer);
       free (v);
 
     }
-  while (token != '.');
+  while (lex_token (lexer) != '.');
   return CMD_SUCCESS;
 }
 
 /* Set variables' measurement level */
 int
-cmd_variable_level (void)
+cmd_variable_level (struct lexer *lexer, struct dataset *ds)
 {
   do
     {
@@ -131,16 +132,16 @@ cmd_variable_level (void)
       enum measure level;
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
-      if ( lex_force_match('(') ) 
+      if ( lex_force_match (lexer, '(') ) 
        {
-         if ( lex_match_id("SCALE"))
+         if ( lex_match_id (lexer, "SCALE"))
            level = MEASURE_SCALE;
-         else if ( lex_match_id("ORDINAL"))
+         else if ( lex_match_id (lexer, "ORDINAL"))
            level = MEASURE_ORDINAL;
-         else if ( lex_match_id("NOMINAL"))
+         else if ( lex_match_id (lexer, "NOMINAL"))
            level = MEASURE_NOMINAL;
          else 
             {
@@ -148,7 +149,7 @@ cmd_variable_level (void)
               return CMD_FAILURE; 
             }
 
-         lex_force_match(')');
+         lex_force_match (lexer, ')');
        }
       else
         {
@@ -160,11 +161,11 @@ cmd_variable_level (void)
        v[i]->measure = level ;
 
 
-      while (token == '/')
-       lex_get ();
+      while (lex_token (lexer) == '/')
+       lex_get (lexer);
       free (v);
 
     }
-  while (token != '.');
+  while (lex_token (lexer) != '.');
   return CMD_SUCCESS;
 }