From 3e63296dd798e160e725a42e06a487ec8e26174f Mon Sep 17 00:00:00 2001 From: Roland Heyder Date: Thu, 19 Dec 2024 15:04:02 +0100 Subject: [PATCH 1/3] Fix case of some function names --- internal/support/include/afterlastline.bm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/support/include/afterlastline.bm b/internal/support/include/afterlastline.bm index 130c4db7d..894dbfd15 100644 --- a/internal/support/include/afterlastline.bm +++ b/internal/support/include/afterlastline.bm @@ -110,7 +110,7 @@ END FUNCTION '_HUE32() returns the hue [0,360] of the given 32-bit ARGB color value. '---------- -FUNCTION _IKW_HUE32# (_argbColor~&) +FUNCTION _IKW_Hue32# (_argbColor~&) '--- option _explicit requirements --- DIM _re#, _gr#, _bl#, _hu#, _sa#, _br# '--- prepare values for conversion --- @@ -125,7 +125,7 @@ END FUNCTION '_SATURATION32() returns the saturation [0,100] of the given 32-bit ARGB color value. '---------- -FUNCTION _IKW_SATURATION32# (_argbColor~&) +FUNCTION _IKW_Saturation32# (_argbColor~&) '--- option _explicit requirements --- DIM _re#, _gr#, _bl#, _hu#, _sa#, _br# '--- prepare values for conversion --- @@ -140,7 +140,7 @@ END FUNCTION '_BRIGHTNESS32() returns the brightness [0,100] of the given 32-bit ARGB color value. '---------- -FUNCTION _IKW_BRIGHTNESS32# (_argbColor~&) +FUNCTION _IKW_Brightness32# (_argbColor~&) '--- option _explicit requirements --- DIM _re#, _gr#, _bl#, _hu#, _sa#, _br# '--- prepare values for conversion --- From 11943657b75052f1a92344122401d729426a3686 Mon Sep 17 00:00:00 2001 From: Roland Heyder Date: Thu, 19 Dec 2024 15:13:29 +0100 Subject: [PATCH 2/3] Fix export as Wiki example - avoid Wiki links redirect to "Create a Page", if example is written in camel case --- source/ide/ide_export.bas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ide/ide_export.bas b/source/ide/ide_export.bas index fc13cdd59..d8b624924 100644 --- a/source/ide/ide_export.bas +++ b/source/ide/ide_export.bas @@ -484,7 +484,7 @@ SUB ExportCodeAs (docFormat$) ePos& = ePos& + pal% + lkl% + 84 CASE "wiki" IF me% OR pc% THEN lkc$ = "{{Cm|": ELSE lkc$ = "{{Cl|" - IF UCASE$(page$) = UCASE$(lnk$) THEN + IF page$ = lnk$ THEN MID$(eTxt$, ePos&, lkl% + 7) = lkc$ + lnk$ + "}}" ePos& = ePos& + lkl% + 7 ELSE From 9a20af3ae8ffb9a6aee3394d5b0cc6a9bd6ee9e4 Mon Sep 17 00:00:00 2001 From: Roland Heyder Date: Thu, 19 Dec 2024 15:21:08 +0100 Subject: [PATCH 3/3] Fix id.hr_syntax entries - the new hr_syntax entries generated from user SUB/FUNCTION got truncated when array arguments were used - similar to a glitch which was already fixed earlier in the F1 auto-generated Help display for user SUB/FUNCTION --- source/qb64pe.bas | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/source/qb64pe.bas b/source/qb64pe.bas index a57d0bedc..6ebb8417b 100644 --- a/source/qb64pe.bas +++ b/source/qb64pe.bas @@ -2547,18 +2547,15 @@ DO apo% = INSTR(UCASE$(pwl$), "STATIC") IF apo% = 0 THEN apo% = INSTR(pwl$, "'") IF apo% = 0 THEN apo% = LEN(pwl$) + 1 - cpo% = INSTR(pwl$, ")") - IF cpo% = 0 OR cpo% > apo% THEN cpo% = apo% ELSE cpo% = cpo% + 1 - id.hr_syntax = n$ + StrReplace$(RTRIM$(LEFT$(pwl$, cpo% - 1)), "_", "") + cpo% = _INSTRREV(apo%, pwl$, ")") + pwl$ = n$ + symbol$ + StrReplace$(RTRIM$(LEFT$(pwl$, cpo%)), "_", "") + pwl$ = StrReplace$(pwl$, " ()", "()") + id.hr_syntax = pwl$ END IF IF UCASE$(LEFT$(n$, 5)) = "_IKW_" THEN reginternalsubfunc = 1: id.n = MID$(n$, 5): id.callname = "FUNC_" + UCASE$(MID$(n$, 5)) - IF symbol$ = "$" THEN - id.hr_syntax = UCASE$(MID$(n$, 5)) + "$" + MID$(id.hr_syntax, LEN(n$) + 1) - ELSE - id.hr_syntax = UCASE$(MID$(n$, 5)) + MID$(id.hr_syntax, LEN(n$) + 1) - END IF + id.hr_syntax = UCASE$(MID$(n$, 5)) + _IIF(symbol$ = "$", "$", "") + MID$(id.hr_syntax, LEN(n$) + LEN(symbol$) + 1) END IF regid reginternalsubfunc = 0 @@ -2588,10 +2585,9 @@ DO apo% = INSTR(UCASE$(pwl$), "STATIC") IF apo% = 0 THEN apo% = INSTR(pwl$, "'") IF apo% = 0 THEN apo% = LEN(pwl$) + 1 - cpo% = INSTR(pwl$, ")") - IF cpo% = 0 OR cpo% > apo% THEN cpo% = apo% ELSE cpo% = cpo% + 1 - pwl$ = n$ + StrReplace$(RTRIM$(LEFT$(pwl$, cpo% - 1)), "_", "") - pwl$ = StrReplace$(pwl$, "(", " "): pwl$ = StrReplace$(pwl$, ")", "") + cpo% = _INSTRREV(apo%, pwl$, ")") + pwl$ = n$ + " " + StrReplace$(RTRIM$(MID$(pwl$, 2, cpo% - 2)), "_", "") + pwl$ = StrReplace$(pwl$, " ()", "()") id.hr_syntax = pwl$ END IF