From 73de201165eb32c55976f70a30d537f3a9048a20 Mon Sep 17 00:00:00 2001 From: annelin Date: Thu, 20 May 2021 11:46:35 +0300 Subject: [PATCH] added new (optional) types to lparser.c (no idea what does it affect) --- src/lparser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lparser.c b/src/lparser.c index 1a2d7af..b6f27d3 100644 --- a/src/lparser.c +++ b/src/lparser.c @@ -1445,9 +1445,9 @@ static void ravi_typecheck(LexState *ls, expdesc *v, ravi_type_map *var_types, } /* if we are calling a function then convert return types */ else if ((vartype == RAVI_TM_FLOAT || vartype == RAVI_TM_INTEGER || - vartype == RAVI_TM_FLOAT_ARRAY || vartype == RAVI_TM_INTEGER_ARRAY || - vartype == RAVI_TM_TABLE || vartype == RAVI_TM_STRING_OR_NIL || - vartype == RAVI_TM_FUNCTION_OR_NIL || vartype == RAVI_TM_USERDATA_OR_NIL) && + vartype == RAVI_TM_TABLE || vartype == RAVI_TM_STRING || + vartype == RAVI_TM_FUNCTION || vartype == RAVI_TM_USERDATA || + vartype == RAVI_TM_FLOAT_ARRAY || vartype == RAVI_TM_INTEGER_ARRAY) && v->k == VCALL) { /* For local variable declarations that call functions e.g. * local i = func() @@ -1474,9 +1474,9 @@ static void ravi_typecheck(LexState *ls, expdesc *v, ravi_type_map *var_types, /* do we need to convert ? */ ravi_code_typecoersion(ls, a + (i - n), var_types[i], NULL); } - else if (vartype == RAVI_TM_STRING_OR_NIL || - vartype == RAVI_TM_FUNCTION_OR_NIL || - vartype == RAVI_TM_USERDATA_OR_NIL) { + else if (vartype == RAVI_TM_FLOAT_OR_NIL || vartype == RAVI_TM_INTEGER_OR_NIL || + vartype == RAVI_TM_TABLE_OR_NIL || vartype == RAVI_TM_STRING_OR_NIL || + vartype == RAVI_TM_FUNCTION_OR_NIL || vartype == RAVI_TM_USERDATA_OR_NIL) { TString *usertype = usertypes[n]; // NULL if var_types[n] is not userdata /* we need to make sure that a register is assigned to 'v' so that we can emit type assertion instructions. This would have