Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter: Fix typecheck for AND/OR.

Browse source 
Do not apply dynamic type check for second argument of AND/OR, as it is
not evaluated immediately like regular argument would be.

Thanks to Mikael for the bugreport.
This commit is contained in:
Ondrej Zajicek (work) 2020-01-07 01:24:30 +01:00
parent cc75b3e1dc
commit ef8c45749c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
filter/decl.m4
View file

@ -161,11 +161,16 @@ FID_HIC(,[[
# Some arguments need to check their type. After that, ARG_ANY is called. # Some arguments need to check their type. After that, ARG_ANY is called.
m4_define(ARG, `ARG_ANY($1) ARG_TYPE($1,$2)') m4_define(ARG, `ARG_ANY($1) ARG_TYPE($1,$2)')
m4_define(ARG_TYPE, ` m4_define(ARG_TYPE, `ARG_TYPE_STATIC($1,$2) ARG_TYPE_DYNAMIC($1,$2)')
m4_define(ARG_TYPE_STATIC, `
FID_NEW_BODY()m4_dnl FID_NEW_BODY()m4_dnl
if (f$1->type && (f$1->type != ($2)) && !f_const_promotion(f$1, ($2))) if (f$1->type && (f$1->type != ($2)) && !f_const_promotion(f$1, ($2)))
cf_error("Argument $1 of %s must be of type %s, got type %s", cf_error("Argument $1 of %s must be of type %s, got type %s",
f_instruction_name(what->fi_code), f_type_name($2), f_type_name(f$1->type)); f_instruction_name(what->fi_code), f_type_name($2), f_type_name(f$1->type));
FID_INTERPRET_BODY()')
m4_define(ARG_TYPE_DYNAMIC, `
FID_INTERPRET_EXEC()m4_dnl FID_INTERPRET_EXEC()m4_dnl
if (v$1.type != ($2)) if (v$1.type != ($2))
runtime("Argument $1 of %s must be of type %s, got type %s", runtime("Argument $1 of %s must be of type %s, got type %s",

4
filter/f-inst.c
View file

@ -226,7 +226,7 @@
} }
INST(FI_AND, 1, 1) { INST(FI_AND, 1, 1) {
ARG(1,T_BOOL); ARG(1,T_BOOL);
ARG_TYPE(2,T_BOOL); ARG_TYPE_STATIC(2,T_BOOL);
RESULT_TYPE(T_BOOL); RESULT_TYPE(T_BOOL);
if (v1.val.i) if (v1.val.i)
@ -236,7 +236,7 @@
} }
INST(FI_OR, 1, 1) { INST(FI_OR, 1, 1) {
ARG(1,T_BOOL); ARG(1,T_BOOL);
ARG_TYPE(2,T_BOOL); ARG_TYPE_STATIC(2,T_BOOL);
RESULT_TYPE(T_BOOL); RESULT_TYPE(T_BOOL);
if (!v1.val.i) if (!v1.val.i)