compile without gnumeric and odf read support

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

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 9e50551c92b9a17359af658d947014762fb78bc2..657e317a4c56e89afe52b0788ffa0caf4650de00 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -65,7 +65,8 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-         lex_force_match (lexer, T_RPAREN);
+         if (!lex_force_match (lexer, T_RPAREN))
+           return CMD_FAILURE;
        }
       else
         {
@@ -163,7 +164,8 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-         lex_force_match (lexer, T_RPAREN);
+         if (!lex_force_match (lexer, T_RPAREN))
+           return CMD_FAILURE;
        }
       else
         {
@@ -198,7 +200,7 @@ cmd_variable_role (struct lexer *lexer, struct dataset *ds)
       if ( lex_match_id (lexer, "INPUT"))
         role = ROLE_INPUT;
       else if ( lex_match_id (lexer, "TARGET"))
-        role = ROLE_OUTPUT;
+        role = ROLE_TARGET;
       else if ( lex_match_id (lexer, "BOTH"))
         role = ROLE_BOTH;
       else if ( lex_match_id (lexer, "NONE"))
@@ -208,7 +210,10 @@ cmd_variable_role (struct lexer *lexer, struct dataset *ds)
       else if ( lex_match_id (lexer, "SPLIT"))
         role = ROLE_SPLIT;
       else
-        return CMD_FAILURE;
+        {
+          lex_error (lexer, NULL);
+          return CMD_FAILURE;
+        }
 
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;