X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=40b0a7ab53c1be8b25b515c021f244551e2002e7;hb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;hp=5ae4994484c685362d2daa689e79544c78a9f140;hpb=b31bac73c9affb7843d332807ffe5cef9c5e7cea;p=pspp-builds.git diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 5ae49944..40b0a7ab 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -356,7 +356,7 @@ type_coercion_core (struct expression *e, msg_disable (); if ((*node)->type == OP_format && fmt_check_input (&(*node)->format.f) - && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC)) { msg_enable (); if (do_coercion) @@ -370,7 +370,7 @@ type_coercion_core (struct expression *e, msg_disable (); if ((*node)->type == OP_format && fmt_check_output (&(*node)->format.f) - && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC)) { msg_enable (); if (do_coercion) @@ -918,7 +918,7 @@ parse_vector_element (struct lexer *lexer, struct expression *e) || !lex_match (lexer, ')')) return NULL; - return expr_allocate_binary (e, (vector_get_type (vector) == VAR_NUMERIC + return expr_allocate_binary (e, (vector_get_type (vector) == VAL_NUMERIC ? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR), element, expr_allocate_vector (e, vector)); }