From bd3ec7f502cbeed36d2dfb0e62adbb20f6ff524c Mon Sep 17 00:00:00 2001 From: n00b Date: Fri, 23 May 2025 23:05:45 -0400 Subject: [PATCH] Fixed compile error when return user type from inside an IF block --- rcbasic_build/parser.h | 2 +- rcbasic_runtime/rcbasic_runtime.layout | 390 +++++++++++++------------ 2 files changed, 202 insertions(+), 190 deletions(-) diff --git a/rcbasic_build/parser.h b/rcbasic_build/parser.h index b981fbb..58d1b03 100755 --- a/rcbasic_build/parser.h +++ b/rcbasic_build/parser.h @@ -4703,7 +4703,7 @@ bool check_rule() //cout << "\nRETURN FROM FUNCTION" << id[fnID].name << endl << endl; - if(id[fnID].type == ID_TYPE_FN_NUM || id[fnID].type == ID_TYPE_FN_STR) + if(id[fnID].type == ID_TYPE_FN_NUM || id[fnID].type == ID_TYPE_FN_STR || id[fnID].type == ID_TYPE_FN_USER) { break; } diff --git a/rcbasic_runtime/rcbasic_runtime.layout b/rcbasic_runtime/rcbasic_runtime.layout index 25346b5..4b916d1 100755 --- a/rcbasic_runtime/rcbasic_runtime.layout +++ b/rcbasic_runtime/rcbasic_runtime.layout @@ -2,63 +2,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -66,87 +12,14 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -154,80 +27,39 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -237,9 +69,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +