From e6b74afbbafb319f6cf22fb8d22d84c19b11e2d1 Mon Sep 17 00:00:00 2001 From: Fellippe Heitor Date: Thu, 28 Jan 2021 18:52:50 -0300 Subject: [PATCH] Replace SUB/FUNCTION accordingly like QB4.5 did In EXIT SUB/FUNCTION and END SUB/FUNCTION statements. --- source/qb64.bas | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/qb64.bas b/source/qb64.bas index 6e22b8f1c..42154f6eb 100644 --- a/source/qb64.bas +++ b/source/qb64.bas @@ -5110,6 +5110,7 @@ DO controllevel = controllevel - 1 END IF + IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = "SUB" ELSE secondelement$ = "FUNCTION" l$ = firstelement$ + sp + secondelement$ layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ @@ -7360,9 +7361,10 @@ DO IF secondelement$ = "SUB" THEN sf = 2 IF sf THEN - IF LEN(subfunc) = 0 THEN a$ = "EXIT " + secondelement$ + " must be used within a SUB/FUNCTION": GOTO errmes + IF LEN(subfunc) = 0 THEN a$ = "EXIT " + secondelement$ + " must be used within a " + secondelement$: GOTO errmes PRINT #12, "goto exit_subfunc;" + IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = "SUB" ELSE secondelement$ = "FUNCTION" l$ = firstelement$ + sp + secondelement$ layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline