diff --git a/internal/support/color/color0_noprefix.bi b/internal/support/color/color0_noprefix.bi deleted file mode 100644 index 8b332e7f6..000000000 --- a/internal/support/color/color0_noprefix.bi +++ /dev/null @@ -1,23 +0,0 @@ -'$COLOR:0 -'Color constants for text mode, when using $NOPREFIX. - -$INCLUDEONCE - -CONST Black~%% = 0 -CONST NP_Blue~%% = 1 -CONST NP_Green~%% = 2 -CONST Cyan~%% = 3 -CONST NP_Red~%% = 4 -CONST Magenta~%% = 5 -CONST Brown~%% = 6 -CONST White~%% = 7 -CONST Gray~%% = 8 -CONST LightBlue~%% = 9 -CONST LightGreen~%% = 10 -CONST LightCyan~%% = 11 -CONST LightRed~%% = 12 -CONST LightMagenta~%% = 13 -CONST Yellow~%% = 14 -CONST BrightWhite~%% = 15 -CONST NP_Blink~%% = 16 - diff --git a/internal/support/color/color32_noprefix.bi b/internal/support/color/color32_noprefix.bi deleted file mode 100644 index 0ae4a02b1..000000000 --- a/internal/support/color/color32_noprefix.bi +++ /dev/null @@ -1,276 +0,0 @@ -'$COLOR:32 -'Color constants for 32bit mode, based on HTML color names, when using $NOPREFIX. - -$INCLUDEONCE - -CONST AliceBlue~& = 4293982463 -CONST Almond~& = 4293910221 -CONST AntiqueBrass~& = 4291663221 -CONST AntiqueWhite~& = 4294634455 -CONST Apricot~& = 4294826421 -CONST Aqua~& = 4278255615 -CONST Aquamarine~& = 4286578644 -CONST Asparagus~& = 4287080811 -CONST AtomicTangerine~& = 4294943860 -CONST Azure~& = 4293984255 -CONST BananaMania~& = 4294633397 -CONST Beaver~& = 4288643440 -CONST Beige~& = 4294309340 -CONST Bisque~& = 4294960324 -CONST Bittersweet~& = 4294802542 -CONST Black~& = 4278190080 -CONST BlanchedAlmond~& = 4294962125 -CONST BlizzardBlue~& = 4289521134 -CONST NP_Blue~& = 4278190335 -CONST BlueBell~& = 4288848592 -CONST BlueGray~& = 4284914124 -CONST BlueGreen~& = 4279081146 -CONST BlueViolet~& = 4287245282 -CONST Blush~& = 4292763011 -CONST BrickRed~& = 4291510612 -CONST Brown~& = 4289014314 -CONST BurlyWood~& = 4292786311 -CONST BurntOrange~& = 4294934345 -CONST BurntSienna~& = 4293557853 -CONST CadetBlue~& = 4284456608 -CONST Canary~& = 4294967193 -CONST CaribbeanGreen~& = 4280079266 -CONST CarnationPink~& = 4294945484 -CONST Cerise~& = 4292691090 -CONST Cerulean~& = 4280134870 -CONST ChartReuse~& = 4286578432 -CONST Chestnut~& = 4290534744 -CONST Chocolate~& = 4291979550 -CONST Copper~& = 4292711541 -CONST Coral~& = 4294934352 -CONST Cornflower~& = 4288335595 -CONST CornflowerBlue~& = 4284782061 -CONST Cornsilk~& = 4294965468 -CONST CottonCandy~& = 4294950105 -CONST CrayolaAquamarine~& = 4286110690 -CONST CrayolaBlue~& = 4280251902 -CONST CrayolaBlueViolet~& = 4285753021 -CONST CrayolaBrown~& = 4290013005 -CONST CrayolaCadetBlue~& = 4289771462 -CONST CrayolaForestGreen~& = 4285378177 -CONST CrayolaGold~& = 4293379735 -CONST CrayolaGoldenrod~& = 4294760821 -CONST CrayolaGray~& = 4287992204 -CONST CrayolaGreen~& = 4280069240 -CONST CrayolaGreenYellow~& = 4293978257 -CONST CrayolaIndigo~& = 4284315339 -CONST CrayolaLavender~& = 4294751445 -CONST CrayolaMagenta~& = 4294337711 -CONST CrayolaMaroon~& = 4291311706 -CONST CrayolaMidnightBlue~& = 4279912566 -CONST CrayolaOrange~& = 4294931768 -CONST CrayolaOrangeRed~& = 4294912811 -CONST CrayolaOrchid~& = 4293306583 -CONST CrayolaPlum~& = 4287513989 -CONST CrayolaRed~& = 4293795917 -CONST CrayolaSalmon~& = 4294941610 -CONST CrayolaSeaGreen~& = 4288668351 -CONST CrayolaSilver~& = 4291675586 -CONST CrayolaSkyBlue~& = 4286634731 -CONST CrayolaSpringGreen~& = 4293716670 -CONST CrayolaTann~& = 4294616940 -CONST CrayolaThistle~& = 4293642207 -CONST CrayolaViolet~& = 4287786670 -CONST CrayolaYellow~& = 4294764675 -CONST CrayolaYellowGreen~& = 4291158916 -CONST Crimson~& = 4292613180 -CONST Cyan~& = 4278255615 -CONST Dandelion~& = 4294826861 -CONST DarkBlue~& = 4278190219 -CONST DarkCyan~& = 4278225803 -CONST DarkGoldenRod~& = 4290283019 -CONST DarkGray~& = 4289309097 -CONST DarkGreen~& = 4278215680 -CONST DarkKhaki~& = 4290623339 -CONST DarkMagenta~& = 4287299723 -CONST DarkOliveGreen~& = 4283788079 -CONST DarkOrange~& = 4294937600 -CONST DarkOrchid~& = 4288230092 -CONST DarkRed~& = 4287299584 -CONST DarkSalmon~& = 4293498490 -CONST DarkSeaGreen~& = 4287609999 -CONST DarkSlateBlue~& = 4282924427 -CONST DarkSlateGray~& = 4281290575 -CONST DarkTurquoise~& = 4278243025 -CONST DarkViolet~& = 4287889619 -CONST DeepPink~& = 4294907027 -CONST DeepSkyBlue~& = 4278239231 -CONST Denim~& = 4281035972 -CONST DesertSand~& = 4293905848 -CONST DimGray~& = 4285098345 -CONST DodgerBlue~& = 4280193279 -CONST Eggplant~& = 4285419872 -CONST ElectricLime~& = 4291755805 -CONST Fern~& = 4285643896 -CONST FireBrick~& = 4289864226 -CONST Floralwhite~& = 4294966000 -CONST ForestGreen~& = 4280453922 -CONST Fuchsia~& = 4290995397 -CONST FuzzyWuzzy~& = 4291585638 -CONST Gainsboro~& = 4292664540 -CONST GhostWhite~& = 4294506751 -CONST Gold~& = 4294956800 -CONST GoldenRod~& = 4292519200 -CONST GrannySmithApple~& = 4289258656 -CONST Gray~& = 4286611584 -CONST NP_Green~& = 4278222848 -CONST GreenBlue~& = 4279329972 -CONST GreenYellow~& = 4289593135 -CONST HoneyDew~& = 4293984240 -CONST HotMagenta~& = 4294909390 -CONST HotPink~& = 4294928820 -CONST Inchworm~& = 4289915997 -CONST IndianRed~& = 4291648604 -CONST Indigo~& = 4283105410 -CONST Ivory~& = 4294967280 -CONST JazzberryJam~& = 4291442535 -CONST JungleGreen~& = 4282101903 -CONST Khaki~& = 4293977740 -CONST LaserLemon~& = 4294901282 -CONST Lavender~& = 4293322490 -CONST LavenderBlush~& = 4294963445 -CONST LawnGreen~& = 4286381056 -CONST LemonChiffon~& = 4294965965 -CONST LemonYellow~& = 4294964303 -CONST LightBlue~& = 4289583334 -CONST LightCoral~& = 4293951616 -CONST LightCyan~& = 4292935679 -CONST LightGoldenRodYellow~& = 4294638290 -CONST LightGray~& = 4292072403 -CONST LightGreen~& = 4287688336 -CONST LightPink~& = 4294948545 -CONST LightSalmon~& = 4294942842 -CONST LightSeaGreen~& = 4280332970 -CONST LightSkyBlue~& = 4287090426 -CONST LightSlateGray~& = 4286023833 -CONST LightSteelBlue~& = 4289774814 -CONST LightYellow~& = 4294967264 -CONST Lime~& = 4278255360 -CONST LimeGreen~& = 4281519410 -CONST Linen~& = 4294635750 -CONST MacaroniAndCheese~& = 4294950280 -CONST Magenta~& = 4294902015 -CONST MagicMint~& = 4289392849 -CONST Mahogany~& = 4291643980 -CONST Maize~& = 4293775772 -CONST Manatee~& = 4288125610 -CONST MangoTango~& = 4294935107 -CONST Maroon~& = 4286578688 -CONST Mauvelous~& = 4293892266 -CONST MediumAquamarine~& = 4284927402 -CONST MediumBlue~& = 4278190285 -CONST MediumOrchid~& = 4290401747 -CONST MediumPurple~& = 4287852763 -CONST MediumSeaGreen~& = 4282168177 -CONST MediumSlateBlue~& = 4286277870 -CONST MediumSpringGreen~& = 4278254234 -CONST MediumTurquoise~& = 4282962380 -CONST MediumVioletRed~& = 4291237253 -CONST Melon~& = 4294818996 -CONST MidnightBlue~& = 4279834992 -CONST MintCream~& = 4294311930 -CONST MistyRose~& = 4294960353 -CONST Moccasin~& = 4294960309 -CONST MountainMeadow~& = 4281383567 -CONST Mulberry~& = 4291120012 -CONST NavajoWhite~& = 4294958765 -CONST Navy~& = 4278190208 -CONST NavyBlue~& = 4279858386 -CONST NeonCarrot~& = 4294943555 -CONST OldLace~& = 4294833638 -CONST Olive~& = 4286611456 -CONST OliveDrab~& = 4285238819 -CONST OliveGreen~& = 4290426988 -CONST Orange~& = 4294944000 -CONST OrangeRed~& = 4294919424 -CONST OrangeYellow~& = 4294497640 -CONST Orchid~& = 4292505814 -CONST OuterSpace~& = 4282468940 -CONST OutrageousOrange~& = 4294929994 -CONST PacificBlue~& = 4280068553 -CONST PaleGoldenRod~& = 4293847210 -CONST PaleGreen~& = 4288215960 -CONST PaleTurquoise~& = 4289720046 -CONST PaleVioletRed~& = 4292571283 -CONST PapayaWhip~& = 4294963157 -CONST Peach~& = 4294954923 -CONST PeachPuff~& = 4294957753 -CONST Periwinkle~& = 4291154150 -CONST Peru~& = 4291659071 -CONST PiggyPink~& = 4294827494 -CONST PineGreen~& = 4279599224 -CONST Pink~& = 4294951115 -CONST PinkFlamingo~& = 4294735101 -CONST PinkSherbet~& = 4294414247 -CONST Plum~& = 4292714717 -CONST PowderBlue~& = 4289781990 -CONST Purple~& = 4286578816 -CONST PurpleHeart~& = 4285809352 -CONST PurpleMountainsMajesty~& = 4288512442 -CONST PurplePizzazz~& = 4294856410 -CONST RadicalRed~& = 4294920556 -CONST RawSienna~& = 4292250201 -CONST RawUmber~& = 4285614883 -CONST RazzleDazzleRose~& = 4294920400 -CONST Razzmatazz~& = 4293076331 -CONST NP_Red~& = 4294901760 -CONST RedOrange~& = 4294923081 -CONST RedViolet~& = 4290790543 -CONST RobinsEggBlue~& = 4280274635 -CONST RosyBrown~& = 4290547599 -CONST RoyalBlue~& = 4282477025 -CONST RoyalPurple~& = 4286075305 -CONST SaddleBrown~& = 4287317267 -CONST Salmon~& = 4294606962 -CONST SandyBrown~& = 4294222944 -CONST Scarlet~& = 4294715463 -CONST ScreaminGreen~& = 4285988730 -CONST SeaGreen~& = 4281240407 -CONST SeaShell~& = 4294964718 -CONST Sepia~& = 4289030479 -CONST Shadow~& = 4287265117 -CONST Shamrock~& = 4282764962 -CONST ShockingPink~& = 4294672125 -CONST Sienna~& = 4288696877 -CONST Silver~& = 4290822336 -CONST SkyBlue~& = 4287090411 -CONST SlateBlue~& = 4285160141 -CONST SlateGray~& = 4285563024 -CONST Snow~& = 4294966010 -CONST SpringGreen~& = 4278255487 -CONST SteelBlue~& = 4282811060 -CONST Sunglow~& = 4294954824 -CONST SunsetOrange~& = 4294794835 -CONST Tann~& = 4291998860 -CONST Teal~& = 4278222976 -CONST TealBlue~& = 4279805877 -CONST Thistle~& = 4292394968 -CONST TickleMePink~& = 4294740396 -CONST Timberwolf~& = 4292597714 -CONST Tomato~& = 4294927175 -CONST TropicalRainForest~& = 4279730285 -CONST Tumbleweed~& = 4292782728 -CONST Turquoise~& = 4282441936 -CONST TurquoiseBlue~& = 4286045671 -CONST UnmellowYellow~& = 4294967142 -CONST Violet~& = 4293821166 -CONST VioletBlue~& = 4281486002 -CONST VioletRed~& = 4294398868 -CONST VividTangerine~& = 4294942857 -CONST VividViolet~& = 4287582365 -CONST Wheat~& = 4294303411 -CONST White~& = 4294967295 -CONST Whitesmoke~& = 4294309365 -CONST WildBlueYonder~& = 4288851408 -CONST WildStrawberry~& = 4294919076 -CONST WildWatermelon~& = 4294732933 -CONST Wisteria~& = 4291667166 -CONST Yellow~& = 4294967040 -CONST YellowGreen~& = 4288335154 -CONST YellowOrange~& = 4294946370 - diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas index 3640144a7..a03d7f052 100644 --- a/source/ide/ide_methods.bas +++ b/source/ide/ide_methods.bas @@ -12782,11 +12782,7 @@ SUB ideshowtext IF (RIGHT$(a2$, 5) = "_RGB(" OR _ RIGHT$(a2$, 7) = "_RGB32(" OR _ RIGHT$(a2$, 6) = "_RGBA(" OR _ - RIGHT$(a2$, 8) = "_RGBA32(") OR _ - ((RIGHT$(a2$, 4) = "RGB(" OR _ - RIGHT$(a2$, 6) = "RGB32(" OR _ - RIGHT$(a2$, 5) = "RGBA(" OR _ - RIGHT$(a2$, 7) = "RGBA32(") AND qb64prefix_set = 1) THEN + RIGHT$(a2$, 8) = "_RGBA32(") THEN shiftEnter_idecx = LEN(a$) a$ = a$ + " --> Shift+ENTER to open the RGB mixer" EnteringRGB = -1 @@ -12795,11 +12791,7 @@ SUB ideshowtext IF (MID$(a2$, idecx - 5, 5) = "_RGB(" OR _ MID$(a2$, idecx - 7, 7) = "_RGB32(" OR _ MID$(a2$, idecx - 6, 6) = "_RGBA(" OR _ - MID$(a2$, idecx - 8, 8) = "_RGBA32(") OR _ - ((MID$(a2$, idecx - 4, 4) = "RGB(" OR _ - MID$(a2$, idecx - 6, 6) = "RGB32(" OR _ - MID$(a2$, idecx - 5, 5) = "RGBA(" OR _ - MID$(a2$, idecx - 7, 7) = "RGBA32(") AND qb64prefix_set = 1) THEN + MID$(a2$, idecx - 8, 8) = "_RGBA32(") THEN IF INSTR("0123456789", MID$(a2$, idecx, 1)) = 0 THEN EnteringRGB = -1 END IF END IF @@ -12920,8 +12912,7 @@ SUB ideshowtext IF comment = 0 AND LEFT$(checkKeyword$, 1) = "?" THEN isKeyword = 1: GOTO setOldChar keywordAcquired: checkKeyword$ = UCASE$(checkKeyword$) - IF INSTR(listOfKeywords$, "@" + checkKeyword$ + "@") > 0 OR _ - (qb64prefix_set = 1 AND INSTR(listOfKeywords$, "@_" + checkKeyword$ + "@") > 0) THEN + IF INSTR(listOfKeywords$, "@" + checkKeyword$ + "@") > 0 THEN 'special cases IF checkKeyword$ = "$END" THEN IF UCASE$(MID$(a2$, m, 7)) = "$END IF" THEN checkKeyword$ = "$END IF" @@ -20299,7 +20290,7 @@ FUNCTION findHelpTopic$(topic$, lnks, firstOnly AS _BYTE) DO UNTIL EOF(fh) LINE INPUT #fh, l$ c = INSTR(l$, ","): l1$ = LEFT$(l$, c - 1): l2$ = RIGHT$(l$, LEN(l$) - c) - IF a2$ = UCASE$(l1$) OR (qb64prefix_set = 1 AND LEFT$(l1$, 1) = "_" AND a2$ = MID$(l1$, 2)) THEN + IF a2$ = UCASE$(l1$) THEN IF INSTR(lnks$, CHR$(0) + l2$ + CHR$(0)) = 0 THEN lnks = lnks + 1 IF firstOnly THEN findHelpTopic$ = l2$: CLOSE #fh: EXIT FUNCTION @@ -20703,7 +20694,6 @@ SUB ExportCodeAs (docFormat$) bo% = 0 '=> Wiki page +(boolean) check required bo$ = "@AND@OR@XOR@" '---------- - np% = 0 ''=> $NOPREFIX indicator pc% = 0 ''=> pre-compiler indicator ml% = 0 ''=> meta line indicator dl% = 0 ''=> data line indicator @@ -20729,7 +20719,6 @@ SUB ExportCodeAs (docFormat$) IF me% THEN IF NOT in% THEN GOSUB VerifyKeyword: GOSUB WriteLink: ELSE me$ = "": in% = 0 me% = 0: le% = 0 - IF UCASE$(me$) = "$NOPREFIX" THEN np% = -1 END IF IF kw% THEN IF NOT in% THEN GOSUB VerifyKeyword: GOSUB WriteLink: ELSE kw$ = "": in% = 0 @@ -20761,13 +20750,13 @@ SUB ExportCodeAs (docFormat$) CASE "REM": IF NOT (co% OR qu%) THEN co% = -1: what$ = "co": GOSUB OpenText CASE "DATA": dl% = -1 CASE "OPEN": op% = -1 - CASE "IF", "ELSEIF", "UNTIL", "WHILE": fu% = -1: bo% = -1 + CASE "CASE", "IF", "ELSEIF", "UNTIL", "WHILE": fu% = -1: bo% = -1 CASE "THEN", "ELSE": fu% = 0: bo% = 0 CASE ELSE FOR i& = 1 TO idn IF ids(i&).subfunc = 2 AND ids(i&).args > 0 THEN id$ = RTRIM$(ids(i&).n): uw$ = UCASE$(kw$) - IF (id$ = uw$) OR (np% AND id$ = "_" + uw$) THEN fu% = -2: EXIT FOR + IF id$ = uw$ THEN fu% = -2: EXIT FOR END IF NEXT i& END SELECT @@ -21000,7 +20989,7 @@ SUB ExportCodeAs (docFormat$) VerifyKeyword: IF me% THEN veri$ = me$: ELSE veri$ = kw$ IF ASC(veri$, 1) <> 95 THEN flp% = 1: ELSE flp% = 2 - IF (ASC(veri$, flp%) < 91 OR MID$(veri$, flp%, 2) = "gl") AND (INSTR(listOfKeywords$, "@" + UCASE$(veri$) + "@") > 0 OR (np% AND INSTR(listOfKeywords$, "@_" + UCASE$(veri$) + "@") > 0)) THEN + IF (ASC(veri$, flp%) < 91 OR MID$(veri$, flp%, 2) = "gl") AND (INSTR(listOfKeywords$, "@" + UCASE$(veri$) + "@") > 0) THEN IF me% AND le% THEN IF INSTR("$DYNAMIC$INCLUDE$STATIC", UCASE$(veri$)) = 0 THEN me$ = "" ELSEIF me% AND NOT le% THEN @@ -21031,17 +21020,20 @@ SUB ExportCodeAs (docFormat$) CASE "FOR", "OUTPUT", "APPEND", "INPUT", "BINARY", "RANDOM": page$ = "OPEN#File_Access_Modes": RETURN END SELECT END IF - IF (fu% < 0) AND ((INSTR(fu$, "@" + page$ + "@") > 0) OR (np% AND INSTR(fu$, "@_" + page$ + "@") > 0)) THEN + IF fu% < 0 AND INSTR(fu$, "@" + page$ + "@") > 0 THEN page$ = page$ + " (function)" - ELSEIF bo% AND INSTR(bo$, "@" + page$ + "@") > 0 THEN 'np% check omitted (legacy words only) + ELSEIF bo% AND INSTR(bo$, "@" + page$ + "@") > 0 THEN page$ = page$ + " (boolean)" - ELSEIF ((INSTR(ma$, "@" + page$ + "@") > 0) OR (np% AND INSTR(ma$, "@_" + page$ + "@") > 0)) THEN + ELSEIF INSTR(ma$, "@" + page$ + "@") > 0 THEN page$ = "Mathematical Operations#Derived_Mathematical_Functions" ELSE la$ = LTRIM$(StrReplace$(MID$(sTxt$, sPos&, 100), CHR$(9), " ")) SELECT EVERYCASE page$ CASE "$END": IF UCASE$(LEFT$(la$, 2)) = "IF" THEN me$ = me$ + " " + LEFT$(la$, 2): page$ = "$END IF": in% = -1 CASE "CALL": IF UCASE$(LEFT$(la$, 8)) = "ABSOLUTE" THEN kw$ = kw$ + " " + LEFT$(la$, 8): page$ = "CALL ABSOLUTE": in% = -1 + CASE "CASE" + IF UCASE$(LEFT$(la$, 2)) = "IS" THEN kw$ = kw$ + " " + LEFT$(la$, 2): page$ = "CASE IS": fu% = -1: bo% = -1: in% = -1 + IF UCASE$(LEFT$(la$, 4)) = "ELSE" THEN kw$ = kw$ + " " + LEFT$(la$, 4): page$ = "CASE ELSE": fu% = 0: bo% = 0: in% = -1 CASE "DECLARE": IF UCASE$(LEFT$(la$, 7)) = "LIBRARY" THEN kw$ = kw$ + " " + LEFT$(la$, 7): page$ = "DECLARE LIBRARY": in% = -1 CASE "DEF": IF UCASE$(LEFT$(la$, 3)) = "SEG" THEN kw$ = kw$ + " " + LEFT$(la$, 3): page$ = "DEF SEG": in% = -1 CASE "DO" diff --git a/source/qb64pe.bas b/source/qb64pe.bas index 496e15bc0..9467e08bd 100644 --- a/source/qb64pe.bas +++ b/source/qb64pe.bas @@ -49,7 +49,6 @@ vWatchVariableExclusions$ = "@__LONG_VWATCH_LINENUMBER@__LONG_VWATCH_SUBLEVEL@__ DIM SHARED nativeDataTypes$ nativeDataTypes$ = "@_OFFSET@OFFSET@_UNSIGNED _OFFSET@UNSIGNED OFFSET@_BIT@BIT@_UNSIGNED _BIT@UNSIGNED BIT@_BYTE@_UNSIGNED _BYTE@BYTE@UNSIGNED BYTE@INTEGER@_UNSIGNED INTEGER@UNSIGNED INTEGER@LONG@_UNSIGNED LONG@UNSIGNED LONG@_INTEGER64@INTEGER64@_UNSIGNED _INTEGER64@UNSIGNED INTEGER64@SINGLE@DOUBLE@_FLOAT@FLOAT@STRING@" -DIM SHARED qb64prefix_set_recompileAttempts, qb64prefix_set_desiredState DIM SHARED opex_recompileAttempts, opex_desiredState DIM SHARED opexarray_recompileAttempts, opexarray_desiredState @@ -140,7 +139,7 @@ DIM SHARED bypassNextVariable AS _BYTE DIM SHARED totalWarnings AS LONG, warningListItems AS LONG, lastWarningHeader AS STRING DIM SHARED duplicateConstWarning AS _BYTE, warningsissued AS _BYTE DIM SHARED emptySCWarning AS _BYTE, maxLineNumber AS LONG -DIM SHARED ExeIconSet AS LONG, qb64prefix$, qb64prefix_set +DIM SHARED ExeIconSet AS LONG DIM SHARED VersionInfoSet AS _BYTE 'Array to handle $EMBED metacommand: @@ -1119,9 +1118,6 @@ SubNameLabels = sp 'QB64 will perform a repass to resolve sub names used as labe vWatchDesiredState = 0 vWatchRecompileAttempts = 0 -qb64prefix_set_desiredState = 0 -qb64prefix_set_recompileAttempts = 0 - opex_desiredState = 0 opex_recompileAttempts = 0 @@ -1132,9 +1128,6 @@ recompile: vWatchOn = vWatchDesiredState vWatchVariable "", -1 'reset internal variables list -qb64prefix_set = qb64prefix_set_desiredState -qb64prefix$ = "_" - optionexplicit = opex_desiredState IF optionexplicit_cmd = -1 AND NoIDEMode = 1 THEN optionexplicit = -1 optionexplicitarray = opexarray_desiredState @@ -1499,29 +1492,6 @@ END IF reginternal -IF qb64prefix_set THEN - qb64prefix$ = "" - - 're-add internal keywords without the "_" prefix - reginternal - - f = HASHFLAG_TYPE + HASHFLAG_RESERVED - HashAdd "UNSIGNED", f, 0 - HashAdd "BIT", f, 0 - HashAdd "BYTE", f, 0 - HashAdd "INTEGER64", f, 0 - HashAdd "OFFSET", f, 0 - HashAdd "FLOAT", f, 0 - - f = HASHFLAG_RESERVED + HASHFLAG_CUSTOMSYNTAX - HashAdd "EXPLICIT", f, 0 - - f = HASHFLAG_OPERATOR + HASHFLAG_RESERVED - HashAdd "NEGATE", f, 0 - HashAdd "ANDALSO", f, 0 - HashAdd "ORELSE", f, 0 -END IF - DIM SHARED GlobTxtBuf: GlobTxtBuf = OpenBuffer%("O", tmpdir$ + "global.txt") defdatahandle = GlobTxtBuf @@ -1651,20 +1621,12 @@ DO END IF IF temp$ = "$COLOR:0" THEN - IF qb64prefix_set THEN - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0_noprefix.bi" - ELSE - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi" - END IF + addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi" GOTO finishedlinepp END IF IF temp$ = "$COLOR:32" THEN - IF qb64prefix_set THEN - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32_noprefix.bi" - ELSE - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi" - END IF + addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi" GOTO finishedlinepp END IF @@ -1681,16 +1643,6 @@ DO END IF END IF - IF temp$ = "$NOPREFIX" THEN - qb64prefix_set_desiredState = 1 - IF qb64prefix_set = 0 THEN - IF qb64prefix_set_recompileAttempts = 0 THEN - qb64prefix_set_recompileAttempts = qb64prefix_set_recompileAttempts + 1 - GOTO do_recompile - END IF - END IF - END IF - IF LEFT$(temp$, 7) = "$ERROR " THEN temp$ = RemoveStringEnclosingPair(LTRIM$(MID$(temp$, 7)), METACOMMAND_STRING_ENCLOSING_PAIR) a$ = "Compilation check failed: " + temp$ @@ -1749,7 +1701,6 @@ DO SELECT CASE token$ CASE "MIDI" unstableFlags(UNSTABLE_MIDI) = -1 - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature. Use _MIDISOUNDBANK instead", "$UNSTABLE:MIDI" CASE "HTTP" unstableFlags(UNSTABLE_HTTP) = -1 @@ -1912,7 +1863,7 @@ DO udtesize(i2) = typsize * 8 END IF ELSEIF typ AND ISOFFSETINBITS THEN - a$ = "Cannot use " + qb64prefix$ + "BIT inside user defined types": GOTO errmes + a$ = "Cannot use _BIT inside user defined types": GOTO errmes ELSE udtesize(i2) = typ AND 511 END IF @@ -2189,7 +2140,7 @@ DO END IF IF issueWarning THEN IF NOT IgnoreWarnings THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "duplicate constant definition", n$ + " =" + thisconstval$ + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Duplicate constant definition", n$ + " =" + thisconstval$ END IF GOTO constAddDone ELSE @@ -2253,7 +2204,7 @@ DO IF firstelement$ = "DEFSNG" THEN d = 1 IF firstelement$ = "DEFDBL" THEN d = 1 IF firstelement$ = "DEFSTR" THEN d = 1 - IF firstelement$ = "_DEFINE" OR (firstelement$ = "DEFINE" AND qb64prefix_set = 1) THEN d = 1 + IF firstelement$ = "_DEFINE" THEN d = 1 IF d THEN predefining = 1: GOTO predefine predefined: predefining = 0 @@ -2996,28 +2947,21 @@ DO IF a3u$ = "$COLOR:0" THEN layout$ = SCase$("$Color:0") - IF qb64prefix_set THEN - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0_noprefix.bi" - ELSE - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi" - END IF + addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi" layoutdone = 1 GOTO finishednonexec END IF IF a3u$ = "$COLOR:32" THEN layout$ = SCase$("$Color:32") - IF qb64prefix_set THEN - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32_noprefix.bi" - ELSE - addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi" - END IF + addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi" layoutdone = 1 GOTO finishednonexec END IF IF a3u$ = "$NOPREFIX" THEN - 'already set in prepass + 'Deprecated; does nothing. layout$ = SCase$("$NoPrefix") + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature", "$NOPREFIX" GOTO finishednonexec END IF @@ -3030,20 +2974,20 @@ DO IF a3u$ = "$VIRTUALKEYBOARD:ON" THEN 'Deprecated; does nothing. layout$ = SCase$("$VirtualKeyboard:On") - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature", "$VirtualKeyboard" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature", "$VIRTUALKEYBOARD" GOTO finishednonexec END IF IF a3u$ = "$VIRTUALKEYBOARD:OFF" THEN 'Deprecated; does nothing. layout$ = SCase$("$VirtualKeyboard:Off") - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature", "$VirtualKeyboard" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature", "$VIRTUALKEYBOARD" GOTO finishednonexec END IF IF a3u$ = "$DEBUG" THEN layout$ = SCase$("$Debug") IF NoIDEMode THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "$Debug", "$Debug features only work from the IDE" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "$DEBUG features only work from the IDE", "" END IF GOTO finishednonexec END IF @@ -3052,7 +2996,7 @@ DO layout$ = SCase$("$Checking:Off") CheckingOn = 0 IF vWatchOn <> 0 AND NoIDEMode = 0 AND inclevel = 0 THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "$Debug", "$Debug features won't work in $Checking:Off blocks" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "$DEBUG features won't work in these blocks", "$CHECKING:OFF" END IF GOTO finishednonexec END IF @@ -3200,7 +3144,7 @@ DO ' Generate warnings if needed IF issueWarning AND NOT IgnoreWarnings THEN IF NOT HasStringEnclosingPair(VersionInfoValue$, METACOMMAND_STRING_ENCLOSING_PAIR) THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "missing string bracket delimiters (" + METACOMMAND_STRING_ENCLOSING_PAIR + ")", VersionInfoValue$ + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Missing string bracket delimiters (" + METACOMMAND_STRING_ENCLOSING_PAIR + ")", VersionInfoValue$ END IF END IF @@ -3354,13 +3298,14 @@ DO END IF IF LEFT$(a3u$, 10) = "$UNSTABLE:" THEN - layout$ = SCase("$Unstable:") + layout$ = SCase$("$Unstable:") token$ = LTRIM$(RTRIM$(MID$(a3u$, 11))) SELECT CASE token$ CASE "MIDI" layout$ = layout$ + SCase$("Midi") + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature, use _MIDISOUNDBANK instead", "$UNSTABLE:MIDI" CASE "HTTP" layout$ = layout$ + SCase$("Http") @@ -3371,7 +3316,8 @@ DO IF unstableFlags(UNSTABLE_MIDI) THEN IF LEFT$(a3u$, 15) = "$MIDISOUNDFONT:" THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature. Use _MIDISOUNDBANK instead", "$MIDISOUNDFONT" + layout$ = SCase$("$MIDISoundFont:") + MID$(a3$, 16) + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Deprecated feature, use _MIDISOUNDBANK instead", "$MIDISOUNDFONT" GOTO finishednonexec END IF @@ -3815,11 +3761,7 @@ DO IF Error_Happened THEN GOTO errmes IF typ = 0 THEN a$ = "Undefined type": GOTO errmes IF typ AND ISUDT THEN - IF UCASE$(RTRIM$(t$)) = "MEM" AND RTRIM$(udtxcname(typ AND 511)) = "_MEM" AND qb64prefix_set = 1 THEN - t$ = MID$(RTRIM$(udtxcname(typ AND 511)), 2) - ELSE - t$ = RTRIM$(udtxcname(typ AND 511)) - END IF + t$ = RTRIM$(udtxcname(typ AND 511)) l$ = l$ + sp + t$ ELSE l$ = l$ + sp + SCase2$(t$) @@ -3842,11 +3784,7 @@ DO IF Error_Happened THEN GOTO errmes IF typ = 0 THEN a$ = "Undefined type": GOTO errmes IF typ AND ISUDT THEN - IF UCASE$(RTRIM$(t$)) = "MEM" AND RTRIM$(udtxcname(typ AND 511)) = "_MEM" AND qb64prefix_set = 1 THEN - t$ = MID$(RTRIM$(udtxcname(typ AND 511)), 2) - ELSE - t$ = RTRIM$(udtxcname(typ AND 511)) - END IF + t$ = RTRIM$(udtxcname(typ AND 511)) l$ = l$ + sp + t$ ELSE l$ = l$ + sp + SCase2$(t$) @@ -4987,7 +4925,7 @@ DO IF UCASE$(e$) = "BYVAL" THEN IF declaringlibrary = 0 THEN a$ = "BYVAL can only be used with DECLARE LIBRARY": GOTO errmes byvalue = 1: a2$ = RIGHT$(a2$, LEN(a2$) - 6) - IF RIGHT$(l$, 1) = "(" THEN l$ = l$ + sp2 + SCase$("ByVal") ELSE l$ = l$ + sp + SCase$("Byval") + IF RIGHT$(l$, 1) = "(" THEN l$ = l$ + sp2 + SCase$("ByVal") ELSE l$ = l$ + sp + SCase$("ByVal") n2 = numelements(a2$): e$ = getelement$(a2$, 1) END IF @@ -5040,11 +4978,7 @@ DO IF Error_Happened THEN GOTO errmes IF typ = 0 THEN a$ = "Undefined type": GOTO errmes IF typ AND ISUDT THEN - IF RTRIM$(udtxcname(typ AND 511)) = "_MEM" AND UCASE$(t3$) = "MEM" AND qb64prefix_set = 1 THEN - t3$ = MID$(RTRIM$(udtxcname(typ AND 511)), 2) - ELSE - t3$ = RTRIM$(udtxcname(typ AND 511)) - END IF + t3$ = RTRIM$(udtxcname(typ AND 511)) l$ = l$ + sp + t3$ ELSE FOR t3i = 1 TO LEN(t3$) @@ -5101,9 +5035,6 @@ DO IF t2$ = RTRIM$(udtxname(xx)) THEN WriteBufLine RegTxtBuf, "void*" GOTO decudt - ELSEIF RTRIM$(udtxname(xx)) = "_MEM" AND t2$ = "MEM" AND qb64prefix_set = 1 THEN - WriteBufLine RegTxtBuf, "void*" - GOTO decudt END IF NEXT t$ = typ2ctyp$(0, t2$) @@ -5496,9 +5427,9 @@ DO IF firstelement$ = "DEFSNG" THEN l$ = SCase$("DefSng"): a$ = a$ + sp + "AS" + sp + "SINGLE": n = n + 2: GOTO definetype IF firstelement$ = "DEFDBL" THEN l$ = SCase$("DefDbl"): a$ = a$ + sp + "AS" + sp + "DOUBLE": n = n + 2: GOTO definetype IF firstelement$ = "DEFSTR" THEN l$ = SCase$("DefStr"): a$ = a$ + sp + "AS" + sp + "STRING": n = n + 2: GOTO definetype - IF firstelement$ = "_DEFINE" OR (firstelement$ = "DEFINE" AND qb64prefix_set = 1) THEN + IF firstelement$ = "_DEFINE" THEN asreq = 1 - IF firstelement$ = "_DEFINE" THEN l$ = SCase$("_Define") ELSE l$ = SCase$("Define") + l$ = SCase$("_Define") definetype: 'get type from rhs typ$ = "" @@ -5511,8 +5442,8 @@ DO typ2$ = t$ + sp + typ2$ NEXT typ$ = RTRIM$(typ$) - IF t$ <> "AS" THEN a$ = qb64prefix$ + "DEFINE: Expected ... AS ...": GOTO errmes - IF i = n OR i = 2 THEN a$ = qb64prefix$ + "DEFINE: Expected ... AS ...": GOTO errmes + IF t$ <> "AS" THEN a$ = "_DEFINE: Expected ... AS ...": GOTO errmes + IF i = n OR i = 2 THEN a$ = "_DEFINE: Expected ... AS ...": GOTO errmes n = i - 1 @@ -5521,8 +5452,8 @@ DO definenext: 'expects an alphabet letter or underscore i = i + 1: e$ = getelement$(a$, i): E = ASC(UCASE$(e$)) - IF LEN(e$) > 1 THEN a$ = qb64prefix$ + "DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes - IF E <> 95 AND (E > 90 OR E < 65) THEN a$ = qb64prefix$ + "DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes + IF LEN(e$) > 1 THEN a$ = "_DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes + IF E <> 95 AND (E > 90 OR E < 65) THEN a$ = "_DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes IF E = 95 THEN E = 27 ELSE E = E - 64 defineaz(E) = typ$ defineextaz(E) = type2symbol(typ$) @@ -5539,14 +5470,14 @@ DO 'expects "-" or "," i = i + 1: e$ = getelement$(a$, i) - IF e$ <> "-" AND e$ <> "," THEN a$ = qb64prefix$ + "DEFINE: Expected - or ,": GOTO errmes + IF e$ <> "-" AND e$ <> "," THEN a$ = "_DEFINE: Expected - or ,": GOTO errmes IF e$ = "-" THEN l$ = l$ + sp2 + "-" - IF i = n THEN a$ = qb64prefix$ + "DEFINE: Syntax incomplete": GOTO errmes + IF i = n THEN a$ = "_DEFINE: Syntax incomplete": GOTO errmes 'expects an alphabet letter or underscore i = i + 1: e$ = getelement$(a$, i): E = ASC(UCASE$(e$)) - IF LEN(e$) > 1 THEN a$ = qb64prefix$ + "DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes - IF E <> 95 AND (E > 90 OR E < 65) THEN a$ = qb64prefix$ + "DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes + IF LEN(e$) > 1 THEN a$ = "_DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes + IF E <> 95 AND (E > 90 OR E < 65) THEN a$ = "_DEFINE: Expected an alphabet letter or the underscore character (_)": GOTO errmes IF E = 95 THEN E = 27 ELSE E = E - 64 IF firste > E THEN SWAP E, firste FOR e2 = firste TO E @@ -5563,7 +5494,7 @@ DO END IF 'expects "," i = i + 1: e$ = getelement$(a$, i) - IF e$ <> "," THEN a$ = qb64prefix$ + "DEFINE: Expected ,": GOTO errmes + IF e$ <> "," THEN a$ = "_DEFINE: Expected ,": GOTO errmes END IF l$ = l$ + sp2 + "," GOTO definenext @@ -6296,7 +6227,7 @@ DO IF SelectCaseCounter > 0 AND SelectCaseHasCaseBlock(SelectCaseCounter) = 0 THEN 'warn user of empty SELECT CASE block IF NOT IgnoreWarnings THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "empty SELECT CASE block", "" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Empty SELECT CASE block", "" END IF END IF @@ -6652,7 +6583,7 @@ DO IF firstelement$ = "KEY" THEN IF n = 1 THEN a$ = "Expected KEY ...": GOTO errmes - l$ = SCase$("KEY") + sp + l$ = SCase$("Key") + sp IF secondelement$ = "OFF" THEN IF n > 2 THEN a$ = "Expected KEY OFF only": GOTO errmes l$ = l$ + SCase$("Off"): layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ @@ -7510,9 +7441,6 @@ DO l2$ = l2$ + sp + SCase2$(t3$) ELSE t3$ = RTRIM$(udtxcname(t AND 511)) - IF RTRIM$(udtxcname(t AND 511)) = "_MEM" AND UCASE$(t$) = "MEM" AND qb64prefix_set = 1 THEN - t3$ = MID$(RTRIM$(udtxcname(t AND 511)), 2) - END IF l2$ = l2$ + sp + t3$ END IF IF Error_Happened THEN GOTO errmes @@ -7660,9 +7588,6 @@ DO l2$ = l2$ + sp + SCase2$(t3$) ELSE t3$ = RTRIM$(udtxcname(t AND 511)) - IF RTRIM$(udtxcname(t AND 511)) = "_MEM" AND UCASE$(t$) = "MEM" AND qb64prefix_set = 1 THEN - t3$ = MID$(RTRIM$(udtxcname(t AND 511)), 2) - END IF l2$ = l2$ + sp + t3$ END IF IF Error_Happened THEN GOTO errmes @@ -7726,9 +7651,9 @@ DO '_ECHO checking - IF firstelement$ = "_ECHO" OR (firstelement$ = "ECHO" AND qb64prefix_set = 1) THEN + IF firstelement$ = "_ECHO" THEN IF ConsoleOn = 0 THEN - a$ = qb64prefix$ + "ECHO requires $CONSOLE or $CONSOLE:ONLY to be set first": GOTO errmes + a$ = "_ECHO requires $CONSOLE or $CONSOLE:ONLY to be set first": GOTO errmes END IF END IF @@ -8031,14 +7956,10 @@ DO IF firstelement$ = "REDIM" THEN l$ = SCase$("ReDim") dimoption = 2: redimoption = 1 - IF secondelement$ = "_PRESERVE" OR (secondelement$ = "PRESERVE" AND qb64prefix_set = 1) THEN + IF secondelement$ = "_PRESERVE" THEN redimoption = 2 - IF secondelement$ = "_PRESERVE" THEN - l$ = l$ + sp + SCase$("_Preserve") - ELSE - l$ = l$ + sp + SCase$("Preserve") - END IF - IF n = 2 THEN a$ = "Expected REDIM " + qb64prefix$ + "PRESERVE ...": GOTO errmes + l$ = l$ + sp + SCase$("_Preserve") + IF n = 2 THEN a$ = "Expected REDIM _PRESERVE ...": GOTO errmes END IF END IF IF firstelement$ = "STATIC" THEN l$ = SCase$("Static"): dimoption = 3 @@ -8402,9 +8323,6 @@ DO IF dimmethod = 0 THEN IF t AND ISUDT THEN dim2typepassback$ = RTRIM$(udtxcname(t AND 511)) - IF UCASE$(typ$) = "MEM" AND qb64prefix_set = 1 AND RTRIM$(udtxcname(t AND 511)) = "_MEM" THEN - dim2typepassback$ = MID$(RTRIM$(udtxcname(t AND 511)), 2) - END IF ELSE dim2typepassback$ = typ$ DO WHILE INSTR(dim2typepassback$, " ") @@ -8792,8 +8710,8 @@ DO END IF IF n = 1 THEN - IF firstelement$ = "_CONTINUE" OR (firstelement$ = "CONTINUE" AND qb64prefix_set = 1) THEN - IF firstelement$ = "_CONTINUE" THEN l$ = SCase$("_Continue") ELSE l$ = SCase$("Continue") + IF firstelement$ = "_CONTINUE" THEN + l$ = SCase$("_Continue") 'scan backwards until previous control level reached FOR i = controllevel TO 1 STEP -1 t = controltype(i) @@ -8811,19 +8729,19 @@ DO GOTO finishedline END IF NEXT - a$ = qb64prefix$ + "CONTINUE outside DO..LOOP/FOR..NEXT/WHILE..WEND block": GOTO errmes + a$ = "_CONTINUE outside DO..LOOP/FOR..NEXT/WHILE..WEND block": GOTO errmes END IF END IF IF firstelement$ = "CHAIN" THEN IF vWatchOn THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Feature incompatible with $Debug mode", "CHAIN" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Feature incompatible with $DEBUG mode", "CHAIN" END IF END IF IF firstelement$ = "RUN" THEN 'RUN IF vWatchOn THEN - addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Feature incompatible with $Debug mode", "RUN" + addWarning linenumber, inclevel, inclinenumber(inclevel), incname$(inclevel), "Feature incompatible with $DEBUG mode", "RUN" END IF l$ = SCase$("Run") IF n = 1 THEN @@ -9107,8 +9025,8 @@ DO lbl$ = getelement$(ca$, 4) hhc$ = UCASE$(lbl$) '(H)andler(H)istory(C)ommand IF n = 5 THEN - IF hhc$ = "_LASTHANDLER" OR (hhc$ = "LASTHANDLER" AND qb64prefix_set = 1) THEN a$ = "No label allowed after _LASTHANDLER": GOTO errmes - IF hhc$ <> "_NEWHANDLER" AND (hhc$ <> "NEWHANDLER" AND qb64prefix_set = 1) THEN a$ = "Expected: ON ERROR GOTO [_NEWHANDLER] label": GOTO errmes + IF hhc$ = "_LASTHANDLER" THEN a$ = "No label allowed after _LASTHANDLER": GOTO errmes + IF hhc$ <> "_NEWHANDLER" THEN a$ = "Expected: ON ERROR GOTO [_NEWHANDLER] label": GOTO errmes lbl$ = getelement$(ca$, 5) IF lbl$ = "0" THEN a$ = "Zero not allowed after _NEWHANDLER": GOTO errmes END IF @@ -9119,14 +9037,14 @@ DO l$ = l$ + sp + "0" layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline - ELSEIF hhc$ = "_NEWHANDLER" OR (hhc$ = "NEWHANDLER" AND qb64prefix_set = 1) THEN + ELSEIF hhc$ = "_NEWHANDLER" THEN IF n = 4 THEN a$ = "Expected: ON ERROR GOTO [_NEWHANDLER] label": GOTO errmes - IF ASC(hhc$, 1) = 95 THEN l$ = l$ + sp + SCase$("_NewHandler") ELSE l$ = l$ + sp + SCase$("NewHandler") - ELSEIF hhc$ = "_LASTHANDLER" OR (hhc$ = "LASTHANDLER" AND qb64prefix_set = 1) THEN + l$ = l$ + sp + SCase$("_NewHandler") + ELSEIF hhc$ = "_LASTHANDLER" THEN WriteBufLine MainTxtBuf, "error_goto_line = qbr(func_val(error_handler_history));" WriteBufLine MainTxtBuf, "qbs_set(error_handler_history, func_mid(error_handler_history, func_instr(NULL, error_handler_history, qbs_new_txt_len(" + CHR$(34) + "|" + CHR$(34) + ", 1), 0) + 1 , NULL, 0));" WriteBufLine MainTxtBuf, "qbs_cleanup(qbs_tmp_base, 0);" - IF ASC(hhc$, 1) = 95 THEN l$ = l$ + sp + SCase$("_LastHandler") ELSE l$ = l$ + sp + SCase$("LastHandler") + l$ = l$ + sp + SCase$("_LastHandler") layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline END IF @@ -9163,7 +9081,7 @@ DO l$ = l$ + sp + tlayout$ layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ errorlabels = errorlabels + 1 - IF hhc$ = "_NEWHANDLER" OR (hhc$ = "NEWHANDLER" AND qb64prefix_set = 1) THEN + IF hhc$ = "_NEWHANDLER" THEN WriteBufLine MainTxtBuf, "qbs_set(error_handler_history, qbs_add(qbs_add(qbs_str((int32)(error_goto_line)), qbs_new_txt_len(" + CHR$(34) + "|" + CHR$(34) + ", 1)), error_handler_history));" WriteBufLine MainTxtBuf, "qbs_cleanup(qbs_tmp_base, 0);" END IF @@ -9227,7 +9145,7 @@ DO '(_MEM) _MEMPUT _MEMGET IF n >= 1 THEN - IF firstelement$ = "_MEMGET" OR (firstelement$ = "MEMGET" AND qb64prefix_set = 1) THEN + IF firstelement$ = "_MEMGET" THEN 'get expressions e$ = "" B = 0 @@ -9240,21 +9158,19 @@ DO ne = ne + 1 IF ne = 1 THEN blk$ = e$: e$ = "" IF ne = 2 THEN offs$ = e$: e$ = "" - IF ne = 3 THEN a$ = "Syntax error - too many parameters (Expected " + qb64prefix$ + "MEMGET mem-reference, offset, variable)": GOTO errmes + IF ne = 3 THEN a$ = "Syntax error - too many parameters (Expected _MEMGET mem-reference, offset, variable)": GOTO errmes ELSE IF LEN(e$) = 0 THEN e$ = e2$ ELSE e$ = e$ + sp + e2$ END IF NEXT var$ = e$ - IF e$ = "" OR ne <> 2 THEN a$ = "Expected " + qb64prefix$ + "MEMGET mem-reference, offset, variable": GOTO errmes - - IF firstelement$ = "_MEMGET" THEN l$ = SCase$("_MemGet") + sp ELSE l$ = SCase$("MemGet") + sp + IF e$ = "" OR ne <> 2 THEN a$ = "Expected _MEMGET mem-reference, offset, variable": GOTO errmes e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes - l$ = l$ + tlayout$ + l$ = SCase$("_MemGet") + sp + tlayout$ test$ = evaluate(e$, typ): IF Error_Happened THEN GOTO errmes - IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected " + qb64prefix$ + "MEM type": GOTO errmes + IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected _MEM type": GOTO errmes blkoffs$ = evaluatetotyp(e$, -6) ' IF typ AND ISREFERENCE THEN e$ = refer(e$, typ, 0) @@ -9326,7 +9242,7 @@ DO IF n >= 1 THEN - IF firstelement$ = "_MEMPUT" OR (firstelement$ = "MEMPUT" AND qb64prefix_set = 1) THEN + IF firstelement$ = "_MEMPUT" THEN 'get expressions typ$ = "" e$ = "" @@ -9346,16 +9262,14 @@ DO IF LEN(e$) = 0 THEN e$ = e2$ ELSE e$ = e$ + sp + e2$ END IF NEXT - IF ne < 2 OR e$ = "" THEN a$ = "Expected " + qb64prefix$ + "MEMPUT mem-reference, offset, variable|value[AS type]": GOTO errmes + IF ne < 2 OR e$ = "" THEN a$ = "Expected _MEMPUT mem-reference, offset, variable|value[AS type]": GOTO errmes IF ne = 2 THEN var$ = e$ ELSE typ$ = UCASE$(e$) - IF firstelement$ = "_MEMPUT" THEN l$ = SCase$("_MemPut") + sp ELSE l$ = SCase$("MemPut") + sp - e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes - l$ = l$ + tlayout$ + l$ = SCase$("_MemPut") + sp + tlayout$ test$ = evaluate(e$, typ): IF Error_Happened THEN GOTO errmes - IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected " + qb64prefix$ + "MEM type": GOTO errmes + IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected _MEM type": GOTO errmes blkoffs$ = evaluatetotyp(e$, -6) e$ = fixoperationorder$(offs$): IF Error_Happened THEN GOTO errmes @@ -9420,7 +9334,7 @@ DO 'typname2typsize = 0 'the default t = typname2typ(typ$) IF t = 0 THEN a$ = "Invalid type": GOTO errmes - IF (t AND ISOFFSETINBITS) <> 0 OR (t AND ISUDT) <> 0 OR (t AND ISSTRING) THEN a$ = qb64prefix$ + "MEMPUT requires numeric type": GOTO errmes + IF (t AND ISOFFSETINBITS) <> 0 OR (t AND ISUDT) <> 0 OR (t AND ISSTRING) THEN a$ = "_MEMPUT requires numeric type": GOTO errmes IF (t AND ISPOINTER) THEN t = t - ISPOINTER 'attempt conversion... e$ = fixoperationorder$(var$): IF Error_Happened THEN GOTO errmes @@ -9462,7 +9376,7 @@ DO IF n >= 1 THEN - IF firstelement$ = "_MEMFILL" OR (firstelement$ = "MEMFILL" AND qb64prefix_set = 1) THEN + IF firstelement$ = "_MEMFILL" THEN 'get expressions typ$ = "" e$ = "" @@ -9483,16 +9397,14 @@ DO IF LEN(e$) = 0 THEN e$ = e2$ ELSE e$ = e$ + sp + e2$ END IF NEXT - IF ne < 3 OR e$ = "" THEN a$ = "Expected " + qb64prefix$ + "MEMFILL mem-reference, offset, bytes, variable|value[AS type]": GOTO errmes + IF ne < 3 OR e$ = "" THEN a$ = "Expected _MEMFILL mem-reference, offset, bytes, variable|value[AS type]": GOTO errmes IF ne = 3 THEN var$ = e$ ELSE typ$ = UCASE$(e$) - IF firstelement$ = "_MEMFILL" THEN l$ = SCase$("_MemFill") + sp ELSE l$ = SCase$("MemFill") + sp - e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes - l$ = l$ + tlayout$ + l$ = SCase$("_MemFill") + sp + tlayout$ test$ = evaluate(e$, typ): IF Error_Happened THEN GOTO errmes - IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected " + qb64prefix$ + "MEM type": GOTO errmes + IF (typ AND ISUDT) = 0 OR (typ AND 511) <> 1 THEN a$ = "Expected " + "_MEM type": GOTO errmes blkoffs$ = evaluatetotyp(e$, -6) e$ = fixoperationorder$(offs$): IF Error_Happened THEN GOTO errmes @@ -9529,7 +9441,7 @@ DO '... AS type method t = typname2typ(typ$) IF t = 0 THEN a$ = "Invalid type": GOTO errmes - IF (t AND ISOFFSETINBITS) <> 0 OR (t AND ISUDT) <> 0 OR (t AND ISSTRING) THEN a$ = qb64prefix$ + "MEMFILL requires numeric type": GOTO errmes + IF (t AND ISOFFSETINBITS) <> 0 OR (t AND ISUDT) <> 0 OR (t AND ISSTRING) THEN a$ = "_MEMFILL requires numeric type": GOTO errmes IF (t AND ISPOINTER) THEN t = t - ISPOINTER 'attempt conversion... e$ = fixoperationorder$(var$): IF Error_Happened THEN GOTO errmes @@ -10443,8 +10355,8 @@ DO END IF IF firstelement$ = "OPTION" THEN - IF optionexplicit = 0 THEN e$ = " or OPTION " + qb64prefix$ + "EXPLICIT" ELSE e$ = "" - IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION " + qb64prefix$ + "EXPLICITARRAY" + IF optionexplicit = 0 THEN e$ = " or OPTION _EXPLICIT" ELSE e$ = "" + IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION _EXPLICITARRAY" IF n = 1 THEN a$ = "Expected OPTION BASE" + e$: GOTO errmes e$ = getelement$(a$, 2) SELECT CASE e$ @@ -10455,13 +10367,7 @@ DO l$ = SCase$("Option" + sp + "Base") + sp + l$ layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline - CASE "EXPLICIT", "_EXPLICIT" - IF e$ = "EXPLICIT" AND qb64prefix$ = "_" THEN - IF optionexplicit = 0 THEN e$ = " or OPTION " + qb64prefix$ + "EXPLICIT" ELSE e$ = "" - IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION " + qb64prefix$ + "EXPLICITARRAY" - a$ = "Expected OPTION BASE" + e$: GOTO errmes - END IF - + CASE "_EXPLICIT" opex_desiredState = -1 IF optionexplicit = 0 THEN IF opex_recompileAttempts = 0 THEN @@ -10469,18 +10375,10 @@ DO GOTO do_recompile END IF END IF - - l$ = SCase$("Option") + sp - IF e$ = "EXPLICIT" THEN l$ = l$ + SCase$("Explicit") ELSE l$ = l$ + SCase$("_Explicit") + l$ = SCase$("Option" + sp + "_Explicit") layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline - CASE "EXPLICITARRAY", "_EXPLICITARRAY" - IF e$ = "EXPLICITARRAY" AND qb64prefix$ = "_" THEN - IF optionexplicit = 0 THEN e$ = " or OPTION " + qb64prefix$ + "EXPLICIT" ELSE e$ = "" - IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION " + qb64prefix$ + "EXPLICITARRAY" - a$ = "Expected OPTION BASE" + e$: GOTO errmes - END IF - + CASE "_EXPLICITARRAY" opexarray_desiredState = -1 IF optionexplicitarray = 0 THEN IF opexarray_recompileAttempts = 0 THEN @@ -10488,14 +10386,12 @@ DO GOTO do_recompile END IF END IF - - l$ = SCase$("Option") + sp - IF e$ = "EXPLICITARRAY" THEN l$ = l$ + SCase$("ExplicitArray") ELSE l$ = l$ + SCase$("_ExplicitArray") + l$ = SCase$("Option" + sp + "_ExplicitArray") layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ GOTO finishedline CASE ELSE - IF optionexplicit = 0 THEN e$ = " or OPTION " + qb64prefix$ + "EXPLICIT" ELSE e$ = "" - IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION " + qb64prefix$ + "EXPLICITARRAY" + IF optionexplicit = 0 THEN e$ = " or OPTION _EXPLICIT" ELSE e$ = "" + IF optionexplicitarray = 0 THEN e$ = e$ + " or OPTION _EXPLICITARRAY" a$ = "Expected OPTION BASE" + e$: GOTO errmes END SELECT END IF @@ -11037,11 +10933,7 @@ DO IF explicitreference = 0 THEN IF targettyp AND ISUDT THEN nth = i - IF qb64prefix_set AND udtxcname(targettyp AND 511) = "_MEM" THEN - x$ = "'" + MID$(RTRIM$(udtxcname(targettyp AND 511)), 2) + "'" - ELSE - x$ = "'" + RTRIM$(udtxcname(targettyp AND 511)) + "'" - END IF + x$ = "'" + RTRIM$(udtxcname(targettyp AND 511)) + "'" IF ids(targetid).args = 1 THEN a$ = "TYPE " + x$ + " required for sub": GOTO errmes a$ = str_nth$(nth) + " sub argument requires TYPE " + x$: GOTO errmes END IF @@ -12238,7 +12130,7 @@ IF NOT IgnoreWarnings THEN END IF NEXT - header$ = "unused variable" 's (" + LTRIM$(STR$(totalUnusedVariables)) + ")" + header$ = "Unused variable" 's (" + LTRIM$(STR$(totalUnusedVariables)) + ")" FOR i = 1 TO totalVariablesCreated IF usedVariableList(i).used = 0 THEN addWarning usedVariableList(i).linenumber, usedVariableList(i).includeLevel, usedVariableList(i).includedLine, usedVariableList(i).includedFile, header$, usedVariableList(i).name + SPACE$((maxVarNameLen + 1) - LEN(usedVariableList(i).name)) + " " + usedVariableList(i).varType @@ -14294,11 +14186,8 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) 'UDT 'is it a udt? FOR i = 1 TO lasttype - IF typ$ = RTRIM$(udtxname(i)) OR (typ$ = "MEM" AND RTRIM$(udtxname(i)) = "_MEM" AND qb64prefix_set = 1) THEN + IF typ$ = RTRIM$(udtxname(i)) THEN dim2typepassback$ = RTRIM$(udtxcname(i)) - IF typ$ = "MEM" AND RTRIM$(udtxname(i)) = "_MEM" THEN - dim2typepassback$ = MID$(RTRIM$(udtxcname(i)), 2) - END IF n$ = "UDT_" + varname$ @@ -14403,10 +14292,10 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) 'check if _UNSIGNED was specified unsgn = 0 - IF LEFT$(typ$, 10) = "_UNSIGNED " OR (LEFT$(typ$, 9) = "UNSIGNED " AND qb64prefix_set = 1) THEN + IF LEFT$(typ$, 10) = "_UNSIGNED " THEN unsgn = 1 typ$ = MID$(typ$, INSTR(typ$, CHR$(32)) + 1) - IF LEN(typ$) = 0 THEN Give_Error "Expected more type information after " + qb64prefix$ + "UNSIGNED!": EXIT FUNCTION + IF LEN(typ$) = 0 THEN Give_Error "Expected more type information after _UNSIGNED!": EXIT FUNCTION END IF n$ = "" 'n$ is assumed to be "" after branching into the code for each type @@ -14658,9 +14547,9 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) GOTO dim2exitfunc END IF - IF LEFT$(typ$, 4) = "_BIT" OR (LEFT$(typ$, 3) = "BIT" AND qb64prefix_set = 1) THEN + IF LEFT$(typ$, 4) = "_BIT" THEN IF (LEFT$(typ$, 4) = "_BIT" AND LEN(typ$) > 4) OR (LEFT$(typ$, 3) = "BIT" AND LEN(typ$) > 3) THEN - IF LEFT$(typ$, 7) <> "_BIT * " AND LEFT$(typ$, 6) <> "BIT * " THEN Give_Error "Expected " + qb64prefix$ + "BIT * number": EXIT FUNCTION + IF LEFT$(typ$, 7) <> "_BIT * " AND LEFT$(typ$, 6) <> "BIT * " THEN Give_Error "Expected _BIT * number": EXIT FUNCTION c$ = MID$(typ$, INSTR(typ$, " * ") + 3) IF isuinteger(c$) = 0 THEN Give_Error "Number expected after *": EXIT FUNCTION IF LEN(c$) > 2 THEN Give_Error "Cannot create a bit variable of size > 64 bits": EXIT FUNCTION @@ -14765,7 +14654,7 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) GOTO dim2exitfunc END IF - IF typ$ = "_BYTE" OR (typ$ = "BYTE" AND qb64prefix_set = 1) THEN + IF typ$ = "_BYTE" THEN ct$ = "int8" IF unsgn THEN n$ = "U": ct$ = "u" + ct$ n$ = n$ + "BYTE_" + varname$ @@ -14943,7 +14832,7 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) - IF typ$ = "_OFFSET" OR (typ$ = "OFFSET" AND qb64prefix_set = 1) THEN + IF typ$ = "_OFFSET" THEN ct$ = "ptrszint" IF unsgn THEN n$ = "U": ct$ = "u" + ct$ n$ = n$ + "OFFSET_" + varname$ @@ -15111,7 +15000,7 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) GOTO dim2exitfunc END IF - IF typ$ = "_INTEGER64" OR (typ$ = "INTEGER64" AND qb64prefix_set = 1) THEN + IF typ$ = "_INTEGER64" THEN ct$ = "int64" IF unsgn THEN n$ = "U": ct$ = "u" + ct$ n$ = n$ + "INTEGER64_" + varname$ @@ -15367,7 +15256,7 @@ FUNCTION dim2 (varname$, typ2$, method, elements$) GOTO dim2exitfunc END IF - IF typ$ = "_FLOAT" OR (typ$ = "FLOAT" AND qb64prefix_set = 1) THEN + IF typ$ = "_FLOAT" THEN ct$ = "long double" n$ = n$ + "FLOAT_" + varname$ IF elements$ <> "" THEN @@ -16545,7 +16434,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) '*special case CVI,CVL,CVS,CVD,_CV (part #1) - IF n$ = "_CV" OR (n$ = "CV" AND qb64prefix_set = 1) THEN + IF n$ = "_CV" THEN IF curarg = 1 THEN cvtype$ = type2symbol$(e$) IF Error_Happened THEN EXIT FUNCTION @@ -16556,7 +16445,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) '*special case MKI,MKL,MKS,MKD,_MK (part #1) - IF n$ = "_MK" OR (n$ = "MK" AND qb64prefix_set = 1) THEN + IF n$ = "_MK" THEN IF RTRIM$(id2.musthave) = "$" THEN IF curarg = 1 THEN mktype$ = type2symbol$(e$) @@ -16568,7 +16457,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF END IF - IF n$ = "_EMBEDDED" OR (n$ = "EMBEDDED" AND qb64prefix_set = 1) THEN + IF n$ = "_EMBEDDED" THEN IF RTRIM$(id2.musthave) = "$" THEN IF curarg = 1 THEN 'check handle argument @@ -16654,7 +16543,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) 'WriteBufLine MainTxtBuf, "r$="; r$ '*special case* - IF n$ = "_MEMGET" OR (n$ = "MEMGET" AND qb64prefix_set = 1) THEN + IF n$ = "_MEMGET" THEN IF curarg = 1 THEN memget_blk$ = e$ END IF @@ -16672,7 +16561,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF t = typname2typ(e$) IF t = 0 THEN Give_Error "Invalid TYPE name": EXIT FUNCTION - IF t AND ISOFFSETINBITS THEN Give_Error qb64prefix$ + "BIT TYPE unsupported": EXIT FUNCTION + IF t AND ISOFFSETINBITS THEN Give_Error "_BIT TYPE unsupported": EXIT FUNCTION memget_size = typname2typsize IF t AND ISSTRING THEN IF (t AND ISFIXEDLENGTH) = 0 THEN Give_Error "Expected STRING * ...": EXIT FUNCTION @@ -16730,7 +16619,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) '------------------------------------------------------------------------------------------------------------ ' a740g: ROR & ROL support - IF n$ = "_ROR" OR (n$ = "ROR" AND qb64prefix_set = 1) OR n$ = "_ROL" OR (n$ = "ROL" AND qb64prefix_set = 1) THEN + IF n$ = "_ROR" OR n$ = "_ROL" THEN rotlr_n$ = LCASE$(RIGHT$(n$, 3)) ' Get the last 3 characters and convert to lower case. We'll need this to construct the C call IF curarg = 1 THEN ' First parameter IF (sourcetyp AND ISSTRING) OR (sourcetyp AND ISFLOAT) OR (sourcetyp AND ISOFFSET) OR (sourcetyp AND ISUDT) THEN ' Bad parameters types @@ -16768,7 +16657,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF ' a740g: UCHARPOS special case for arg 2 - IF n$ = "_UCHARPOS" OR (n$ = "UCHARPOS" AND qb64prefix_set = 1) THEN + IF n$ = "_UCHARPOS" THEN IF curarg = 2 THEN ' It must be an array IF (sourcetyp AND ISREFERENCE) = 0 OR (sourcetyp AND ISARRAY) = 0 THEN @@ -16789,7 +16678,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF '***special case*** - IF n$ = "_MEM" OR (n$ = "MEM" AND qb64prefix_set = 1) THEN + IF n$ = "_MEM" THEN IF curarg = 1 THEN IF args = 1 THEN targettyp = -7 @@ -16802,12 +16691,12 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF '*special case* - IF n$ = "_OFFSET" OR (n$ = "OFFSET" AND qb64prefix_set = 1) THEN + IF n$ = "_OFFSET" THEN IF (sourcetyp AND ISREFERENCE) = 0 THEN - Give_Error qb64prefix$ + "OFFSET expects the name of a variable/array": EXIT FUNCTION + Give_Error "_OFFSET expects the name of a variable/array": EXIT FUNCTION END IF IF (sourcetyp AND ISARRAY) THEN - IF (sourcetyp AND ISOFFSETINBITS) THEN Give_Error qb64prefix$ + "OFFSET cannot reference _BIT type arrays": EXIT FUNCTION + IF (sourcetyp AND ISOFFSETINBITS) THEN Give_Error "_OFFSET cannot reference _BIT type arrays": EXIT FUNCTION END IF r$ = "((uptrszint)(" + evaluatetotyp$(e2$, -6) + "))" IF Error_Happened THEN EXIT FUNCTION @@ -16848,7 +16737,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) '*special case* - IF n$ = "_BIN" OR (n$ = "BIN" AND qb64prefix_set = 1) THEN + IF n$ = "_BIN" THEN IF RTRIM$(id2.musthave) = "$" THEN bits = sourcetyp AND 511 @@ -16986,7 +16875,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) END IF '*special case* - IF n$ = "_ROUND" OR (n$ = "ROUND" AND qb64prefix_set = 1) THEN + IF n$ = "_ROUND" THEN IF (sourcetyp AND ISSTRING) THEN Give_Error "Expected numeric value": EXIT FUNCTION IF (sourcetyp AND ISREFERENCE) THEN e$ = refer(e$, sourcetyp, 0) IF Error_Happened THEN EXIT FUNCTION @@ -17098,10 +16987,10 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) IF n$ = "MKL" THEN mktype = 2: mktype$ = "&" IF n$ = "MKS" THEN mktype = 3: mktype$ = "!" IF n$ = "MKD" THEN mktype = 4: mktype$ = "#" - IF n$ = "_MK" OR (n$ = "MK" AND qb64prefix_set = 1) THEN mktype = -1 + IF n$ = "_MK" THEN mktype = -1 IF mktype THEN IF mktype <> -1 OR curarg = 2 THEN - 'IF (sourcetyp AND ISOFFSET) THEN Give_Error "Cannot convert " + qb64prefix$ + "OFFSET type to other types": EXIT FUNCTION + 'IF (sourcetyp AND ISOFFSET) THEN Give_Error "Cannot convert " + "_OFFSET type to other types": EXIT FUNCTION 'both _MK and trad. process the following qtyp& = 0 IF mktype$ = "%%" THEN ctype$ = "b": qtyp& = BYTETYPE - ISPOINTER @@ -17119,7 +17008,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) IF mktype$ = "~%&" THEN ctype$ = "uo": qtyp& = UOFFSETTYPE - ISPOINTER IF LEFT$(mktype$, 2) = "~`" THEN ctype$ = "ubit": qtyp& = UINTEGER64TYPE - ISPOINTER: size = VAL(RIGHT$(mktype$, LEN(mktype$) - 2)) IF LEFT$(mktype$, 1) = "`" THEN ctype$ = "bit": qtyp& = INTEGER64TYPE - ISPOINTER: size = VAL(RIGHT$(mktype$, LEN(mktype$) - 1)) - IF qtyp& = 0 THEN Give_Error qb64prefix$ + "MK only accepts numeric types": EXIT FUNCTION + IF qtyp& = 0 THEN Give_Error "_MK only accepts numeric types": EXIT FUNCTION IF size THEN r$ = ctype$ + "2string(" + str2(size) + "," ELSE @@ -17136,7 +17025,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) IF n$ = "CVL" THEN cvtype = 2: cvtype$ = "&" IF n$ = "CVS" THEN cvtype = 3: cvtype$ = "!" IF n$ = "CVD" THEN cvtype = 4: cvtype$ = "#" - IF n$ = "_CV" OR (n$ = "CV" AND qb64prefix_set = 1) THEN cvtype = -1 + IF n$ = "_CV" THEN cvtype = -1 IF cvtype THEN IF cvtype <> -1 OR curarg = 2 THEN IF (sourcetyp AND ISSTRING) = 0 THEN Give_Error n$ + " requires a STRING argument": EXIT FUNCTION @@ -17158,7 +17047,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) IF cvtype$ = "~%&" THEN ctype$ = "uo": typ& = UOFFSETTYPE - ISPOINTER IF LEFT$(cvtype$, 2) = "~`" THEN ctype$ = "ubit": typ& = UINTEGER64TYPE - ISPOINTER: size = VAL(RIGHT$(cvtype$, LEN(cvtype$) - 2)) IF LEFT$(cvtype$, 1) = "`" THEN ctype$ = "bit": typ& = INTEGER64TYPE - ISPOINTER: size = VAL(RIGHT$(cvtype$, LEN(cvtype$) - 1)) - IF typ& = 0 THEN Give_Error qb64prefix$ + "CV cannot return STRING type!": EXIT FUNCTION + IF typ& = 0 THEN Give_Error "_CV cannot return STRING type!": EXIT FUNCTION IF ctype$ = "bit" OR ctype$ = "ubit" THEN r$ = "string2" + ctype$ + "(" + e$ + "," + str2(size) + ")" ELSE @@ -17749,11 +17638,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) IF targettyp AND ISUDT THEN nth = curarg IF skipFirstArg THEN nth = nth - 1 - IF qb64prefix_set AND udtxcname(targettyp AND 511) = "_MEM" THEN - x$ = "'" + MID$(RTRIM$(udtxcname(targettyp AND 511)), 2) + "'" - ELSE - x$ = "'" + RTRIM$(udtxcname(targettyp AND 511)) + "'" - END IF + x$ = "'" + RTRIM$(udtxcname(targettyp AND 511)) + "'" IF ids(targetid).args = 1 THEN Give_Error "TYPE " + x$ + " required for function": EXIT FUNCTION Give_Error str_nth$(nth) + " function argument requires TYPE " + x$: EXIT FUNCTION END IF @@ -17841,7 +17726,7 @@ FUNCTION evaluatefunc$ (a2$, args AS LONG, typ AS LONG) r$ = r$ + e$ '***special case**** - IF n$ = "_MEM" OR (n$ = "MEM" AND qb64prefix_set = 1) THEN + IF n$ = "_MEM" THEN IF args = 1 THEN IF curarg = 1 THEN r$ = r$ + ")": GOTO evalfuncspecial END IF @@ -18187,7 +18072,7 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG) ELSE - Give_Error qb64prefix$ + "MEMELEMENT cannot reference variable-length strings": EXIT FUNCTION + Give_Error "_MEMELEMENT cannot reference variable-length strings": EXIT FUNCTION END IF EXIT FUNCTION @@ -18216,7 +18101,7 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG) e$ = refer(e$, sourcetyp, 0) IF Error_Happened THEN EXIT FUNCTION ELSE - Give_Error qb64prefix$ + "MEMELEMENT cannot reference variable-length strings": EXIT FUNCTION + Give_Error "_MEMELEMENT cannot reference variable-length strings": EXIT FUNCTION END IF 'evaluatetotyp$ = "byte_element((uint64)" + e$ + "->chr," + bytes$ + "," + NewByteElement$ + ")" @@ -18293,7 +18178,7 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG) IF (sourcetyp AND ISARRAY) THEN IF sourcetyp AND ISSTRING THEN IF (sourcetyp AND ISFIXEDLENGTH) = 0 THEN - Give_Error qb64prefix$ + "MEM cannot reference variable-length strings": EXIT FUNCTION + Give_Error "_MEM cannot reference variable-length strings": EXIT FUNCTION END IF END IF @@ -18335,7 +18220,7 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG) 'String IF sourcetyp AND ISSTRING THEN - IF (sourcetyp AND ISFIXEDLENGTH) = 0 THEN Give_Error qb64prefix$ + "MEM cannot reference variable-length strings": EXIT FUNCTION + IF (sourcetyp AND ISFIXEDLENGTH) = 0 THEN Give_Error "_MEM cannot reference variable-length strings": EXIT FUNCTION idnumber = VAL(e$) getid idnumber: IF Error_Happened THEN EXIT FUNCTION @@ -18591,14 +18476,12 @@ FUNCTION findid& (n2$) IF ids(i).subfunc = 2 THEN IF ASC(ids(i).secondargmustbe) <> 32 THEN 'exists? IF RTRIM$(secondarg$) = UCASE$(RTRIM$(ids(i).secondargmustbe)) THEN - ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargmustbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) = UCASE$(MID$(RTRIM$(ids(i).secondargmustbe), 2)) THEN ELSE GOTO findidnomatch END IF END IF IF ASC(ids(i).secondargcantbe) <> 32 THEN 'exists? IF RTRIM$(secondarg$) <> UCASE$(RTRIM$(ids(i).secondargcantbe)) THEN - ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargcantbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) <> UCASE$(MID$(RTRIM$(ids(i).secondargcantbe), 2)) THEN ELSE GOTO findidnomatch END IF @@ -18782,10 +18665,6 @@ FUNCTION fixoperationorder_rec$ (savea$, bare_arrays) IF temp1$ = "EQV" AND temp2$ = "EQV" THEN Give_Error "Error: EQV EQV": EXIT FUNCTION IF temp1$ = "_ANDALSO" AND temp2$ = "_ANDALSO" THEN Give_Error "Error: _ANDALSO _ANDALSO": EXIT FUNCTION IF temp1$ = "_ORELSE" AND temp2$ = "_ORELSE" THEN Give_Error "Error: _ORELSE _ORELSE": EXIT FUNCTION - IF qb64prefix_set THEN - IF temp1$ = "ANDALSO" AND temp2$ = "ANDALSO" THEN Give_Error "Error: ANDALSO ANDALSO": EXIT FUNCTION - IF temp1$ = "ORELSE" AND temp2$ = "ORELSE" THEN Give_Error "Error: ORELSE ORELSE": EXIT FUNCTION - END IF NEXT '----------------A. 'Quick' mismatched brackets check---------------- @@ -19546,16 +19425,16 @@ FUNCTION fixoperationorder_rec$ (savea$, bare_arrays) f3$ = UCASE$(f2$) internaltype = 0 IF f3$ = "STRING" THEN internaltype = 1 - IF f3$ = "_UNSIGNED" OR (f3$ = "UNSIGNED" AND qb64prefix_set = 1) THEN internaltype = 1 - IF f3$ = "_BIT" OR (f3$ = "BIT" AND qb64prefix_set = 1) THEN internaltype = 1 - IF f3$ = "_BYTE" OR (f3$ = "BYTE" AND qb64prefix_set = 1) THEN internaltype = 1 + IF f3$ = "_UNSIGNED" THEN internaltype = 1 + IF f3$ = "_BIT" THEN internaltype = 1 + IF f3$ = "_BYTE" THEN internaltype = 1 IF f3$ = "INTEGER" THEN internaltype = 1 IF f3$ = "LONG" THEN internaltype = 1 - IF f3$ = "_INTEGER64" OR (f3$ = "INTEGER64" AND qb64prefix_set = 1) THEN internaltype = 1 + IF f3$ = "_INTEGER64" THEN internaltype = 1 IF f3$ = "SINGLE" THEN internaltype = 1 IF f3$ = "DOUBLE" THEN internaltype = 1 - IF f3$ = "_FLOAT" OR (f3$ = "FLOAT" AND qb64prefix_set = 1) THEN internaltype = 1 - IF f3$ = "_OFFSET" OR (f3$ = "OFFSET" AND qb64prefix_set = 1) THEN internaltype = 1 + IF f3$ = "_FLOAT" THEN internaltype = 1 + IF f3$ = "_OFFSET" THEN internaltype = 1 IF internaltype = 1 THEN f2$ = SCase2$(f3$) removeelements a$, i, i, 0 @@ -19746,14 +19625,14 @@ END SUB FUNCTION isoperator (a2$) a$ = UCASE$(a2$) l = 0 - l = l + 1: IF a$ = "_ORELSE" OR (qb64prefix_set AND a$ = "ORELSE") THEN GOTO opfound - l = l + 1: IF a$ = "_ANDALSO" OR (qb64prefix_set AND a$ = "ANDALSO") THEN GOTO opfound + l = l + 1: IF a$ = "_ORELSE" THEN GOTO opfound + l = l + 1: IF a$ = "_ANDALSO" THEN GOTO opfound l = l + 1: IF a$ = "IMP" THEN GOTO opfound l = l + 1: IF a$ = "EQV" THEN GOTO opfound l = l + 1: IF a$ = "XOR" THEN GOTO opfound l = l + 1: IF a$ = "OR" THEN GOTO opfound l = l + 1: IF a$ = "AND" THEN GOTO opfound - l = l + 1: IF a$ = "_NEGATE" OR (qb64prefix_set AND a$ = "NEGATE") THEN GOTO opfound + l = l + 1: IF a$ = "_NEGATE" THEN GOTO opfound l = l + 1: IF a$ = "NOT" THEN GOTO opfound l = l + 1 IF a$ = "=" THEN GOTO opfound @@ -20850,12 +20729,12 @@ FUNCTION operatorusage (operator$, typ AS LONG, info$, lhs AS LONG, rhs AS LONG, IF operator$ = "XOR" THEN info$ = "^": operatorusage = 1: EXIT FUNCTION IF operator$ = "OR" THEN info$ = "|": operatorusage = 1: EXIT FUNCTION IF operator$ = "AND" THEN info$ = "&": operatorusage = 1: EXIT FUNCTION - IF operator$ = "_ORELSE" OR (qb64prefix_set AND operator$ = "ORELSE") THEN info$ = "||": operatorusage = 3: EXIT FUNCTION - IF operator$ = "_ANDALSO" OR (qb64prefix_set AND operator$ = "ANDALSO") THEN info$ = "&&": operatorusage = 3: EXIT FUNCTION + IF operator$ = "_ORELSE" THEN info$ = "||": operatorusage = 3: EXIT FUNCTION + IF operator$ = "_ANDALSO" THEN info$ = "&&": operatorusage = 3: EXIT FUNCTION lhs = 7 IF operator$ = "NOT" THEN info$ = "~": operatorusage = 5: EXIT FUNCTION - IF operator$ = "_NEGATE" OR (qb64prefix_set AND operator$ = "NEGATE") THEN info$ = "!": operatorusage = 6: EXIT FUNCTION + IF operator$ = "_NEGATE" THEN info$ = "!": operatorusage = 6: EXIT FUNCTION IF Debug THEN PRINT #9, "INVALID NUMBERIC OPERATOR!": END @@ -21275,7 +21154,7 @@ SUB regUnstableHttp reginternalsubfunc = 1 clearid - id.n = qb64prefix$ + "StatusCode" ' Name in CaMeL case + id.n = "_StatusCode" ' Name in CaMeL case id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__statusCode" ' C/C++ function name id.args = 1 @@ -21284,12 +21163,6 @@ SUB regUnstableHttp id.hr_syntax = "_STATUSCODE(httpHandle&)" ' syntax help regid - ' If we're doing $NOPREFIX then we register it again with the underscore - IF qb64prefix_set THEN - id.n = "_StatusCode" - regid - END IF - reginternalsubfunc = 0 END SUB @@ -21695,7 +21568,6 @@ FUNCTION seperateargs (a$, ca$, pass&) OutOfRange = 2147483647 position = OutOfRange which = 0 - removePrefix = 0 IF i <= n THEN 'Past end of contect check FOR o = 1 TO t words = OptWords(x, o) @@ -21709,13 +21581,11 @@ FUNCTION seperateargs (a$, ca$, pass&) c$ = c$ + " " + getelement$(a$, i3 + w - 1) NEXT w 'Compare - noPrefixMatch = LEFT$(Opt(x, o), 1) = "_" AND qb64prefix_set = 1 AND c$ = UCASE$(MID$(RTRIM$(Opt(x, o)), 2)) - IF c$ = UCASE$(RTRIM$(Opt(x, o))) OR noPrefixMatch THEN + IF c$ = UCASE$(RTRIM$(Opt(x, o))) THEN 'Record Match IF i3 < position THEN position = i3 which = o - IF noPrefixMatch THEN removePrefix = 1 bvalue = b EXIT FOR 'Exit the i3 loop END IF 'position check @@ -21758,7 +21628,7 @@ FUNCTION seperateargs (a$, ca$, pass&) END IF END IF 'Expression i = i + OptWords(x, which) - separgslayout(x) = CHR$(LEN(RTRIM$(Opt(x, which))) - removePrefix) + SCase$(MID$(RTRIM$(Opt(x, which)), removePrefix + 1)) + separgslayout(x) = CHR$(LEN(RTRIM$(Opt(x, which)))) + SCase$(MID$(RTRIM$(Opt(x, which)), 1)) separgs(x) = CHR$(0) + str2(which) ELSE 'Not Found... diff --git a/source/subs_functions/extensions/opengl/opengl_methods.bas b/source/subs_functions/extensions/opengl/opengl_methods.bas index 512de671a..23dce245f 100644 --- a/source/subs_functions/extensions/opengl/opengl_methods.bas +++ b/source/subs_functions/extensions/opengl/opengl_methods.bas @@ -332,9 +332,9 @@ SUB gl_include_content 'add constants FOR d = 1 TO GL_DEFINES_LAST - 'IF ASC(GL_DEFINES(d)) <> 95 THEN - ' GL_DEFINES(d) = "_" + GL_DEFINES(d) - 'END IF + IF ASC(GL_DEFINES(d)) <> 95 THEN + GL_DEFINES(d) = "_" + GL_DEFINES(d) + END IF constlast = constlast + 1 IF constlast > constmax THEN constmax = constmax * 2 @@ -350,8 +350,8 @@ SUB gl_include_content REDIM _PRESERVE constdefined(constmax) AS LONG END IF i = constlast - constname(i) = qb64prefix$ + GL_DEFINES(d) - constcname(i) = qb64prefix$ + GL_DEFINES(d) + constname(i) = GL_DEFINES(d) + constcname(i) = GL_DEFINES(d) constnamesymbol(i) = "&&" consttype(i) = INTEGER64TYPE - ISPOINTER constinteger(i) = GL_DEFINES_VALUE(d) @@ -379,7 +379,6 @@ SUB gl_include_content clearid id.ccall = 1 '*** important for handling string returns correctly *** id.n = RTRIM$(g.cn) - IF qb64prefix_set = 1 THEN id.n = MID$(RTRIM$(g.cn), 2) s = g.subfunc id.subfunc = s id.callname = RTRIM$(g.callname) @@ -395,7 +394,7 @@ SUB gl_include_content 'SUB gluPerspective (BYVAL fovy#, BYVAL aspect#, BYVAL zNear#, BYVAL zFar#) reginternalsubfunc = 1 clearid - id.n = qb64prefix$ + "gluPerspective" + id.n = "_gluPerspective" id.subfunc = 2 'sub id.callname = "gluPerspective" id.args = 4 diff --git a/source/subs_functions/subs_functions.bas b/source/subs_functions/subs_functions.bas index fe0eb57e2..72757a540 100644 --- a/source/subs_functions/subs_functions.bas +++ b/source/subs_functions/subs_functions.bas @@ -75,17 +75,17 @@ id.n = "SetMem": id.subfunc = 1: id.callname = "func_stub": id.args = 1: id.arg clearid id.n = "FileAttr": id.subfunc = 1: id.callname = "func_stub": id.args = 2: id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid clearid -id.n = qb64prefix$ + "MemGet": id.subfunc = 2: id.callname = "sub_stub": regid +id.n = "_MemGet": id.subfunc = 2: id.callname = "sub_stub": regid clearid -id.n = qb64prefix$ + "MemPut": id.subfunc = 2: id.callname = "sub_stub": regid +id.n = "_MemPut": id.subfunc = 2: id.callname = "sub_stub": regid clearid -id.n = qb64prefix$ + "MemFill": id.subfunc = 2: id.callname = "sub_stub": regid +id.n = "_MemFill": id.subfunc = 2: id.callname = "sub_stub": regid clearid -id.n = qb64prefix$ + "Continue": id.subfunc = 2: id.callname = "sub_stub": regid +id.n = "_Continue": id.subfunc = 2: id.callname = "sub_stub": regid clearid -id.n = qb64prefix$ + "Resize" +id.n = "_Resize" id.subfunc = 2 id.callname = "sub__resize" id.args = 2 @@ -95,7 +95,7 @@ id.hr_syntax = "_RESIZE [{ON|OFF}][, {_STRETCH|_SMOOTH}]" regid clearid -id.n = qb64prefix$ + "Resize" +id.n = "_Resize" id.subfunc = 1 id.callname = "func__resize" id.ret = LONGTYPE - ISPOINTER @@ -103,7 +103,7 @@ id.hr_syntax = "_RESIZE" regid clearid -id.n = qb64prefix$ + "ResizeWidth" +id.n = "_ResizeWidth" id.subfunc = 1 id.callname = "func__resizewidth" id.ret = LONGTYPE - ISPOINTER @@ -111,7 +111,7 @@ id.hr_syntax = "_RESIZEWIDTH" regid clearid -id.n = qb64prefix$ + "ResizeHeight" +id.n = "_ResizeHeight" id.subfunc = 1 id.callname = "func__resizeheight" id.ret = LONGTYPE - ISPOINTER @@ -119,7 +119,7 @@ id.hr_syntax = "_RESIZEHEIGHT" regid clearid -id.n = qb64prefix$ + "ScaledWidth" +id.n = "_ScaledWidth" id.subfunc = 1 id.callname = "func__scaledwidth" id.ret = LONGTYPE - ISPOINTER @@ -127,7 +127,7 @@ id.hr_syntax = "_SCALEDWIDTH" regid clearid -id.n = qb64prefix$ + "ScaledHeight" +id.n = "_ScaledHeight" id.subfunc = 1 id.callname = "func__scaledheight" id.ret = LONGTYPE - ISPOINTER @@ -136,7 +136,7 @@ regid clearid -id.n = qb64prefix$ + "GLRender" +id.n = "_GLRender" id.subfunc = 2 id.callname = "sub__glrender" id.args = 1 @@ -146,7 +146,7 @@ id.hr_syntax = "_GLRENDER {_Behind|_OnTop|_Only}" regid clearid -id.n = qb64prefix$ + "DisplayOrder" +id.n = "_DisplayOrder" id.subfunc = 2 id.callname = "sub__displayorder" id.args = 4 @@ -156,7 +156,7 @@ id.hr_syntax = "_DISPLAYORDER {_Software|_Hardware|_Hardware1|_GLRender} (any co regid clearid -id.n = qb64prefix$ + "MemGet" +id.n = "_MemGet" id.subfunc = 1 id.callname = "func__memget" id.args = 3 @@ -166,7 +166,7 @@ id.hr_syntax = "_MEMGET(block, offset, type)" regid clearid -id.n = qb64prefix$ + "Mem" +id.n = "_Mem" id.subfunc = 1 id.callname = "func__mem" 'id.args = 1 @@ -180,7 +180,7 @@ regid '---special case--- clearid -id.n = qb64prefix$ + "MemElement" +id.n = "_MemElement" id.subfunc = 1 id.callname = "func__mem" id.args = 1 @@ -193,7 +193,7 @@ regid clearid -id.n = qb64prefix$ + "MemFree" +id.n = "_MemFree" id.subfunc = 2 id.callname = "sub__memfree" id.args = 1 @@ -202,7 +202,7 @@ id.hr_syntax = "_MEMFREE memoryVariable" regid clearid -id.n = qb64prefix$ + "MemExists" +id.n = "_MemExists" id.subfunc = 1 id.callname = "func__memexists" id.args = 1 @@ -212,7 +212,7 @@ id.hr_syntax = "_MEMEXISTS(memBlock)" regid clearid -id.n = qb64prefix$ + "MemNew" +id.n = "_MemNew" id.subfunc = 1 id.callname = "func__memnew" id.args = 1 @@ -222,7 +222,7 @@ id.hr_syntax = "_MEMNEW(byteSize)" regid clearid -id.n = qb64prefix$ + "MemImage" +id.n = "_MemImage" id.subfunc = 1 id.callname = "func__memimage" id.args = 1 @@ -233,7 +233,7 @@ id.hr_syntax = "_MEMIMAGE or _MEMIMAGE(imageHandle)" regid clearid -id.n = qb64prefix$ + "MemSound": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_MemSound": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__memsound" id.args = 2 @@ -244,7 +244,7 @@ id.hr_syntax = "_MEMSOUND(soundHandle)" regid clearid '_MEMCOPY a, aoffset, bytes TO b, boffset -id.n = qb64prefix$ + "MemCopy" +id.n = "_MemCopy" id.subfunc = 2 id.callname = "sub__memcopy" id.args = 5 @@ -254,7 +254,7 @@ id.hr_syntax = "_MEMCOPY sourceBlock, sourceBlock.OFFSET, sourceBlock.SIZE TO de regid clearid -id.n = qb64prefix$ + "ConsoleTitle" +id.n = "_ConsoleTitle" id.subfunc = 2 id.callname = "sub__consoletitle" id.args = 1 @@ -263,21 +263,21 @@ id.hr_syntax = "_CONSOLETITLE title$" regid clearid -id.n = qb64prefix$ + "ScreenShow" +id.n = "_ScreenShow" id.subfunc = 2 id.callname = "sub__screenshow" id.hr_syntax = "_SCREENSHOW" regid clearid -id.n = qb64prefix$ + "ScreenHide" +id.n = "_ScreenHide" id.subfunc = 2 id.callname = "sub__screenhide" id.hr_syntax = "_SCREENHIDE" regid clearid -id.n = qb64prefix$ + "ScreenHide" +id.n = "_ScreenHide" id.subfunc = 1 id.callname = "func__screenhide" id.ret = LONGTYPE - ISPOINTER @@ -286,7 +286,7 @@ regid clearid -id.n = qb64prefix$ + "Console" +id.n = "_Console" id.subfunc = 1 id.callname = "func__console" id.ret = LONGTYPE - ISPOINTER @@ -294,7 +294,7 @@ id.hr_syntax = "_CONSOLE" regid clearid -id.n = qb64prefix$ + "Console" +id.n = "_Console" id.subfunc = 2 id.callname = "sub__console" id.args = 1 @@ -304,7 +304,7 @@ id.hr_syntax = "_CONSOLE {On|Off}" regid clearid -id.n = qb64prefix$ + "ControlChr" +id.n = "_ControlChr" id.subfunc = 2 id.callname = "sub__controlchr" id.args = 1 @@ -314,7 +314,7 @@ id.hr_syntax = "_CONTROLCHR {On|Off}" regid clearid -id.n = qb64prefix$ + "Blink" +id.n = "_Blink" id.subfunc = 2 id.callname = "sub__blink" id.args = 1 @@ -324,7 +324,7 @@ id.hr_syntax = "_BLINK {On|Off}" regid clearid -id.n = qb64prefix$ + "Blink" +id.n = "_Blink" id.subfunc = 1 id.callname = "func__blink" id.ret = LONGTYPE - ISPOINTER @@ -332,7 +332,7 @@ id.hr_syntax = "_BLINK" regid clearid -id.n = qb64prefix$ + "FileExists" +id.n = "_FileExists" id.subfunc = 1 id.callname = "func__fileexists" id.args = 1 @@ -342,7 +342,7 @@ id.hr_syntax = "_FILEEXISTS(fileName$)" regid clearid -id.n = qb64prefix$ + "DirExists" +id.n = "_DirExists" id.subfunc = 1 id.callname = "func__direxists" id.args = 1 @@ -389,7 +389,7 @@ regid clearid -id.n = qb64prefix$ + "Devices": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_Devices": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__devices" id.ret = LONGTYPE - ISPOINTER @@ -397,7 +397,7 @@ id.hr_syntax = "_DEVICES" regid clearid -id.n = qb64prefix$ + "Device": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_Device": id.Dependency=DEPENDENCY_DEVICEINPUT id.musthave = "$" id.subfunc = 1 id.callname = "func__device" @@ -409,7 +409,7 @@ id.hr_syntax = "_DEVICE$(device_number)" regid clearid -id.n = qb64prefix$ + "DeviceInput": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_DeviceInput": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__deviceinput" id.args = 1 @@ -420,7 +420,7 @@ id.hr_syntax = "_DEVICEINPUT or _DEVICEINPUT(device_number%)" regid clearid -id.n = qb64prefix$ + "LastButton": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_LastButton": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__lastbutton" id.args = 1 @@ -431,7 +431,7 @@ id.hr_syntax = "_LASTBUTTON(deviceNumber)" regid clearid -id.n = qb64prefix$ + "LastAxis": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_LastAxis": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__lastaxis" id.args = 1 @@ -442,7 +442,7 @@ id.hr_syntax = "_LASTAXIS(deviceNumber)" regid clearid -id.n = qb64prefix$ + "LastWheel": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_LastWheel": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__lastwheel" id.args = 1 @@ -453,7 +453,7 @@ id.hr_syntax = "_LASTWHEEL(deviceNumber)" regid clearid -id.n = qb64prefix$ + "Button": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_Button": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__button" id.args = 1 @@ -464,7 +464,7 @@ id.hr_syntax = "_BUTTON(button_number%)" regid clearid -id.n = qb64prefix$ + "ButtonChange": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_ButtonChange": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__buttonchange" id.args = 1 @@ -475,7 +475,7 @@ id.hr_syntax = "_BUTTONCHANGE(button_number%)" regid clearid -id.n = qb64prefix$ + "Axis": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_Axis": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__axis" id.args = 1 @@ -487,7 +487,7 @@ regid clearid -id.n = qb64prefix$ + "Wheel": id.Dependency=DEPENDENCY_DEVICEINPUT +id.n = "_Wheel": id.Dependency=DEPENDENCY_DEVICEINPUT id.subfunc = 1 id.callname = "func__wheel" id.args = 1 @@ -517,7 +517,7 @@ id.hr_syntax = "KEY(number) {On|Off|Stop}" regid clearid -id.n = qb64prefix$ + "ScreenX" +id.n = "_ScreenX" id.subfunc = 1 id.callname = "func__screenx" id.ret = LONGTYPE - ISPOINTER @@ -525,7 +525,7 @@ id.hr_syntax = "_SCREENX" regid clearid -id.n = qb64prefix$ + "ScreenY" +id.n = "_ScreenY" id.subfunc = 1 id.callname = "func__screeny" id.ret = LONGTYPE - ISPOINTER @@ -533,7 +533,7 @@ id.hr_syntax = "_SCREENY" regid clearid -id.n = qb64prefix$ + "ScreenMove" +id.n = "_ScreenMove" id.subfunc = 2 id.callname = "sub__screenmove" id.args = 2 @@ -543,7 +543,7 @@ id.hr_syntax = "_SCREENMOVE x, y or _SCREENMOVE _Middle" regid clearid -id.n = qb64prefix$ + "MouseMove" +id.n = "_MouseMove" id.subfunc = 2 id.callname = "sub__mousemove" id.args = 2 @@ -552,7 +552,7 @@ id.hr_syntax = "_MOUSEMOVE x, y" regid clearid -id.n = qb64prefix$ + "OS" +id.n = "_OS" id.musthave = "$" id.subfunc = 1 id.callname = "func__os" @@ -561,7 +561,7 @@ id.hr_syntax = "_OS$" regid clearid -id.n = qb64prefix$ + "Title" +id.n = "_Title" id.musthave = "$" id.subfunc = 1 id.callname = "func__title" @@ -570,7 +570,7 @@ id.hr_syntax = "_TITLE$" regid clearid -id.n = qb64prefix$ + "MapUnicode" +id.n = "_MapUnicode" id.subfunc = 2 id.callname = "sub__mapunicode" id.args = 2 @@ -580,7 +580,7 @@ id.hr_syntax = "_MAPUNICODE unicode& TO asciiCode%" regid clearid -id.n = qb64prefix$ + "MapUnicode" +id.n = "_MapUnicode" id.subfunc = 1 id.callname = "func__mapunicode" id.args = 1 @@ -590,7 +590,7 @@ id.hr_syntax = "_MAPUNICODE(asciiCode%)" regid clearid -id.n = qb64prefix$ + "KeyDown" +id.n = "_KeyDown" id.subfunc = 1 id.callname = "func__keydown" id.args = 1 @@ -600,7 +600,7 @@ id.hr_syntax = "_KEYDOWN(code&)" regid clearid -id.n = qb64prefix$ + "KeyHit" +id.n = "_KeyHit" id.subfunc = 1 id.callname = "func__keyhit" id.ret = LONGTYPE - ISPOINTER @@ -608,7 +608,7 @@ id.hr_syntax = "_KEYHIT" regid clearid -id.n = qb64prefix$ + "WindowHandle" +id.n = "_WindowHandle" id.subfunc = 1 id.callname = "func__handle" id.ret = INTEGER64TYPE - ISPOINTER @@ -626,7 +626,7 @@ id.hr_syntax = "FILES fileSpec$" regid clearid -id.n = qb64prefix$ + "Files" +id.n = "_Files" id.musthave = "$" id.subfunc = 1 id.callname = "func__files" @@ -638,7 +638,7 @@ id.hr_syntax = "_FILES$([fileSpec$])" regid clearid -id.n = qb64prefix$ + "FullPath" +id.n = "_FullPath" id.musthave = "$" id.subfunc = 1 id.callname = "func__fullpath" @@ -649,7 +649,7 @@ id.hr_syntax = "_FULLPATH$(pathName$)" regid clearid -id.n = qb64prefix$ + "PrintImage": id.Dependency = DEPENDENCY_PRINTER +id.n = "_PrintImage": id.Dependency = DEPENDENCY_PRINTER id.subfunc = 2 id.callname = "sub__printimage" id.args = 1 @@ -662,7 +662,7 @@ regid 'remote desktop clearid -id.n = qb64prefix$ + "ScreenClick" +id.n = "_ScreenClick" id.subfunc = 2 id.callname = "sub__screenclick" id.args = 3 @@ -672,7 +672,7 @@ id.hr_syntax = "_SCREENCLICK x, y[, button%]" regid clearid -id.n = qb64prefix$ + "ScreenPrint" +id.n = "_ScreenPrint" id.subfunc = 2 id.callname = "sub__screenprint" id.args = 1 @@ -681,7 +681,7 @@ id.hr_syntax = "_SCREENPRINT text$" regid clearid -id.n = qb64prefix$ + "ScreenImage": id.Dependency = DEPENDENCY_SCREENIMAGE +id.n = "_ScreenImage": id.Dependency = DEPENDENCY_SCREENIMAGE id.subfunc = 1 id.callname = "func__screenimage" id.args = 4 @@ -716,7 +716,7 @@ id.hr_syntax = "UNLOCK #fileNumber%, record& or UNLOCK #fileNumber% firstRecord& regid clearid -id.n = qb64prefix$ + "FreeTimer" +id.n = "_FreeTimer" id.subfunc = 1 id.callname = "func__freetimer" id.ret = LONGTYPE - ISPOINTER @@ -734,7 +734,7 @@ id.hr_syntax = "TIMER[(number%)] {On|Off|Stop|Free}" regid clearid -id.n = qb64prefix$ + "FullScreen" +id.n = "_FullScreen" id.subfunc = 2 id.callname = "sub__fullscreen" id.args = 1 @@ -744,7 +744,7 @@ id.hr_syntax = "_FULLSCREEN [{_Off|_Stretch|_SquarePixels|Off}][,{_Smooth}]" regid clearid -id.n = qb64prefix$ + "AllowFullScreen" +id.n = "_AllowFullScreen" id.subfunc = 2 id.callname = "sub__allowfullscreen" id.args = 2 @@ -754,7 +754,7 @@ id.hr_syntax = "_ALLOWFULLSCREEN [{_Stretch|_SquarePixels|_Off|_All|Off}][,{_Smo regid clearid -id.n = qb64prefix$ + "FullScreen" +id.n = "_FullScreen" id.subfunc = 1 id.callname = "func__fullscreen" id.ret = LONGTYPE - ISPOINTER @@ -762,7 +762,7 @@ id.hr_syntax = "_FULLSCREEN" regid clearid -id.n = qb64prefix$ + "Smooth" +id.n = "_Smooth" id.subfunc = 1 id.callname = "func__fullscreensmooth" id.ret = LONGTYPE - ISPOINTER @@ -770,7 +770,7 @@ id.hr_syntax = "_SMOOTH" regid clearid -id.n = qb64prefix$ + "WindowHasFocus" +id.n = "_WindowHasFocus" id.subfunc = 1 id.callname = "func__hasfocus" id.ret = LONGTYPE - ISPOINTER @@ -778,7 +778,7 @@ id.hr_syntax = "_WINDOWHASFOCUS" regid clearid -id.n = qb64prefix$ + "Clipboard" +id.n = "_Clipboard" id.musthave = "$" id.subfunc = 2 id.callname = "sub__clipboard" @@ -789,7 +789,7 @@ id.hr_syntax = "_CLIPBOARD$ = text$" regid clearid -id.n = qb64prefix$ + "Clipboard" +id.n = "_Clipboard" id.musthave = "$" id.subfunc = 1 id.callname = "func__clipboard" @@ -798,7 +798,7 @@ id.hr_syntax = "_CLIPBOARD$" regid clearid -id.n = qb64prefix$ + "ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE +id.n = "_ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE id.subfunc = 1 id.callname = "func__clipboardimage" id.ret = LONGTYPE - ISPOINTER @@ -806,7 +806,7 @@ id.hr_syntax = "_CLIPBOARDIMAGE" regid clearid -id.n = qb64prefix$ + "ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE +id.n = "_ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE id.subfunc = 2 id.callname = "sub__clipboardimage" id.args = 1 @@ -816,7 +816,7 @@ id.hr_syntax = "_CLIPBOARDIMAGE = existingImageHandle&" regid clearid -id.n = qb64prefix$ + "Exit" +id.n = "_Exit" id.subfunc = 1 id.callname = "func__exit" id.ret = LONGTYPE - ISPOINTER @@ -824,7 +824,7 @@ id.hr_syntax = "_EXIT" regid clearid -id.n = qb64prefix$ + "OpenHost": id.Dependency = DEPENDENCY_SOCKETS +id.n = "_OpenHost": id.Dependency = DEPENDENCY_SOCKETS id.subfunc = 1 id.callname = "func__openhost" id.args = 1 @@ -834,7 +834,7 @@ id.hr_syntax = "_OPENHOST(" + CHR$(34) + "TCP/IP:portNumber" + CHR$(34) + ")" regid clearid -id.n = qb64prefix$ + "Connected" +id.n = "_Connected" id.subfunc = 1 id.callname = "func__connected" id.args = 1 @@ -844,7 +844,7 @@ id.hr_syntax = "_CONNECTED(connectionHandle&)" regid clearid -id.n = qb64prefix$ + "ConnectionAddress" +id.n = "_ConnectionAddress" id.mayhave = "$" id.subfunc = 1 id.callname = "func__connectionaddress" @@ -855,7 +855,7 @@ id.hr_syntax = "_CONNECTIONADDRESS(connectionHandle&)" regid clearid -id.n = qb64prefix$ + "OpenConnection" +id.n = "_OpenConnection" id.subfunc = 1 id.callname = "func__openconnection" id.args = 1 @@ -865,7 +865,7 @@ id.hr_syntax = "_OPENCONNECTION(hostHandle)" regid clearid -id.n = qb64prefix$ + "OpenClient": id.Dependency = DEPENDENCY_SOCKETS +id.n = "_OpenClient": id.Dependency = DEPENDENCY_SOCKETS id.subfunc = 1 id.callname = "func__openclient" id.args = 1 @@ -876,7 +876,7 @@ regid clearid -id.n = qb64prefix$ + "EnvironCount" +id.n = "_EnvironCount" id.subfunc = 1 id.callname = "func__environcount" id.ret = LONGTYPE - ISPOINTER @@ -904,7 +904,7 @@ id.hr_syntax = "ENVIRON stringExpression$" regid clearid -id.n = qb64prefix$ + "ErrorLine" +id.n = "_ErrorLine" id.subfunc = 1 id.callname = "func__errorline" id.ret = LONGTYPE - ISPOINTER @@ -912,7 +912,7 @@ id.hr_syntax = "_ERRORLINE" regid clearid -id.n = qb64prefix$ + "InclErrorLine" +id.n = "_InclErrorLine" id.subfunc = 1 id.callname = "func__inclerrorline" id.ret = LONGTYPE - ISPOINTER @@ -920,7 +920,7 @@ id.hr_syntax = "_INCLERRORLINE" regid clearid -id.n = qb64prefix$ + "ErrorMessage" +id.n = "_ErrorMessage" id.musthave = "$" id.subfunc = 1 id.callname = "func__errormessage" @@ -932,7 +932,7 @@ id.hr_syntax = "_ERRORMESSAGE$ or _ERRORMESSAGE$(errorCode%)" regid clearid -id.n = qb64prefix$ + "Assert" +id.n = "_Assert" id.subfunc = 2 id.callname = "sub__assert" id.args = 2 @@ -942,21 +942,21 @@ id.hr_syntax = "_ASSERT condition[, errorMessage$]" regid clearid -id.n = qb64prefix$ + "Display" +id.n = "_Display" id.subfunc = 2 id.callname = "sub__display" id.hr_syntax = "_DISPLAY" regid clearid -id.n = qb64prefix$ + "AutoDisplay" +id.n = "_AutoDisplay" id.subfunc = 2 id.callname = "sub__autodisplay" id.hr_syntax = "_AUTODISPLAY" regid clearid -id.n = qb64prefix$ + "Limit" +id.n = "_Limit" id.subfunc = 2 id.callname = "sub__limit" id.args = 1 @@ -965,7 +965,7 @@ id.hr_syntax = "_LIMIT framesPerSecond!" regid clearid -id.n = qb64prefix$ + "FPS" +id.n = "_FPS" id.subfunc = 2 id.callname = "sub__fps" id.args = 1 @@ -975,7 +975,7 @@ id.hr_syntax = "_FPS fps! or _FPS _Auto" regid clearid -id.n = qb64prefix$ + "Delay" +id.n = "_Delay" id.subfunc = 2 id.callname = "sub__delay" id.args = 1 @@ -984,7 +984,7 @@ id.hr_syntax = "_DELAY seconds!" regid clearid -id.n = qb64prefix$ + "Icon": id.Dependency = DEPENDENCY_ICON +id.n = "_Icon": id.Dependency = DEPENDENCY_ICON id.subfunc = 2 id.callname = "sub__icon" id.args = 2 @@ -994,7 +994,7 @@ id.hr_syntax = "_ICON [mainImageHandle&[, smallImageHandle&]]" regid clearid -id.n = qb64prefix$ + "Title" +id.n = "_Title" id.subfunc = 2 id.callname = "sub__title" id.args = 1 @@ -1003,7 +1003,7 @@ id.hr_syntax = "_TITLE text$" regid clearid -id.n = qb64prefix$ + "Echo" +id.n = "_Echo" id.subfunc = 2 id.callname = "sub__echo" id.args = 1 @@ -1012,7 +1012,7 @@ id.hr_syntax = "_ECHO text$" regid clearid -id.n = qb64prefix$ + "ReadFile" +id.n = "_ReadFile" id.musthave = "$" id.subfunc = 1 id.callname = "func__readfile" @@ -1023,7 +1023,7 @@ id.hr_syntax = "_READFILE$(fileSpec$)" regid clearid -id.n = qb64prefix$ + "WriteFile" +id.n = "_WriteFile" id.subfunc = 2 id.callname = "sub__writefile" id.args = 2 @@ -1032,7 +1032,7 @@ id.hr_syntax = "_WRITEFILE fileSpec$, contents$" regid clearid -id.n = qb64prefix$ + "AcceptFileDrop" +id.n = "_AcceptFileDrop" id.subfunc = 2 id.callname = "sub__filedrop" id.args = 1 @@ -1042,7 +1042,7 @@ id.hr_syntax = "_ACCEPTFILEDROP [{On|Off}]" regid clearid -id.n = qb64prefix$ + "AcceptFileDrop" +id.n = "_AcceptFileDrop" id.subfunc = 1 id.callname = "func__filedrop" id.ret = LONGTYPE - ISPOINTER @@ -1050,14 +1050,14 @@ id.hr_syntax = "_ACCEPTFILEDROP" regid clearid -id.n = qb64prefix$ + "FinishDrop" +id.n = "_FinishDrop" id.subfunc = 2 id.callname = "sub__finishdrop" id.hr_syntax = "_FINISHDROP" regid clearid -id.n = qb64prefix$ + "TotalDroppedFiles" +id.n = "_TotalDroppedFiles" id.subfunc = 1 id.callname = "func__totaldroppedfiles" id.ret = LONGTYPE - ISPOINTER @@ -1065,7 +1065,7 @@ id.hr_syntax = "_TOTALDROPPEDFILES" regid clearid -id.n = qb64prefix$ + "DroppedFile" +id.n = "_DroppedFile" id.mayhave = "$" id.subfunc = 1 id.callname = "func__droppedfile" @@ -1089,7 +1089,7 @@ regid 'IMAGE CREATION/FREEING clearid -id.n = qb64prefix$ + "NewImage" +id.n = "_NewImage" id.subfunc = 1 id.callname = "func__newimage" id.args = 3 @@ -1100,7 +1100,7 @@ id.hr_syntax = "_NEWIMAGE(width&, height&, mode)" regid clearid -id.n = qb64prefix$ + "LoadImage" +id.n = "_LoadImage" id.Dependency = DEPENDENCY_IMAGE_CODEC id.subfunc = 1 id.callname = "func__loadimage" @@ -1112,7 +1112,7 @@ id.hr_syntax = "_LOADIMAGE(fileName$[, [mode&][, requirements$]])" regid clearid -id.n = qb64prefix$ + "FreeImage" +id.n = "_FreeImage" id.subfunc = 2 id.callname = "sub__freeimage" id.args = 1 @@ -1122,7 +1122,7 @@ id.hr_syntax = "_FREEIMAGE handle&" regid clearid -id.n = qb64prefix$ + "CopyImage" +id.n = "_CopyImage" id.subfunc = 1 id.callname = "func__copyimage" id.args = 2 @@ -1133,7 +1133,7 @@ id.hr_syntax = "_COPYIMAGE(imageHandle&[, mode])" regid clearid -id.n = qb64prefix$ + "SaveImage" +id.n = "_SaveImage" id.Dependency = DEPENDENCY_IMAGE_CODEC id.subfunc = 2 id.callname = "sub__saveimage" @@ -1146,7 +1146,7 @@ regid 'IMAGE SELECTION clearid -id.n = qb64prefix$ + "Source" +id.n = "_Source" id.subfunc = 2 id.callname = "sub__source" id.args = 1 @@ -1156,7 +1156,7 @@ id.hr_syntax = "_SOURCE handle&" regid clearid -id.n = qb64prefix$ + "Dest" +id.n = "_Dest" id.subfunc = 2 id.callname = "sub__dest" id.args = 1 @@ -1166,7 +1166,7 @@ id.hr_syntax = "_DEST imageHandle&" regid clearid -id.n = qb64prefix$ + "Source" +id.n = "_Source" id.subfunc = 1 id.callname = "func__source" id.ret = LONGTYPE - ISPOINTER @@ -1174,7 +1174,7 @@ id.hr_syntax = "_SOURCE" regid clearid -id.n = qb64prefix$ + "Dest" +id.n = "_Dest" id.subfunc = 1 id.callname = "func__dest" id.ret = LONGTYPE - ISPOINTER @@ -1182,7 +1182,7 @@ id.hr_syntax = "_DEST" regid clearid -id.n = qb64prefix$ + "Display" +id.n = "_Display" id.subfunc = 1 id.callname = "func__display" id.ret = LONGTYPE - ISPOINTER @@ -1192,7 +1192,7 @@ regid 'IMAGE SETTINGS clearid -id.n = qb64prefix$ + "Blend" +id.n = "_Blend" id.subfunc = 2 id.callname = "sub__blend" id.args = 1 @@ -1202,7 +1202,7 @@ id.hr_syntax = "_BLEND [imageHandle&]" regid clearid -id.n = qb64prefix$ + "DontBlend" +id.n = "_DontBlend" id.subfunc = 2 id.callname = "sub__dontblend" id.args = 1 @@ -1212,7 +1212,7 @@ id.hr_syntax = "_DONTBLEND [imageHandle&]" regid clearid -id.n = qb64prefix$ + "ClearColor" +id.n = "_ClearColor" id.subfunc = 2 id.callname = "sub__clearcolor" id.args = 2 @@ -1224,7 +1224,7 @@ regid 'USING/CHANGING A SURFACE clearid -id.n = qb64prefix$ + "PutImage" +id.n = "_PutImage" id.subfunc = 2 id.callname = "sub__putimage" id.args = 10 @@ -1234,7 +1234,7 @@ id.hr_syntax = "_PUTIMAGE [STEP] [(dx1, dy1)-[STEP][(dx2, dy2)]][, sourceHandle& regid clearid -id.n = qb64prefix$ + "MapTriangle" +id.n = "_MapTriangle" id.subfunc = 2 id.callname = "sub__maptriangle" id.args = 19 @@ -1244,7 +1244,7 @@ id.hr_syntax = "_MAPTRIANGLE [{_SEAMLESS}] (sx1, sy1)-(sx2, sy2)-(sx3, sy3), sou regid clearid -id.n = qb64prefix$ + "DepthBuffer" +id.n = "_DepthBuffer" id.subfunc = 2 id.callname = "sub__depthbuffer" id.args = 2 @@ -1254,7 +1254,7 @@ id.hr_syntax = "_DEPTHBUFFER {On|Off|Lock|_Clear}[,handle&]" regid clearid -id.n = qb64prefix$ + "SetAlpha" +id.n = "_SetAlpha" id.subfunc = 2 id.callname = "sub__setalpha" id.args = 4 @@ -1266,7 +1266,7 @@ regid 'IMAGE INFO clearid -id.n = qb64prefix$ + "Width" +id.n = "_Width" id.subfunc = 1 id.callname = "func__width" id.args = 1 @@ -1277,7 +1277,7 @@ id.hr_syntax = "_WIDTH(imageHandle&)" regid clearid -id.n = qb64prefix$ + "Height" +id.n = "_Height" id.subfunc = 1 id.callname = "func__height" id.args = 1 @@ -1288,7 +1288,7 @@ id.hr_syntax = "_HEIGHT(imageHandle&)" regid clearid -id.n = qb64prefix$ + "PixelSize" +id.n = "_PixelSize" id.subfunc = 1 id.callname = "func__pixelsize" id.args = 1 @@ -1299,7 +1299,7 @@ id.hr_syntax = "_PIXELSIZE[(imageHandle&)]" regid clearid -id.n = qb64prefix$ + "ClearColor" +id.n = "_ClearColor" id.subfunc = 1 id.callname = "func__clearcolor" id.args = 1 @@ -1310,7 +1310,7 @@ id.hr_syntax = "_CLEARCOLOR[(sourceHandle&)]" regid clearid -id.n = qb64prefix$ + "Blend" +id.n = "_Blend" id.subfunc = 1 id.callname = "func__blend" id.args = 1 @@ -1321,7 +1321,7 @@ id.hr_syntax = "_BLEND[(imageHandle&)]" regid clearid -id.n = qb64prefix$ + "DefaultColor" +id.n = "_DefaultColor" id.subfunc = 1 id.callname = "func__defaultcolor" id.args = 1 @@ -1332,7 +1332,7 @@ id.hr_syntax = "_DEFAULTCOLOR[(imageHandle&)]" regid clearid -id.n = qb64prefix$ + "BackgroundColor" +id.n = "_BackgroundColor" id.subfunc = 1 id.callname = "func__backgroundcolor" id.args = 1 @@ -1345,7 +1345,7 @@ regid '256 COLOR PALETTES clearid -id.n = qb64prefix$ + "PaletteColor" +id.n = "_PaletteColor" id.subfunc = 1 id.callname = "func__palettecolor" id.args = 2 @@ -1356,7 +1356,7 @@ id.hr_syntax = "_PALETTECOLOR(attributeNumber%, imgHandle&)" regid clearid -id.n = qb64prefix$ + "PaletteColor" +id.n = "_PaletteColor" id.subfunc = 2 id.callname = "sub__palettecolor" id.args = 3 @@ -1366,7 +1366,7 @@ id.hr_syntax = "_PALETTECOLOR attribute%, newColor&[, imgHandle&]" regid clearid -id.n = qb64prefix$ + "CopyPalette" +id.n = "_CopyPalette" id.subfunc = 2 id.callname = "sub__copypalette" id.args = 2 @@ -1378,7 +1378,7 @@ regid 'FONT SUPPORT clearid -id.n = qb64prefix$ + "LoadFont": id.Dependency = DEPENDENCY_LOADFONT +id.n = "_LoadFont": id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 1 id.callname = "func__loadfont" id.args = 4 @@ -1389,7 +1389,7 @@ id.hr_syntax = "_LOADFONT(fileName$, size&[, " + CHR$(34) + "{MONOSPACE|, UNICOD regid clearid -id.n = qb64prefix$ + "Font" +id.n = "_Font" id.subfunc = 2 id.callname = "sub__font" id.args = 2 @@ -1399,7 +1399,7 @@ id.hr_syntax = "_FONT fontHandle&[, imageHandle&]" regid clearid -id.n = qb64prefix$ + "FontWidth" +id.n = "_FontWidth" id.subfunc = 1 id.callname = "func__fontwidth" id.args = 1 @@ -1410,7 +1410,7 @@ id.hr_syntax = "_FONTWIDTH or _FONTWIDTH(fontHandle&)" regid clearid -id.n = qb64prefix$ + "FontHeight" +id.n = "_FontHeight" id.subfunc = 1 id.callname = "func__fontheight" id.args = 1 @@ -1421,7 +1421,7 @@ id.hr_syntax = "_FONTHEIGHT or _FONTHEIGHT(fontHandle&)" regid clearid -id.n = qb64prefix$ + "Font" +id.n = "_Font" id.subfunc = 1 id.callname = "func__font" id.args = 1 @@ -1432,7 +1432,7 @@ id.hr_syntax = "_FONT[(imageHandle&)]" regid clearid -id.n = qb64prefix$ + "Md5" +id.n = "_Md5" id.Dependency=DEPENDENCY_LOADFONT id.musthave = "$" id.subfunc = 1 @@ -1444,7 +1444,7 @@ id.hr_syntax = "_MD5$(dataString$)" regid clearid -id.n = qb64prefix$ + "PrintString" +id.n = "_PrintString" id.subfunc = 2 id.callname = "sub__printstring" id.args = 4 @@ -1454,7 +1454,7 @@ id.hr_syntax = "_PRINTSTRING(x, y), text$[, imageHandle&]" regid clearid -id.n = qb64prefix$ + "PrintWidth" +id.n = "_PrintWidth" id.subfunc = 1 id.callname = "func__printwidth" id.args = 2 @@ -1465,7 +1465,7 @@ id.hr_syntax = "_PRINTWIDTH(textToPrint$[, destinationHandle&])" regid clearid -id.n = qb64prefix$ + "FreeFont" +id.n = "_FreeFont" id.subfunc = 2 id.callname = "sub__freefont" id.args = 1 @@ -1475,7 +1475,7 @@ id.hr_syntax = "_FREEFONT fontHandle&" regid clearid -id.n = qb64prefix$ + "PrintMode" +id.n = "_PrintMode" id.subfunc = 2 id.callname = "sub__printmode" id.args = 2 @@ -1485,7 +1485,7 @@ id.hr_syntax = "_PRINTMODE {_FillBackground|_KeepBackground|_OnlyBackground}[, i regid clearid -id.n = qb64prefix$ + "PrintMode" +id.n = "_PrintMode" id.subfunc = 1 id.callname = "func__printmode" id.args = 1 @@ -1497,7 +1497,7 @@ regid ' a740g: Extended Font support clearid -id.n = qb64prefix$ + "UFontHeight" +id.n = "_UFontHeight" id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 1 id.callname = "func__UFontHeight" @@ -1509,7 +1509,7 @@ id.hr_syntax = "_UFONTHEIGHT&[(fontHandle&)]" regid clearid -id.n = qb64prefix$ + "UPrintWidth" +id.n = "_UPrintWidth" id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 1 id.callname = "func__UPrintWidth" @@ -1521,7 +1521,7 @@ id.hr_syntax = "_UPRINTWIDTH&(text$[, utfEncoding&][, fontHandle&])" regid clearid -id.n = qb64prefix$ + "ULineSpacing" +id.n = "_ULineSpacing" id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 1 id.callname = "func__ULineSpacing" @@ -1533,7 +1533,7 @@ id.hr_syntax = "_ULINESPACING&[(fontHandle&)]" regid clearid -id.n = qb64prefix$ + "UPrintString" +id.n = "_UPrintString" id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 2 id.callname = "sub__UPrintString" @@ -1544,7 +1544,7 @@ id.hr_syntax = "_UPRINTSTRING (x&, y&), text$[, maxWidth&][, utfEncoding&][, fon regid clearid -id.n = qb64prefix$ + "UCharPos" +id.n = "_UCharPos" id.Dependency = DEPENDENCY_LOADFONT id.subfunc = 1 id.callname = "func__UCharPos" @@ -1558,7 +1558,7 @@ regid 'WORKING WITH COLORS clearid -id.n = qb64prefix$ + "RGBA" +id.n = "_RGBA" id.subfunc = 1 id.callname = "func__rgba" id.args = 5 @@ -1569,7 +1569,7 @@ id.hr_syntax = "_RGBA(red&, green&, blue&, alpha&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "RGB" +id.n = "_RGB" id.subfunc = 1 id.callname = "func__rgb" id.args = 4 @@ -1580,7 +1580,7 @@ id.hr_syntax = "_RGB(red&, green&, blue&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "Red" +id.n = "_Red" id.subfunc = 1 id.callname = "func__red" id.args = 2 @@ -1591,7 +1591,7 @@ id.hr_syntax = "_RED(rgbaColorIndex&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "Green" +id.n = "_Green" id.subfunc = 1 id.callname = "func__green" id.args = 2 @@ -1602,7 +1602,7 @@ id.hr_syntax = "_GREEN(rgbaColorIndex&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "Blue" +id.n = "_Blue" id.subfunc = 1 id.callname = "func__blue" id.args = 2 @@ -1613,7 +1613,7 @@ id.hr_syntax = "_BLUE(rgbaColorIndex&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "Alpha" +id.n = "_Alpha" id.subfunc = 1 id.callname = "func__alpha" id.args = 2 @@ -1624,7 +1624,7 @@ id.hr_syntax = "_ALPHA(color~&[, imageHandle&])" regid clearid -id.n = qb64prefix$ + "RGBA32" +id.n = "_RGBA32" id.subfunc = 1 id.callname = "func__rgba32" id.args = 4 @@ -1634,7 +1634,7 @@ id.hr_syntax = "_RGBA32(red&, green&, blue&, alpha&)" regid clearid -id.n = qb64prefix$ + "RGB32" +id.n = "_RGB32" id.subfunc = 1 id.callname = "func__rgb32" id.overloaded = -1 @@ -1646,7 +1646,7 @@ id.hr_syntax = "_RGB32(red&, green&, blue&[, alpha&]) or _RGB32(intensity&[, alp regid clearid -id.n = qb64prefix$ + "Red32" +id.n = "_Red32" id.subfunc = 1 id.callname = "func__red32" id.args = 1 @@ -1656,7 +1656,7 @@ id.hr_syntax = "_RED32(rgbaColor&)" regid clearid -id.n = qb64prefix$ + "Green32" +id.n = "_Green32" id.subfunc = 1 id.callname = "func__green32" id.args = 1 @@ -1666,7 +1666,7 @@ id.hr_syntax = "_GREEN32(rgbaColor&)" regid clearid -id.n = qb64prefix$ + "Blue32" +id.n = "_Blue32" id.subfunc = 1 id.callname = "func__blue32" id.args = 1 @@ -1676,7 +1676,7 @@ id.hr_syntax = "_BLUE32(rgbaColor&)" regid clearid -id.n = qb64prefix$ + "Alpha32" +id.n = "_Alpha32" id.subfunc = 1 id.callname = "func__alpha32" id.args = 1 @@ -1716,7 +1716,7 @@ regid 'QB64 MOUSE clearid -id.n = qb64prefix$ + "MouseShow" +id.n = "_MouseShow" id.subfunc = 2 id.callname = "sub__mouseshow" id.args = 1 @@ -1726,14 +1726,14 @@ id.hr_syntax = "_MOUSESHOW [cursorShape$]" regid clearid -id.n = qb64prefix$ + "MouseHide" +id.n = "_MouseHide" id.subfunc = 2 id.callname = "sub__mousehide" id.hr_syntax = "_MOUSEHIDE" regid clearid -id.n = qb64prefix$ + "MouseInput" +id.n = "_MouseInput" id.subfunc = 1 id.callname = "func__mouseinput" id.ret = LONGTYPE - ISPOINTER @@ -1744,7 +1744,7 @@ id.hr_syntax = "_MOUSEINPUT" regid clearid -id.n = qb64prefix$ + "MouseX" +id.n = "_MouseX" id.subfunc = 1 id.callname = "func__mousex" id.ret = SINGLETYPE - ISPOINTER @@ -1755,7 +1755,7 @@ id.hr_syntax = "_MOUSEX" regid clearid -id.n = qb64prefix$ + "MouseY" +id.n = "_MouseY" id.subfunc = 1 id.callname = "func__mousey" id.ret = SINGLETYPE - ISPOINTER @@ -1766,7 +1766,7 @@ id.hr_syntax = "_MOUSEY" regid clearid -id.n = qb64prefix$ + "MouseMovementX" +id.n = "_MouseMovementX" id.subfunc = 1 id.callname = "func__mousemovementx" id.ret = SINGLETYPE - ISPOINTER @@ -1777,7 +1777,7 @@ id.hr_syntax = "_MOUSEMOVEMENTX" regid clearid -id.n = qb64prefix$ + "MouseMovementY" +id.n = "_MouseMovementY" id.subfunc = 1 id.callname = "func__mousemovementy" id.ret = SINGLETYPE - ISPOINTER @@ -1788,7 +1788,7 @@ id.hr_syntax = "_MOUSEMOVEMENTY" regid clearid -id.n = qb64prefix$ + "MouseButton" +id.n = "_MouseButton" id.subfunc = 1 id.callname = "func__mousebutton" id.args = 2 @@ -1799,7 +1799,7 @@ id.hr_syntax = "_MOUSEBUTTON(buttonNumber)" regid clearid -id.n = qb64prefix$ + "MouseWheel" +id.n = "_MouseWheel" id.subfunc = 1 id.callname = "func__mousewheel" id.ret = LONGTYPE - ISPOINTER @@ -1811,7 +1811,7 @@ regid clearid -id.n = qb64prefix$ + "MousePipeOpen" +id.n = "_MousePipeOpen" id.subfunc = 1 id.callname = "func__mousepipeopen" id.ret = LONGTYPE - ISPOINTER @@ -1819,7 +1819,7 @@ id.hr_syntax = "_MOUSEPIPEOPEN" regid clearid -id.n = qb64prefix$ + "MouseInputPipe" +id.n = "_MouseInputPipe" id.subfunc = 2 id.callname = "sub__mouseinputpipe" id.args = 1 @@ -1828,7 +1828,7 @@ id.hr_syntax = "_MOUSEINPUTPIPE(context)" regid clearid -id.n = qb64prefix$ + "MousePipeClose" +id.n = "_MousePipeClose" id.subfunc = 2 id.callname = "sub__mousepipeclose" id.args = 1 @@ -1944,7 +1944,7 @@ id.hr_syntax = "SHELL(commandToRun$)" regid clearid -id.n = qb64prefix$ + "ShellHide" +id.n = "_ShellHide" id.subfunc = 1 id.callname = "func__shellhide" id.args = 1 @@ -1966,7 +1966,7 @@ id.hr_syntax = "COMMAND$[(index%)]" regid clearid -id.n = qb64prefix$ + "CommandCount" +id.n = "_CommandCount" id.subfunc = 1 id.callname = "func__commandcount" id.ret = LONGTYPE - ISPOINTER @@ -1977,7 +1977,7 @@ regid 'QB64 AUDIO clearid -id.n = qb64prefix$ + "SndRate": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndRate": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndrate" id.ret = LONGTYPE - ISPOINTER @@ -1985,7 +1985,7 @@ id.hr_syntax = "_SNDRATE" regid clearid -id.n = qb64prefix$ + "SndRaw": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndRaw": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndraw" id.args = 3 @@ -1995,7 +1995,7 @@ id.hr_syntax = "_SNDRAW leftSample[, rightSample][, pipeHandle&]" regid clearid -id.n = qb64prefix$ + "SndRawDone": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndRawDone": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndrawdone" id.args = 1 @@ -2005,7 +2005,7 @@ id.hr_syntax = "_SNDRAWDONE [pipeHandle&]" regid clearid -id.n = qb64prefix$ + "SndOpenRaw": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndOpenRaw": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndopenraw" id.ret = LONGTYPE - ISPOINTER @@ -2013,7 +2013,7 @@ id.hr_syntax = "_SNDOPENRAW" regid clearid -id.n = qb64prefix$ + "SndRawLen": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndRawLen": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndrawlen" id.args = 1 @@ -2024,7 +2024,7 @@ id.hr_syntax = "_SNDRAWLEN [pipeHandle&]" regid clearid -id.n = qb64prefix$ + "SndLen": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndLen": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndlen" id.args = 1 @@ -2034,7 +2034,7 @@ id.hr_syntax = "_SNDLEN(handle&)" regid clearid -id.n = qb64prefix$ + "SndPaused": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPaused": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndpaused" id.args = 1 @@ -2044,7 +2044,7 @@ id.hr_syntax = "_SNDPAUSED(handle&)" regid clearid -id.n = qb64prefix$ + "SndPlayFile": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPlayFile": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndplayfile" id.args = 3 @@ -2054,7 +2054,7 @@ id.hr_syntax = "_SNDPLAYFILE fileName$[, , volume!]" regid clearid -id.n = qb64prefix$ + "SndPlayCopy": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPlayCopy": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndplaycopy" id.args = 5 @@ -2064,7 +2064,7 @@ id.hr_syntax = "_SNDPLAYCOPY handle&[, volume!][, x!][, y!][, z!]" regid clearid -id.n = qb64prefix$ + "SndStop": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndStop": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndstop" id.args = 1 @@ -2073,7 +2073,7 @@ id.hr_syntax = "_SNDSTOP handle&" regid clearid -id.n = qb64prefix$ + "SndLoop": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndLoop": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndloop" id.args = 1 @@ -2082,7 +2082,7 @@ id.hr_syntax = "_SNDLOOP handle&" regid clearid -id.n = qb64prefix$ + "SndLimit": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndLimit": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndlimit" id.args = 2 @@ -2091,7 +2091,7 @@ id.hr_syntax = "_SNDLIMIT handle&, numberOfSeconds!" regid clearid -id.n = qb64prefix$ + "SndOpen": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndOpen": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndopen" id.args = 2 @@ -2102,7 +2102,7 @@ id.hr_syntax = "_SNDOPEN(fileName$[, capabilities$])" regid clearid -id.n = qb64prefix$ + "SndSetPos": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndSetPos": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndsetpos" id.args = 2 @@ -2111,7 +2111,7 @@ id.hr_syntax = "_SNDSETPOS handle&, position!" regid clearid -id.n = qb64prefix$ + "SndGetPos": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndGetPos": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndgetpos" id.args = 1 @@ -2121,7 +2121,7 @@ id.hr_syntax = "_SNDGETPOS(handle&)" regid clearid -id.n = qb64prefix$ + "SndPlaying": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPlaying": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndplaying" id.args = 1 @@ -2131,7 +2131,7 @@ id.hr_syntax = "_SNDPLAYING(handle&)" regid clearid -id.n = qb64prefix$ + "SndPause": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPause": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndpause" id.args = 1 @@ -2140,7 +2140,7 @@ id.hr_syntax = "_SNDPAUSE handle&" regid clearid -id.n = qb64prefix$ + "SndBal": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndBal": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndbal" id.args = 5 @@ -2150,7 +2150,7 @@ id.hr_syntax = "_SNDBAL handle&[, x!][, y!][, z!][, channel&]" regid clearid -id.n = qb64prefix$ + "SndVol": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndVol": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndvol" id.args = 2 @@ -2159,7 +2159,7 @@ id.hr_syntax = "_SNDVOL handle&, volume!" regid clearid -id.n = qb64prefix$ + "SndPlay": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndPlay": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndplay" id.args = 1 @@ -2168,7 +2168,7 @@ id.hr_syntax = "_SNDPLAY handle&" regid clearid -id.n = qb64prefix$ + "SndCopy": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndCopy": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndcopy" id.args = 1 @@ -2178,7 +2178,7 @@ id.hr_syntax = "_SNDCOPY(handle&)" regid clearid -id.n = qb64prefix$ + "SndClose": id.Dependency = DEPENDENCY_MINIAUDIO +id.n = "_SndClose": id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__sndclose" id.args = 1 @@ -2187,7 +2187,7 @@ id.hr_syntax = "_SNDCLOSE handle&" regid clearid -id.n = qb64prefix$ + "SndNew" +id.n = "_SndNew" id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 1 id.callname = "func__sndnew" @@ -2198,7 +2198,7 @@ id.hr_syntax = "_SNDNEW(frames&, channels&, bits&)" regid clearid -id.n = qb64prefix$ + "MIDISoundBank" +id.n = "_MIDISoundBank" id.Dependency = DEPENDENCY_MINIAUDIO id.subfunc = 2 id.callname = "sub__midisoundbank" @@ -2387,7 +2387,7 @@ id.hr_syntax = "UBOUND(arrayName[, dimension%])" regid clearid -id.n = qb64prefix$ + "Bin" +id.n = "_Bin" id.musthave = "$" id.subfunc = 1 id.args = 1 @@ -2472,7 +2472,7 @@ id.hr_syntax = "CSNG(expression)" regid clearid -id.n = qb64prefix$ + "Round" +id.n = "_Round" id.subfunc = 1 id.args = 1 id.arg = MKL$(-1) @@ -2755,7 +2755,7 @@ id.ret = STRINGTYPE - ISPOINTER id.hr_syntax = "MKD$(doublePrecisionVariableOrLiteral#)" regid clearid -id.n = qb64prefix$ + "MK" +id.n = "_MK" id.musthave = "$" id.subfunc = 1 id.callname = "" @@ -2821,7 +2821,7 @@ id.ret = DOUBLETYPE - ISPOINTER id.hr_syntax = "CVD(stringData$)" regid clearid -id.n = qb64prefix$ + "CV" +id.n = "_CV" id.subfunc = 1 id.callname = "" id.args = 2 @@ -2864,7 +2864,7 @@ id.hr_syntax = "INSTR([start%,] baseString$, searchString$)" regid clearid -id.n = qb64prefix$ + "InStrRev" +id.n = "_InStrRev" id.subfunc = 1 id.callname = "func__instrrev" id.args = 3 @@ -2949,7 +2949,7 @@ id.hr_syntax = "VARPTR(variable_name[(reference_index%)])" regid clearid -id.n = qb64prefix$ + "Offset" +id.n = "_Offset" id.subfunc = 1 id.callname = "" id.args = 1 @@ -3377,7 +3377,7 @@ id.hr_syntax = "RTRIM$(text$)" regid clearid -id.n = qb64prefix$ + "Trim" +id.n = "_Trim" id.musthave = "$" id.subfunc = 1 id.callname = "qbs__trim" @@ -3417,7 +3417,7 @@ regid 'Get Current Working Directory clearid -id.n = qb64prefix$ + "CWD" +id.n = "_CWD" id.musthave = "$" id.subfunc = 1 id.callname = "func__cwd" @@ -3427,7 +3427,7 @@ regid 'Get the directory the program was started from (before the currenct directory is automatically changed to the executables directory) clearid -id.n = qb64prefix$ + "StartDir" +id.n = "_StartDir" id.musthave = "$" id.subfunc = 1 id.callname = "func__startdir" @@ -3437,7 +3437,7 @@ regid 'Return a path that best represents the context provided e.g. _DIR$("DESKTOP") clearid -id.n = qb64prefix$ + "Dir" +id.n = "_Dir" id.musthave = "$" id.subfunc = 1 id.callname = "func__dir" @@ -3449,7 +3449,7 @@ regid 'Return the name of the included file in which the last error occurred clearid -id.n = qb64prefix$ + "InclErrorFile" +id.n = "_InclErrorFile" id.musthave = "$" id.subfunc = 1 id.callname = "func__inclerrorfile" @@ -3458,7 +3458,7 @@ id.hr_syntax = "_INCLERRORFILE$" regid clearid -id.n = qb64prefix$ + "KeyClear" +id.n = "_KeyClear" id.subfunc = 2 id.args = 1 id.arg = MKL$(LONGTYPE - ISPOINTER) @@ -3468,7 +3468,7 @@ id.hr_syntax = "_KEYCLEAR buffer&" regid clearid -id.n = qb64prefix$ + "D2R" +id.n = "_D2R" id.subfunc = 1 id.callname = "func_deg2rad" id.args = 1 @@ -3478,7 +3478,7 @@ id.hr_syntax = "_D2R(angleInDegrees!)" regid clearid -id.n = qb64prefix$ + "D2G" +id.n = "_D2G" id.subfunc = 1 id.callname = "func_deg2grad" id.args = 1 @@ -3488,7 +3488,7 @@ id.hr_syntax = "_D2G(angleInDegrees!)" regid clearid -id.n = qb64prefix$ + "R2D" +id.n = "_R2D" id.subfunc = 1 id.callname = "func_rad2deg" id.args = 1 @@ -3498,7 +3498,7 @@ id.hr_syntax = "_R2D(angleInRadians!)" regid clearid -id.n = qb64prefix$ + "R2G" +id.n = "_R2G" id.subfunc = 1 id.callname = "func_rad2grad" id.args = 1 @@ -3508,7 +3508,7 @@ id.hr_syntax = "_R2G(angleInRadians!)" regid clearid -id.n = qb64prefix$ + "G2D" +id.n = "_G2D" id.subfunc = 1 id.callname = "func_grad2deg" id.args = 1 @@ -3518,7 +3518,7 @@ id.hr_syntax = "_G2D(gradient!)" regid clearid -id.n = qb64prefix$ + "G2R" +id.n = "_G2R" id.subfunc = 1 id.callname = "func_grad2rad" id.args = 1 @@ -3528,7 +3528,7 @@ id.hr_syntax = "_G2R(gradient!)" regid clearid 'Clear the old id info so we set the slate for a new one -id.n = qb64prefix$ + "Atan2" 'The name of our new one +id.n = "_Atan2" 'The name of our new one id.subfunc = 1 'And this is a function id.callname = "std::atan2" 'The C name of the function id.args = 2 'It takes 2 parameters to work @@ -3538,7 +3538,7 @@ id.hr_syntax = "_ATAN2(y, x)" regid 'and we're finished with ID registration clearid 'Clear the old id info so we set the slate for a new one -id.n = qb64prefix$ + "Hypot" 'The name of our new one +id.n = "_Hypot" 'The name of our new one id.subfunc = 1 'And this is a function id.callname = "std::hypot" 'The C name of the function id.args = 2 'It takes 2 parameters to work @@ -3548,7 +3548,7 @@ id.hr_syntax = "_HYPOT(x, y)" regid 'and we're finished with ID registration clearid -id.n = qb64prefix$ + "Asin" +id.n = "_Asin" id.subfunc = 1 id.callname = "std::asin" id.args = 1 @@ -3558,7 +3558,7 @@ id.hr_syntax = "_ASIN(sine_value!)" regid clearid -id.n = qb64prefix$ + "Acos" +id.n = "_Acos" id.subfunc = 1 id.callname = "std::acos" id.args = 1 @@ -3568,7 +3568,7 @@ id.hr_syntax = "_ACOS(cosine_value!)" regid clearid -id.n = qb64prefix$ + "Sinh" +id.n = "_Sinh" id.subfunc = 1 id.callname = "std::sinh" id.args = 1 @@ -3578,7 +3578,7 @@ id.hr_syntax = "_SINH(value)" regid clearid -id.n = qb64prefix$ + "Cosh" +id.n = "_Cosh" id.subfunc = 1 id.callname = "std::cosh" id.args = 1 @@ -3588,7 +3588,7 @@ id.hr_syntax = "_COSH(value)" regid clearid -id.n = qb64prefix$ + "Tanh" +id.n = "_Tanh" id.subfunc = 1 id.callname = "std::tanh" id.args = 1 @@ -3598,7 +3598,7 @@ id.hr_syntax = "_TANH(value)" regid clearid -id.n = qb64prefix$ + "Asinh" +id.n = "_Asinh" id.subfunc = 1 id.callname = "std::asinh" id.args = 1 @@ -3608,7 +3608,7 @@ id.hr_syntax = "_ASINH(value)" regid clearid -id.n = qb64prefix$ + "Acosh" +id.n = "_Acosh" id.subfunc = 1 id.callname = "std::acosh" id.args = 1 @@ -3618,7 +3618,7 @@ id.hr_syntax = "_ACOSH(value)" regid clearid -id.n = qb64prefix$ + "Atanh" +id.n = "_Atanh" id.subfunc = 1 id.callname = "std::atanh" id.args = 1 @@ -3628,7 +3628,7 @@ id.hr_syntax = "_ATANH(value)" regid clearid -id.n = qb64prefix$ + "Ceil" +id.n = "_Ceil" id.subfunc = 1 id.callname = "std::ceil" id.args = 1 @@ -3638,7 +3638,7 @@ id.hr_syntax = "_CEIL(expression)" regid clearid -id.n = qb64prefix$ + "Pi" +id.n = "_Pi" id.subfunc = 1 id.callname = "func_pi" id.args = 1 @@ -3649,7 +3649,7 @@ id.hr_syntax = "_PI[(multiplier)]" regid clearid -id.n = qb64prefix$ + "DesktopHeight" +id.n = "_DesktopHeight" id.subfunc = 1 id.callname = "func_screenheight" id.args = 0 @@ -3658,7 +3658,7 @@ id.hr_syntax = "_DESKTOPHEIGHT" regid clearid -id.n = qb64prefix$ + "DesktopWidth" +id.n = "_DesktopWidth" id.subfunc = 1 id.callname = "func_screenwidth" id.args = 0 @@ -3667,21 +3667,21 @@ id.hr_syntax = "_DESKTOPWIDTH" regid clearid -id.n = qb64prefix$ + "ScreenIcon" 'name change to from _ICONIFYWINDOW to _SCREENICON to match the screenshow and screenhide +id.n = "_ScreenIcon" 'name change to from _ICONIFYWINDOW to _SCREENICON to match the screenshow and screenhide id.subfunc = 2 id.callname = "sub_screenicon" id.hr_syntax = "_SCREENICON" regid clearid -id.n = qb64prefix$ + "ScreenExists" +id.n = "_ScreenExists" id.subfunc = 1 id.callname = "func_windowexists" id.hr_syntax = "_SCREENEXISTS" regid clearid -id.n = qb64prefix$ + "ControlChr" +id.n = "_ControlChr" id.subfunc = 1 id.callname = "func__controlchr" id.args = 0 @@ -3690,7 +3690,7 @@ id.hr_syntax = "_CONTROLCHR" regid clearid -id.n = qb64prefix$ + "StriCmp" +id.n = "_StriCmp" id.subfunc = 1 id.callname = "func__str_nc_compare" id.args = 2 @@ -3700,7 +3700,7 @@ id.hr_syntax = "_STRICMP(string1$, string2$)" regid clearid -id.n = qb64prefix$ + "StrCmp" +id.n = "_StrCmp" id.subfunc = 1 id.callname = "func__str_compare" id.args = 2 @@ -3710,7 +3710,7 @@ id.hr_syntax = "_STRCMP(string1$, string2$)" regid clearid -id.n = qb64prefix$ + "Arcsec" +id.n = "_Arcsec" id.subfunc = 1 id.callname = "func_arcsec" id.args = 1 @@ -3720,7 +3720,7 @@ id.hr_syntax = "_ARCSEC(value)" regid clearid -id.n = qb64prefix$ + "Arccsc" +id.n = "_Arccsc" id.subfunc = 1 id.callname = "func_arccsc" id.args = 1 @@ -3730,7 +3730,7 @@ id.hr_syntax = "_ARCCSC(value)" regid clearid -id.n = qb64prefix$ + "Arccot" +id.n = "_Arccot" id.subfunc = 1 id.callname = "func_arccot" id.args = 1 @@ -3740,7 +3740,7 @@ id.hr_syntax = "_ARCCOT(value)" regid clearid -id.n = qb64prefix$ + "Sech" +id.n = "_Sech" id.subfunc = 1 id.callname = "func_sech" id.args = 1 @@ -3750,7 +3750,7 @@ id.hr_syntax = "_SECH(value)" regid clearid -id.n = qb64prefix$ + "Csch" +id.n = "_Csch" id.subfunc = 1 id.callname = "func_csch" id.args = 1 @@ -3760,7 +3760,7 @@ id.hr_syntax = "_CSCH(value)" regid clearid -id.n = qb64prefix$ + "Coth" +id.n = "_Coth" id.subfunc = 1 id.callname = "func_coth" id.args = 1 @@ -3770,7 +3770,7 @@ id.hr_syntax = "_COTH(value)" regid clearid -id.n = qb64prefix$ + "Sec" +id.n = "_Sec" id.subfunc = 1 id.callname = "func_sec" id.args = 1 @@ -3780,7 +3780,7 @@ id.hr_syntax = "_SEC(value)" regid clearid -id.n = qb64prefix$ + "Csc" +id.n = "_Csc" id.subfunc = 1 id.callname = "func_csc" id.args = 1 @@ -3790,7 +3790,7 @@ id.hr_syntax = "_CSC(value)" regid clearid -id.n = qb64prefix$ + "Cot" +id.n = "_Cot" id.subfunc = 1 id.callname = "func_cot" id.args = 1 @@ -3800,7 +3800,7 @@ id.hr_syntax = "_COT(value)" regid clearid -id.n = qb64prefix$ + "ScreenIcon" +id.n = "_ScreenIcon" id.subfunc = 1 id.callname = "func_screenicon" id.args = 0 @@ -3809,7 +3809,7 @@ id.hr_syntax = "_SCREENICON" regid clearid -id.n = qb64prefix$ + "AutoDisplay" +id.n = "_AutoDisplay" id.subfunc = 1 id.callname = "func__autodisplay" id.args = 0 @@ -3818,7 +3818,7 @@ id.hr_syntax = "_AUTODISPLAY" regid clearid -id.n = qb64prefix$ + "ShR" ' a740g: Changed to camel case +id.n = "_ShR" ' a740g: Changed to camel case id.subfunc = 1 id.callname = "func__shr" id.args = 2 @@ -3828,7 +3828,7 @@ id.hr_syntax = "_SHR(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "ShL" ' a740g: Changed to camel case +id.n = "_ShL" ' a740g: Changed to camel case id.subfunc = 1 id.callname = "func__shl" id.args = 2 @@ -3839,7 +3839,7 @@ regid ' a740g: ROR & ROL additions clearid -id.n = qb64prefix$ + "RoL" +id.n = "_RoL" id.subfunc = 1 id.args = 2 id.arg = MKL$(UINTEGER64TYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) ' ***overridden by function evaluatefunc*** @@ -3848,7 +3848,7 @@ id.hr_syntax = "_ROL(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "RoR" +id.n = "_RoR" id.subfunc = 1 id.args = 2 id.arg = MKL$(UINTEGER64TYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) ' ***overridden by function evaluatefunc*** @@ -3858,7 +3858,7 @@ regid ' a740g: end of ROR & ROL additions clearid -id.n = qb64prefix$ + "Adler32" +id.n = "_Adler32" id.Dependency=DEPENDENCY_ZLIB id.subfunc = 1 id.callname = "func__adler32" @@ -3869,7 +3869,7 @@ id.hr_syntax = "_ADLER32(dataString$)" regid clearid -id.n = qb64prefix$ + "Crc32" +id.n = "_Crc32" id.Dependency=DEPENDENCY_ZLIB id.subfunc = 1 id.callname = "func__crc32" @@ -3880,7 +3880,7 @@ id.hr_syntax = "_CRC32(dataString$)" regid clearid -id.n = qb64prefix$ + "Deflate" +id.n = "_Deflate" id.Dependency=DEPENDENCY_ZLIB id.musthave = "$" id.subfunc = 1 @@ -3892,7 +3892,7 @@ id.hr_syntax = "_DEFLATE$(stringToCompress$)" regid clearid -id.n = qb64prefix$ + "Inflate" +id.n = "_Inflate" id.Dependency=DEPENDENCY_ZLIB id.musthave = "$" id.subfunc = 1 @@ -3905,7 +3905,7 @@ id.hr_syntax = "_INFLATE$(stringToDecompress$[, originalSize&])" regid clearid -id.n = qb64prefix$ + "Embedded" +id.n = "_Embedded" id.Dependency=DEPENDENCY_EMBED id.musthave = "$" id.subfunc = 1 @@ -3917,7 +3917,7 @@ id.hr_syntax = "_EMBEDDED$(" + AddQuotes$("handle") + ")" regid clearid -id.n = qb64prefix$ + "CInp" +id.n = "_CInp" id.subfunc = 1 id.callname = "func__cinp" id.args = 1 @@ -3928,7 +3928,7 @@ id.hr_syntax = "_CINP" regid clearid -id.n = qb64prefix$ + "CapsLock" +id.n = "_CapsLock" id.subfunc = 1 id.callname = "func__capslock" id.args = 0 @@ -3937,7 +3937,7 @@ id.hr_syntax = "_CAPSLOCK" regid clearid -id.n = qb64prefix$ + "ScrollLock" +id.n = "_ScrollLock" id.subfunc = 1 id.callname = "func__scrolllock" id.args = 0 @@ -3946,7 +3946,7 @@ id.hr_syntax = "_SCROLLLOCK" regid clearid -id.n = qb64prefix$ + "NumLock" +id.n = "_NumLock" id.subfunc = 1 id.callname = "func__numlock" id.args = 0 @@ -3955,7 +3955,7 @@ id.hr_syntax = "_NUMLOCK" regid clearid -id.n = qb64prefix$ + "CapsLock" +id.n = "_CapsLock" id.subfunc = 2 id.callname = "sub__capslock" id.arg = MKL$(LONGTYPE - ISPOINTER) @@ -3965,7 +3965,7 @@ id.hr_syntax = "_CAPSLOCK {On|Off|_Toggle}" regid clearid -id.n = qb64prefix$ + "Scrolllock" +id.n = "_Scrolllock" id.subfunc = 2 id.callname = "sub__scrolllock" id.arg = MKL$(LONGTYPE - ISPOINTER) @@ -3975,7 +3975,7 @@ id.hr_syntax = "_SCROLLLOCK {On|Off|_Toggle}" regid clearid -id.n = qb64prefix$ + "Numlock" +id.n = "_Numlock" id.subfunc = 2 id.callname = "sub__numlock" id.arg = MKL$(LONGTYPE - ISPOINTER) @@ -3985,7 +3985,7 @@ id.hr_syntax = "_NUMLOCK {On|Off|_Toggle}" regid clearid -id.n = qb64prefix$ + "ConsoleFont" +id.n = "_ConsoleFont" id.subfunc = 2 id.callname = "sub__consolefont" id.args = 2 @@ -3994,7 +3994,7 @@ id.hr_syntax = "_CONSOLEFONT fontFile$" regid clearid -id.n = qb64prefix$ + "ConsoleCursor" +id.n = "_ConsoleCursor" id.subfunc = 2 id.callname = "sub__console_cursor" id.args = 2 @@ -4004,7 +4004,7 @@ id.hr_syntax = "_CONSOLECURSOR {_Show|_Hide}[, size%]" regid clearid -id.n = qb64prefix$ + "ConsoleInput" +id.n = "_ConsoleInput" id.subfunc = 1 id.callname = "func__getconsoleinput" id.args = 0 @@ -4013,7 +4013,7 @@ id.hr_syntax = "_CONSOLEINPUT" regid clearid -id.n = qb64prefix$ + "ReadBit" +id.n = "_ReadBit" id.subfunc = 1 id.callname = "func__readbit" id.args = 2 @@ -4023,7 +4023,7 @@ id.hr_syntax = "_READBIT(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "SetBit" +id.n = "_SetBit" id.subfunc = 1 id.callname = "func__setbit" id.args = 2 @@ -4033,7 +4033,7 @@ id.hr_syntax = "_SETBIT(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "ResetBit" +id.n = "_ResetBit" id.subfunc = 1 id.callname = "func__resetbit" id.args = 2 @@ -4043,7 +4043,7 @@ id.hr_syntax = "_RESETBIT(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "ToggleBit" +id.n = "_ToggleBit" id.subfunc = 1 id.callname = "func__togglebit" id.args = 2 @@ -4053,7 +4053,7 @@ id.hr_syntax = "_TOGGLEBIT(numericalVariable, numericalValue)" regid clearid -id.n = qb64prefix$ + "NotifyPopup" +id.n = "_NotifyPopup" id.subfunc = 2 ' 1 = function, 2 = sub id.callname = "sub__guiNotifyPopup" id.args = 3 @@ -4063,7 +4063,7 @@ id.hr_syntax = "_NOTIFYPOPUP [title$][, message$][, iconType$]" regid clearid -id.n = qb64prefix$ + "MessageBox" +id.n = "_MessageBox" id.subfunc = 2 ' 1 = function, 2 = sub id.callname = "sub__guiMessageBox" id.args = 3 @@ -4073,7 +4073,7 @@ id.hr_syntax = "_MESSAGEBOX [title$][, message$][, iconType$]" regid clearid -id.n = qb64prefix$ + "SelectFolderDialog" +id.n = "_SelectFolderDialog" id.musthave = "$" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiSelectFolderDialog" @@ -4085,7 +4085,7 @@ id.hr_syntax = "_SELECTFOLDERDIALOG$([title$][, defaultPath$])" regid clearid -id.n = qb64prefix$ + "ColorChooserDialog" +id.n = "_ColorChooserDialog" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiColorChooserDialog" id.args = 2 @@ -4096,7 +4096,7 @@ id.hr_syntax = "_COLORCHOOSERDIALOG&([title$][, defaultRGB&])" regid clearid -id.n = qb64prefix$ + "MessageBox" +id.n = "_MessageBox" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiMessageBox" id.args = 5 @@ -4107,7 +4107,7 @@ id.hr_syntax = "_MESSAGEBOX&([title$][, message$][, dialogType$][, iconType$][, regid clearid -id.n = qb64prefix$ + "InputBox" +id.n = "_InputBox" id.musthave = "$" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiInputBox" @@ -4119,7 +4119,7 @@ id.hr_syntax = "_INPUTBOX$([title$][, message$][, defaultInput$])" regid clearid -id.n = qb64prefix$ + "OpenFileDialog" +id.n = "_OpenFileDialog" id.musthave = "$" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiOpenFileDialog" @@ -4131,7 +4131,7 @@ id.hr_syntax = "_OPENFILEDIALOG$([title$][, defaultPathAndFile$][, filterPattern regid clearid -id.n = qb64prefix$ + "SaveFileDialog" +id.n = "_SaveFileDialog" id.musthave = "$" id.subfunc = 1 ' 1 = function, 2 = sub id.callname = "func__guiSaveFileDialog" diff --git a/source/utilities/const_eval.bas b/source/utilities/const_eval.bas index 12a6d148f..099f4a17a 100644 --- a/source/utilities/const_eval.bas +++ b/source/utilities/const_eval.bas @@ -684,7 +684,7 @@ FUNCTION Numeric&(exp$, state AS ParserState) state.num.typ = elementGetNumericValue(ele$, state.num.f, state.num.i, state.num.ui) Numeric& = -1 - ELSEIF ele$ = "_PI" OR (qb64prefix_set = 1 AND ele$ = "PI") THEN + ELSEIF ele$ = "_PI" THEN ele$ = getnextelement$(exp$, state.index, state.strIndex) ParseNumSetF state.num, FLOATTYPE - ISPOINTER, 3.14159265358979323846264338327950288## @@ -1121,14 +1121,6 @@ FUNCTION IsFunctionIdentifier&(ele$) IF ele$ = ConstFuncs(i).nam THEN IsFunctionIdentifier& = i EXIT FUNCTION - ELSE - IF LEFT$(ConstFuncs(i).nam, 1) = "_" AND qb64prefix_set = 1 THEN - 'try without prefix - IF ele$ = MID$(ConstFuncs(i).nam, 2) THEN - IsFunctionIdentifier& = i - EXIT FUNCTION - END IF - END IF END IF NEXT END FUNCTION diff --git a/source/utilities/type.bas b/source/utilities/type.bas index 57431f770..508d9f2ac 100644 --- a/source/utilities/type.bas +++ b/source/utilities/type.bas @@ -49,24 +49,24 @@ FUNCTION id2fulltypename$ id2fulltypename$ = a$: EXIT FUNCTION END IF IF t AND ISOFFSETINBITS THEN - IF bits > 1 THEN a$ = qb64prefix$ + "BIT * " + str2(bits) ELSE a$ = qb64prefix$ + "BIT" - IF t AND ISUNSIGNED THEN a$ = qb64prefix$ + "UNSIGNED " + a$ + IF bits > 1 THEN a$ = "_BIT * " + str2(bits) ELSE a$ = "_BIT" + IF t AND ISUNSIGNED THEN a$ = "_UNSIGNED " + a$ id2fulltypename$ = a$: EXIT FUNCTION END IF IF t AND ISFLOAT THEN IF bits = 32 THEN a$ = "SINGLE" IF bits = 64 THEN a$ = "DOUBLE" - IF bits = 256 THEN a$ = qb64prefix$ + "FLOAT" + IF bits = 256 THEN a$ = "_FLOAT" ELSE 'integer-based - IF bits = 8 THEN a$ = qb64prefix$ + "BYTE" + IF bits = 8 THEN a$ = "_BYTE" IF bits = 16 THEN a$ = "INTEGER" IF bits = 32 THEN a$ = "LONG" - IF bits = 64 THEN a$ = qb64prefix$ + "INTEGER64" - IF t AND ISUNSIGNED THEN a$ = qb64prefix$ + "UNSIGNED " + a$ + IF bits = 64 THEN a$ = "_INTEGER64" + IF t AND ISUNSIGNED THEN a$ = "_UNSIGNED " + a$ END IF IF t AND ISOFFSET THEN - a$ = qb64prefix$ + "OFFSET" - IF t AND ISUNSIGNED THEN a$ = qb64prefix$ + "UNSIGNED " + a$ + a$ = "_OFFSET" + IF t AND ISUNSIGNED THEN a$ = "_UNSIGNED " + a$ END IF id2fulltypename$ = a$ END FUNCTION @@ -118,23 +118,23 @@ FUNCTION symbol2fulltypename$ (s2$) u = 1 IF LEN(typ$) = 1 THEN Give_Error "Expected ~...": EXIT FUNCTION s$ = RIGHT$(s$, LEN(s$) - 1) - u$ = qb64prefix$ + "UNSIGNED " + u$ = "_UNSIGNED " END IF - IF s$ = "%%" THEN t$ = u$ + qb64prefix$ + "BYTE": GOTO gotsym2typ + IF s$ = "%%" THEN t$ = u$ + "_BYTE": GOTO gotsym2typ IF s$ = "%" THEN t$ = u$ + "INTEGER": GOTO gotsym2typ IF s$ = "&" THEN t$ = u$ + "LONG": GOTO gotsym2typ - IF s$ = "&&" THEN t$ = u$ + qb64prefix$ + "INTEGER64": GOTO gotsym2typ - IF s$ = "%&" THEN t$ = u$ + qb64prefix$ + "OFFSET": GOTO gotsym2typ + IF s$ = "&&" THEN t$ = u$ + "_INTEGER64": GOTO gotsym2typ + IF s$ = "%&" THEN t$ = u$ + "_OFFSET": GOTO gotsym2typ IF LEFT$(s$, 1) = "`" THEN IF LEN(s$) = 1 THEN - t$ = u$ + qb64prefix$ + "BIT * 1" + t$ = u$ + "_BIT * 1" GOTO gotsym2typ END IF n$ = RIGHT$(s$, LEN(s$) - 1) IF isuinteger(n$) = 0 THEN Give_Error "Expected number after symbol `": EXIT FUNCTION - t$ = u$ + qb64prefix$ + "BIT * " + n$ + t$ = u$ + "_BIT * " + n$ GOTO gotsym2typ END IF @@ -142,7 +142,7 @@ FUNCTION symbol2fulltypename$ (s2$) IF s$ = "!" THEN t$ = "SINGLE": GOTO gotsym2typ IF s$ = "#" THEN t$ = "DOUBLE": GOTO gotsym2typ - IF s$ = "##" THEN t$ = qb64prefix$ + "FLOAT": GOTO gotsym2typ + IF s$ = "##" THEN t$ = "_FLOAT": GOTO gotsym2typ IF s$ = "$" THEN t$ = "STRING": GOTO gotsym2typ IF LEFT$(s$, 1) = "$" THEN @@ -333,52 +333,26 @@ FUNCTION type2symbol$ (typ$) NEXT e$ = "Cannot convert type (" + typ$ + ") to symbol" - t2$ = "INTEGER": s$ = "%": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "LONG": s$ = "&": IF t$ = t2$ THEN GOTO t2sfound t2$ = "SINGLE": s$ = "!": IF t$ = t2$ THEN GOTO t2sfound t2$ = "DOUBLE": s$ = "#": IF t$ = t2$ THEN GOTO t2sfound + t2$ = "_FLOAT": s$ = "##": IF t$ = t2$ THEN GOTO t2sfound + t2$ = "_UNSIGNED _BYTE": s$ = "~%%": IF t$ = t2$ THEN GOTO t2sfound t2$ = "_BYTE": s$ = "%%": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "BYTE": s$ = "%%": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - - t2$ = "_UNSIGNED LONG": s$ = "~&": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED LONG": s$ = "~&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "_UNSIGNED INTEGER": s$ = "~%": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED INTEGER": s$ = "~%": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - - t2$ = "_UNSIGNED _BYTE": s$ = "~%%": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "_UNSIGNED BYTE": s$ = "~%%": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED _BYTE": s$ = "~%%": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED BYTE": s$ = "~%%": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - - t2$ = "_UNSIGNED _OFFSET": s$ = "~%&": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "_UNSIGNED OFFSET": s$ = "~%&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED _OFFSET": s$ = "~%&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED OFFSET": s$ = "~%&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - + t2$ = "INTEGER": s$ = "%": IF t$ = t2$ THEN GOTO t2sfound + t2$ = "_UNSIGNED LONG": s$ = "~&": IF t$ = t2$ THEN GOTO t2sfound + t2$ = "LONG": s$ = "&": IF t$ = t2$ THEN GOTO t2sfound t2$ = "_UNSIGNED _INTEGER64": s$ = "~&&": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "_UNSIGNED INTEGER64": s$ = "~&&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED _INTEGER64": s$ = "~&&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED INTEGER64": s$ = "~&&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - t2$ = "_INTEGER64": s$ = "&&": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "INTEGER64": s$ = "&&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound + t2$ = "_UNSIGNED _OFFSET": s$ = "~%&": IF t$ = t2$ THEN GOTO t2sfound t2$ = "_OFFSET": s$ = "%&": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "OFFSET": s$ = "%&": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound - - t2$ = "_FLOAT": s$ = "##": IF t$ = t2$ THEN GOTO t2sfound - t2$ = "FLOAT": s$ = "##": IF qb64prefix_set = 1 AND t$ = t2$ THEN GOTO t2sfound ' These can have a length after them, so LEFT$() is used t2$ = "STRING": s$ = "$": IF LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound t2$ = "_UNSIGNED _BIT": s$ = "~`1": IF LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound - t2$ = "_UNSIGNED BIT": s$ = "~`1": IF qb64prefix_set = 1 AND LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED _BIT": s$ = "~`1": IF qb64prefix_set = 1 AND LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound - t2$ = "UNSIGNED BIT": s$ = "~`1": IF qb64prefix_set = 1 AND LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound t2$ = "_BIT": s$ = "`1": IF LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound - t2$ = "BIT": s$ = "`1": IF qb64prefix_set = 1 AND LEFT$(t$, LEN(t2$)) = t2$ THEN GOTO t2sfound Give_Error e$: EXIT FUNCTION t2sfound: @@ -520,18 +494,18 @@ FUNCTION typname2typ& (t2$) IF t$ = "SINGLE" THEN typname2typ& = SINGLETYPE: EXIT FUNCTION IF t$ = "DOUBLE" THEN typname2typ& = DOUBLETYPE: EXIT FUNCTION - IF t$ = "_FLOAT" OR (t$ = "FLOAT" AND qb64prefix_set = 1) THEN typname2typ& = FLOATTYPE: EXIT FUNCTION - IF LEFT$(t$, 10) = "_UNSIGNED " OR (LEFT$(t$, 9) = "UNSIGNED " AND qb64prefix_set = 1) THEN + IF t$ = "_FLOAT" THEN typname2typ& = FLOATTYPE: EXIT FUNCTION + IF LEFT$(t$, 10) = "_UNSIGNED " THEN u = 1 t$ = MID$(t$, INSTR(t$, CHR$(32)) + 1) END IF - IF LEFT$(t$, 4) = "_BIT" OR (LEFT$(t$, 3) = "BIT" AND qb64prefix_set = 1) THEN - IF t$ = "_BIT" OR (t$ = "BIT" AND qb64prefix_set = 1) THEN + IF LEFT$(t$, 4) = "_BIT" THEN + IF t$ = "_BIT" THEN IF u THEN typname2typ& = UBITTYPE ELSE typname2typ& = BITTYPE EXIT FUNCTION END IF - IF LEFT$(t$, 7) <> "_BIT * " AND LEFT$(t$, 6) <> "BIT * " THEN Give_Error "Expected " + qb64prefix$ + "BIT * number": EXIT FUNCTION + IF LEFT$(t$, 7) <> "_BIT * " AND LEFT$(t$, 6) <> "BIT * " THEN Give_Error "Expected _BIT * number": EXIT FUNCTION IF LEFT$(t$, 4) = "_BIT" THEN n$ = RIGHT$(t$, LEN(t$) - 7) @@ -539,20 +513,20 @@ FUNCTION typname2typ& (t2$) n$ = RIGHT$(t$, LEN(t$) - 6) END IF - IF isuinteger(n$) = 0 THEN Give_Error "Invalid size after " + qb64prefix$ + "BIT *": EXIT FUNCTION + IF isuinteger(n$) = 0 THEN Give_Error "Invalid size after _BIT *": EXIT FUNCTION b = VAL(n$) - IF b = 0 OR b > 64 THEN Give_Error "Invalid size after " + qb64prefix$ + "BIT *": EXIT FUNCTION + IF b = 0 OR b > 64 THEN Give_Error "Invalid size after _BIT *": EXIT FUNCTION t = BITTYPE - 1 + b: IF u THEN t = t + ISUNSIGNED typname2typ& = t EXIT FUNCTION END IF t = 0 - IF t$ = "_BYTE" OR (t$ = "BYTE" AND qb64prefix_set = 1) THEN t = BYTETYPE + IF t$ = "_BYTE" THEN t = BYTETYPE IF t$ = "INTEGER" THEN t = INTEGERTYPE IF t$ = "LONG" THEN t = LONGTYPE - IF t$ = "_INTEGER64" OR (t$ = "INTEGER64" AND qb64prefix_set = 1) THEN t = INTEGER64TYPE - IF t$ = "_OFFSET" OR (t$ = "OFFSET" AND qb64prefix_set = 1) THEN t = OFFSETTYPE + IF t$ = "_INTEGER64" THEN t = INTEGER64TYPE + IF t$ = "_OFFSET" THEN t = OFFSETTYPE IF t THEN IF u THEN t = t + ISUNSIGNED typname2typ& = t @@ -565,9 +539,6 @@ FUNCTION typname2typ& (t2$) IF t$ = RTRIM$(udtxname(i)) THEN typname2typ& = ISUDT + ISPOINTER + i EXIT FUNCTION - ELSEIF RTRIM$(udtxname(i)) = "_MEM" AND t$ = "MEM" AND qb64prefix_set = 1 THEN - typname2typ& = ISUDT + ISPOINTER + i - EXIT FUNCTION END IF NEXT diff --git a/tests/compile_tests/const/noprefix.bas b/tests/compile_tests/const/noprefix.bas deleted file mode 100644 index 8701adbed..000000000 --- a/tests/compile_tests/const/noprefix.bas +++ /dev/null @@ -1,85 +0,0 @@ -$NOPREFIX -$CONSOLE:ONLY -_DEST _CONSOLE - -' This list comprises all of the math functions usable in CONST -CONST const_PI = PI -CONST const_PIfunc = PI(2) -CONST const_ACOS = ACOS(.2) -CONST const_ASIN = ASIN(.2) -CONST const_ARCSEC = ARCSEC(1.2) -CONST const_ARCCOT = ARCCOT(.2) -CONST const_ARCCSC = ARCCSC(1.2) -CONST const_SECH = SECH(.2) -CONST const_CSCH = CSCH(.2) -CONST const_COTH = COTH(.2) -CONST const_D2R = _D2R(.2) -CONST const_D2G = D2G(.2) -CONST const_R2D = R2D(.2) -CONST const_R2G = R2G(.2) -CONST const_G2D = G2D(.2) -CONST const_G2R = G2R(.2) -CONST const_ROUND = ROUND(20.2) -CONST const_CEIL = CEIL(20.2) -CONST const_SEC = SEC(2) -CONST const_CSC = CSC(2) -CONST const_COT = COT(2) -' CONST const_ASC = ASC("a") ' Bugged, not implemented -CONST const__RGB32 = RGB32(2, 3, 4) -CONST const__RGBA32 = RGBA32(2, 3, 4, 5) -CONST const__RGB32_1 = RGB32(2) -CONST const__RGB32_2 = RGB32(2, 3) -CONST const__RGB32_4 = RGB32(2, 3, 4, 5) -CONST const__RGB = RGB(2, 3, 4, 2) -CONST const__RGBA = RGBA(2, 3, 4, 2, 2) -CONST const__RED32 = RED32(22) -CONST const__GREEN32 = GREEN32(22) -CONST const__BLUE32 = BLUE32(22) -CONST const__ALPHA32 = ALPHA32(22) -CONST const__RED = RED(22, 0) -CONST const__GREEN = GREEN(22, 0) -CONST const__BLUE = BLUE(22, 0) -CONST const__ALPHA = ALPHA(2222, 0) - -' The answers have to be within the allowed range, to account for floating point -' differences. -PRINT "PI: "; 3.141592653589793 * .999999 < const_PI; 3.141592653589793 * 1.000001 > const_PI -PRINT "PI: "; 6.283185307179586 * .999999 < const_PIfunc; 6.283185307179586 * 1.000001 > const_PIfunc -PRINT "ACOS: "; 1.369438406004566 * .999999 < const_ACOS; 1.369438406004566 * 1.000001 > const_ACOS -PRINT "ASIN: "; .2013579207903308 * .999999 < const_ASIN; .2013579207903308 * 1.000001 > const_ASIN -PRINT "ARCSEC: "; .5856855434571508 * .999999 < const_ARCSEC; .5856855434571508 * 1.000001 > const_ARCSEC -PRINT "ARCCOT: "; 1.373400766945016 * .999999 < const_ARCCOT; 1.373400766945016 * 1.000001 > const_ARCCOT -PRINT "ARCCSC: "; .9851107833377457 * .999999 < const_ARCCSC; .9851107833377457 * 1.000001 > const_ARCCSC -PRINT "SECH: "; .9803279976447253 * .999999 < const_SECH; .9803279976447253 * 1.000001 > const_SECH -PRINT "CSCH: "; 4.966821568814516 * .999999 < const_CSCH; 4.966821568814516 * 1.000001 > const_CSCH -PRINT "COTH: "; 1.44280551632034 * .999999 < const_COTH; 1.44280551632034 * 1.000001 > const_COTH -PRINT "D2R: "; .0034906585 * .999999 < const_D2R; .0034906585 * 1.000001 > const_D2R -PRINT "D2G: "; .22222222222 * .999999 < const_D2G; .22222222222 * 1.000001 > const_D2G -PRINT "R2D: "; 11.4591559 * .999999 < const_R2D; 11.4591559 * 1.000001 > const_R2D -PRINT "R2G: "; .0031415926 * .999999 < const_R2G; .0031415926 * 1.000001 > const_R2G -PRINT "G2D: "; .18 * .999999 < const_G2D; .18 * 1.000001 > const_G2D -PRINT "G2R: "; 12.7323954474 * .999999 < const_G2R; 12.7323954474 * 1.000001 > const_G2R -PRINT "CSC: "; 1.099750170294616 * .999999 < const_CSC; 1.099750170294616 * 1.000001 > const_CSC - -PRINT "SEC: "; -2.402997961722381 * .999999 > const_SEC; -2.402997961722381 * 1.000001 < const_SEC -PRINT "COT: "; -.4576575543602858 * .999999 > const_COT; -.4576575543602858 * 1.000001 < const_COT - -PRINT "ROUND: "; const_ROUND -PRINT "CEIL: "; const_CEIL -PRINT "RGB32: "; HEX$(const__RGB32) -PRINT "RGBA32: "; HEX$(const__RGBA32) -PRINT "1: "; HEX$(const__RGB32_1) -PRINT "2: "; HEX$(const__RGB32_2) -PRINT "4: "; HEX$(const__RGB32_4) -PRINT "RGB: "; HEX$(const__RGB) -PRINT "RGBA: "; HEX$(const__RGBA) -PRINT "RED32: "; HEX$(const__RED32) -PRINT "GREEN32: "; const__GREEN32 -PRINT "BLUE32: "; const__BLUE32 -PRINT "ALPHA32: "; const__ALPHA32 -PRINT "RED: "; const__RED -PRINT "GREEN: "; const__GREEN -PRINT "BLUE: "; const__BLUE -PRINT "ALPHA: "; const__ALPHA - -SYSTEM diff --git a/tests/compile_tests/const/noprefix.output b/tests/compile_tests/const/noprefix.output deleted file mode 100644 index 49bdeda3e..000000000 --- a/tests/compile_tests/const/noprefix.output +++ /dev/null @@ -1,36 +0,0 @@ -PI: -1 -1 -PI: -1 -1 -ACOS: -1 -1 -ASIN: -1 -1 -ARCSEC: -1 -1 -ARCCOT: -1 -1 -ARCCSC: -1 -1 -SECH: -1 -1 -CSCH: -1 -1 -COTH: -1 -1 -D2R: -1 -1 -D2G: -1 -1 -R2D: -1 -1 -R2G: -1 -1 -G2D: -1 -1 -G2R: -1 -1 -CSC: -1 -1 -SEC: -1 -1 -COT: -1 -1 -ROUND: 20 -CEIL: 21 -RGB32: FF020304 -RGBA32: 5020304 -1: FF020202 -2: 3020202 -4: 5020304 -RGB: 0 -RGBA: 0 -RED32: 0 -GREEN32: 0 -BLUE32: 22 -ALPHA32: 0 -RED: 0 -GREEN: 0 -BLUE: 0 -ALPHA: 255 diff --git a/tests/compile_tests/http/statuscode_noprefix_missing.bas b/tests/compile_tests/http/statuscode_noprefix_missing.bas deleted file mode 100644 index 90c3eb64b..000000000 --- a/tests/compile_tests/http/statuscode_noprefix_missing.bas +++ /dev/null @@ -1,5 +0,0 @@ -$Unstable:Http -Option _ExplicitArray - -' Error, StatusCode() is missing prefix -Print StatusCode(2) diff --git a/tests/compile_tests/http/statuscode_noprefix_missing.err b/tests/compile_tests/http/statuscode_noprefix_missing.err deleted file mode 100644 index 3781d78ab..000000000 --- a/tests/compile_tests/http/statuscode_noprefix_missing.err +++ /dev/null @@ -1,4 +0,0 @@ - -Array 'StatusCode' (SINGLE) not defined -Caused by (or after):PRINT STATUSCODE ( 2 ) -LINE 5:Print StatusCode(2) diff --git a/tests/compile_tests/http/statuscode_unstable.bas b/tests/compile_tests/http/statuscode_unstable.bas new file mode 100644 index 000000000..0fabe3b47 --- /dev/null +++ b/tests/compile_tests/http/statuscode_unstable.bas @@ -0,0 +1,8 @@ +$UNSTABLE:HTTP + +' Important so that `StatusCode()` cannot be an array, ensures that this test +' fails if `_StatusCode()` cannot be called +OPTION _EXPLICITARRAY + +PRINT _STATUSCODE(2) + diff --git a/tests/compile_tests/http/statuscode_unstable_noprefix.bas b/tests/compile_tests/http/statuscode_unstable_noprefix.bas deleted file mode 100644 index 4ecf78b2e..000000000 --- a/tests/compile_tests/http/statuscode_unstable_noprefix.bas +++ /dev/null @@ -1,8 +0,0 @@ -$NOPREFIX -$Unstable:Http - -' Important so that `StatusCode()` cannot be an array, ensures that this test -' fails if `StatusCode()` cannot be called -Option ExplicitArray - -Print StatusCode(2) diff --git a/tests/compile_tests/types/all_types.bas b/tests/compile_tests/types/all_types.bas index 56b9c67be..07068b3de 100644 --- a/tests/compile_tests/types/all_types.bas +++ b/tests/compile_tests/types/all_types.bas @@ -1,114 +1,69 @@ -$NoPrefix $CONSOLE:ONLY -Dim dim_m As _Mem - -Dim dim_s As String -Dim dim_s2 As String * 8 - -Dim dim_b As _Bit -Dim dim_b1 As Bit -Dim dim_b2 As _Unsigned _Bit -Dim dim_b3 As Unsigned _Bit -Dim dim_b4 As _Unsigned Bit -Dim dim_b5 As Unsigned Bit - -Dim dim_bn As _Bit * 7 -Dim dim_bn1 As Bit * 7 -Dim dim_bn2 As _Unsigned _Bit * 7 -Dim dim_bn3 As Unsigned _Bit * 7 -Dim dim_bn4 As _Unsigned Bit * 7 -Dim dim_bn5 As Unsigned Bit * 7 - -Dim dim_byte As _Byte -Dim dim_byte1 As Byte -Dim dim_byte2 As _Unsigned _Byte -Dim dim_byte3 As Unsigned _Byte -Dim dim_byte4 As _Unsigned Byte -Dim dim_byte5 As Unsigned Byte - -Dim dim_i64 As _Integer64 -Dim dim_i64_1 As Integer64 -Dim dim_i64_2 As _Unsigned _Integer64 -Dim dim_i64_3 As Unsigned _Integer64 -Dim dim_i64_4 As _Unsigned Integer64 -Dim dim_i64_5 As Unsigned Integer64 - -Dim dim_o As _Offset -Dim dim_o1 As Offset -Dim dim_o2 As _Unsigned _Offset -Dim dim_o3 As Unsigned _Offset -Dim dim_o4 As _Unsigned Offset -Dim dim_o5 As Unsigned Offset - -Dim dim_i As Integer -Dim dim_i2 As _Unsigned Integer -Dim dim_i3 As Unsigned Integer - -Dim dim_l As Long -Dim dim_l2 As _Unsigned Long -Dim dim_l3 As Unsigned Long - -Dim dim_si As Single -Dim dim_d As Double -Dim dim_f As _Float +DIM dim_m AS _MEM + +DIM dim_s AS STRING +DIM dim_s2 AS STRING * 8 + +DIM dim_b AS _BIT +DIM dim_b2 AS _UNSIGNED _BIT + +DIM dim_bn AS _BIT * 7 +DIM dim_bn2 AS _UNSIGNED _BIT * 7 + +DIM dim_byte AS _BYTE +DIM dim_byte2 AS _UNSIGNED _BYTE + +DIM dim_i64 AS _INTEGER64 +DIM dim_i64_2 AS _UNSIGNED _INTEGER64 + +DIM dim_o AS _OFFSET +DIM dim_o2 AS _UNSIGNED _OFFSET + +DIM dim_i AS INTEGER +DIM dim_i2 AS _UNSIGNED INTEGER + +DIM dim_l AS LONG +DIM dim_l2 AS _UNSIGNED LONG + +DIM dim_si AS SINGLE +DIM dim_d AS DOUBLE +DIM dim_f AS _FLOAT test SYSTEM -Sub test () - Static m As _Mem - - Static s As String - Static s2 As String * 8 - - Static b As _Bit - Static b1 As Bit - Static b2 As _Unsigned _Bit - Static b3 As Unsigned _Bit - Static b4 As _Unsigned Bit - Static b5 As Unsigned Bit - - Static bn As _Bit * 7 - Static bn1 As Bit * 7 - Static bn2 As _Unsigned _Bit * 7 - Static bn3 As Unsigned _Bit * 7 - Static bn4 As _Unsigned Bit * 7 - Static bn5 As Unsigned Bit * 7 - - Static byt As _Byte - Static byt1 As Byte - Static byt2 As _Unsigned _Byte - Static byt3 As Unsigned _Byte - Static byt4 As _Unsigned Byte - Static byt5 As Unsigned Byte - - Static i64 As _Integer64 - Static i64_1 As Integer64 - Static i64_2 As _Unsigned _Integer64 - Static i64_3 As Unsigned _Integer64 - Static i64_4 As _Unsigned Integer64 - Static i64_5 As Unsigned Integer64 - - Static o As _Offset - Static o1 As Offset - Static o2 As _Unsigned _Offset - Static o3 As Unsigned _Offset - Static o4 As _Unsigned Offset - Static o5 As Unsigned Offset - - Static i As Integer - Static i2 As _Unsigned Integer - Static i3 As Unsigned Integer - - Static l As Long - Static l2 As _Unsigned Long - Static l3 As Unsigned Long - - Static si As Single - Static d As Double - Static f As _Float +SUB test () + STATIC m AS _MEM + + STATIC s AS STRING + STATIC s2 AS STRING * 8 + + STATIC b AS _BIT + STATIC b2 AS _UNSIGNED _BIT + + STATIC bn AS _BIT * 7 + STATIC bn2 AS _UNSIGNED _BIT * 7 + + STATIC byt AS _BYTE + STATIC byt2 AS _UNSIGNED _BYTE + + STATIC i64 AS _INTEGER64 + STATIC i64_2 AS _UNSIGNED _INTEGER64 + + STATIC o AS _OFFSET + STATIC o2 AS _UNSIGNED _OFFSET + + STATIC i AS INTEGER + STATIC i2 AS _UNSIGNED INTEGER + + STATIC l AS LONG + STATIC l2 AS _UNSIGNED LONG + + STATIC si AS SINGLE + STATIC d AS DOUBLE + STATIC f AS _FLOAT ' Just check a few of them s2 = "HI" @@ -123,4 +78,5 @@ Sub test () f = 2.8 PRINT "TEST: "; s2; b; bn; byt; i64; i; l; si; d; f -End Sub +END SUB + diff --git a/tests/compile_tests/types/dim.bas b/tests/compile_tests/types/dim.bas index f4db1897a..1dfe2e20a 100644 --- a/tests/compile_tests/types/dim.bas +++ b/tests/compile_tests/types/dim.bas @@ -1,57 +1,34 @@ -$NoPrefix $CONSOLE:ONLY -Dim m As _Mem +DIM m AS _MEM -Dim s As String -Dim s2 As String * 8 +DIM s AS STRING +DIM s2 AS STRING * 8 -Dim b As _Bit -Dim b1 As Bit -Dim b2 As _Unsigned _Bit -Dim b3 As Unsigned _Bit -Dim b4 As _Unsigned Bit -Dim b5 As Unsigned Bit +DIM b AS _BIT +DIM b2 AS _UNSIGNED _BIT -Dim bn As _Bit * 7 -Dim bn1 As Bit * 7 -Dim bn2 As _Unsigned _Bit * 7 -Dim bn3 As Unsigned _Bit * 7 -Dim bn4 As _Unsigned Bit * 7 -Dim bn5 As Unsigned Bit * 7 +DIM bn AS _BIT * 7 +DIM bn2 AS _UNSIGNED _BIT * 7 -Dim byt As _Byte -Dim byt1 As Byte -Dim byt2 As _Unsigned _Byte -Dim byt3 As Unsigned _Byte -Dim byt4 As _Unsigned Byte -Dim byt5 As Unsigned Byte +DIM byt AS _BYTE +DIM byt2 AS _UNSIGNED _BYTE -Dim i64 As _Integer64 -Dim i64_1 As Integer64 -Dim i64_2 As _Unsigned _Integer64 -Dim i64_3 As Unsigned _Integer64 -Dim i64_4 As _Unsigned Integer64 -Dim i64_5 As Unsigned Integer64 +DIM i64 AS _INTEGER64 +DIM i64_2 AS _UNSIGNED _INTEGER64 -Dim o As _Offset -Dim o1 As Offset -Dim o2 As _Unsigned _Offset -Dim o3 As Unsigned _Offset -Dim o4 As _Unsigned Offset -Dim o5 As Unsigned Offset +DIM o AS _OFFSET +DIM o2 AS _UNSIGNED _OFFSET -Dim i As Integer -Dim i2 As _Unsigned Integer -Dim i3 As Unsigned Integer +DIM i AS INTEGER +DIM i2 AS _UNSIGNED INTEGER -Dim l As Long -Dim l2 As _Unsigned Long -Dim l3 As Unsigned Long +DIM l AS LONG +DIM l2 AS _UNSIGNED LONG -Dim si As Single -Dim d As Double -Dim f As _Float +DIM si AS SINGLE +DIM d AS DOUBLE +DIM f AS _FLOAT ' Just check a few of them s2 = "HI" @@ -68,3 +45,4 @@ f = 2.8 PRINT "TEST: "; s2; b; bn; byt; i64; i; l; si; d; f SYSTEM + diff --git a/tests/compile_tests/types/dim_array.bas b/tests/compile_tests/types/dim_array.bas index cd82234fc..d0f05eb8a 100644 --- a/tests/compile_tests/types/dim_array.bas +++ b/tests/compile_tests/types/dim_array.bas @@ -1,57 +1,34 @@ -$NoPrefix $CONSOLE:ONLY -Dim m(3) As _Mem +DIM m(3) AS _MEM -Dim s(3) As String -Dim s2(3) As String * 8 +DIM s(3) AS STRING +DIM s2(3) AS STRING * 8 -Dim b(3) As _Bit -Dim b1(3) As Bit -Dim b2(3) As _Unsigned _Bit -Dim b3(3) As Unsigned _Bit -Dim b4(3) As _Unsigned Bit -Dim b5(3) As Unsigned Bit +DIM b(3) AS _BIT +DIM b2(3) AS _UNSIGNED _BIT -Dim bn(3) As _Bit * 7 -Dim bn1(3) As Bit * 7 -Dim bn2(3) As _Unsigned _Bit * 7 -Dim bn3(3) As Unsigned _Bit * 7 -Dim bn4(3) As _Unsigned Bit * 7 -Dim bn5(3) As Unsigned Bit * 7 +DIM bn(3) AS _BIT * 7 +DIM bn2(3) AS _UNSIGNED _BIT * 7 -Dim byt(3) As _Byte -Dim byt1(3) As Byte -Dim byt2(3) As _Unsigned _Byte -Dim byt3(3) As Unsigned _Byte -Dim byt4(3) As _Unsigned Byte -Dim byt5(3) As Unsigned Byte +DIM byt(3) AS _BYTE +DIM byt2(3) AS _UNSIGNED _BYTE -Dim i64(3) As _Integer64 -Dim i64_1(3) As Integer64 -Dim i64_2(3) As _Unsigned _Integer64 -Dim i64_3(3) As Unsigned _Integer64 -Dim i64_4(3) As _Unsigned Integer64 -Dim i64_5(3) As Unsigned Integer64 +DIM i64(3) AS _INTEGER64 +DIM i64_2(3) AS _UNSIGNED _INTEGER64 -Dim o(3) As _Offset -Dim o1(3) As Offset -Dim o2(3) As _Unsigned _Offset -Dim o3(3) As Unsigned _Offset -Dim o4(3) As _Unsigned Offset -Dim o5(3) As Unsigned Offset +DIM o(3) AS _OFFSET +DIM o2(3) AS _UNSIGNED _OFFSET -Dim i(3) As Integer -Dim i2(3) As _Unsigned Integer -Dim i3(3) As Unsigned Integer +DIM i(3) AS INTEGER +DIM i2(3) AS _UNSIGNED INTEGER -Dim l(3) As Long -Dim l2(3) As _Unsigned Long -Dim l3(3) As Unsigned Long +DIM l(3) AS LONG +DIM l2(3) AS _UNSIGNED LONG -Dim si(3) As Single -Dim d(3) As Double -Dim f(3) As _Float +DIM si(3) AS SINGLE +DIM d(3) AS DOUBLE +DIM f(3) AS _FLOAT ' Just check a few of them s2(1) = "HI" @@ -68,3 +45,4 @@ f(1) = 2.8 PRINT "TEST: "; s2(1); b(1); bn(1); byt(1); i64(1); i(1); l(1); si(1); d(1); f(1) SYSTEM + diff --git a/tests/compile_tests/types/static.bas b/tests/compile_tests/types/static.bas index 14a6730c6..73e41143e 100644 --- a/tests/compile_tests/types/static.bas +++ b/tests/compile_tests/types/static.bas @@ -1,62 +1,39 @@ -$NoPrefix $CONSOLE:ONLY test SYSTEM -Sub test () - Static m As _Mem +SUB test () + STATIC m AS _MEM - Static s As String - Static s2 As String * 8 + STATIC s AS STRING + STATIC s2 AS STRING * 8 - Static b As _Bit - Static b1 As Bit - Static b2 As _Unsigned _Bit - Static b3 As Unsigned _Bit - Static b4 As _Unsigned Bit - Static b5 As Unsigned Bit + STATIC b AS _BIT + STATIC b2 AS _UNSIGNED _BIT - Static bn As _Bit * 7 - Static bn1 As Bit * 7 - Static bn2 As _Unsigned _Bit * 7 - Static bn3 As Unsigned _Bit * 7 - Static bn4 As _Unsigned Bit * 7 - Static bn5 As Unsigned Bit * 7 + STATIC bn AS _BIT * 7 + STATIC bn2 AS _UNSIGNED _BIT * 7 - Static byt As _Byte - Static byt1 As Byte - Static byt2 As _Unsigned _Byte - Static byt3 As Unsigned _Byte - Static byt4 As _Unsigned Byte - Static byt5 As Unsigned Byte + STATIC byt AS _BYTE + STATIC byt2 AS _UNSIGNED _BYTE - Static i64 As _Integer64 - Static i64_1 As Integer64 - Static i64_2 As _Unsigned _Integer64 - Static i64_3 As Unsigned _Integer64 - Static i64_4 As _Unsigned Integer64 - Static i64_5 As Unsigned Integer64 + STATIC i64 AS _INTEGER64 + STATIC i64_2 AS _UNSIGNED _INTEGER64 - Static o As _Offset - Static o1 As Offset - Static o2 As _Unsigned _Offset - Static o3 As Unsigned _Offset - Static o4 As _Unsigned Offset - Static o5 As Unsigned Offset + STATIC o AS _OFFSET + STATIC o2 AS _UNSIGNED _OFFSET - Static i As Integer - Static i2 As _Unsigned Integer - Static i3 As Unsigned Integer + STATIC i AS INTEGER + STATIC i2 AS _UNSIGNED INTEGER - Static l As Long - Static l2 As _Unsigned Long - Static l3 As Unsigned Long + STATIC l AS LONG + STATIC l2 AS _UNSIGNED LONG - Static si As Single - Static d As Double - Static f As _Float + STATIC si AS SINGLE + STATIC d AS DOUBLE + STATIC f AS _FLOAT ' Just check a few of them s2 = "HI" @@ -71,4 +48,5 @@ Sub test () f = 2.8 PRINT "TEST: "; s2; b; bn; byt; i64; i; l; si; d; f -End Sub +END SUB + diff --git a/tests/compile_tests/types/static_array.bas b/tests/compile_tests/types/static_array.bas index 0182e99b8..5af782688 100644 --- a/tests/compile_tests/types/static_array.bas +++ b/tests/compile_tests/types/static_array.bas @@ -1,62 +1,39 @@ -$NoPrefix $CONSOLE:ONLY test SYSTEM -Sub test () - Static m(3) As _Mem +SUB test () + STATIC m(3) AS _MEM - Static s(3) As String - Static s2(3) As String * 8 + STATIC s(3) AS STRING + STATIC s2(3) AS STRING * 8 - Static b(3) As _Bit - Static b1(3) As Bit - Static b2(3) As _Unsigned _Bit - Static b3(3) As Unsigned _Bit - Static b4(3) As _Unsigned Bit - Static b5(3) As Unsigned Bit + STATIC b(3) AS _BIT + STATIC b2(3) AS _UNSIGNED _BIT - Static bn(3) As _Bit * 7 - Static bn1(3) As Bit * 7 - Static bn2(3) As _Unsigned _Bit * 7 - Static bn3(3) As Unsigned _Bit * 7 - Static bn4(3) As _Unsigned Bit * 7 - Static bn5(3) As Unsigned Bit * 7 + STATIC bn(3) AS _BIT * 7 + STATIC bn2(3) AS _UNSIGNED _BIT * 7 - Static byt(3) As _Byte - Static byt1(3) As Byte - Static byt2(3) As _Unsigned _Byte - Static byt3(3) As Unsigned _Byte - Static byt4(3) As _Unsigned Byte - Static byt5(3) As Unsigned Byte + STATIC byt(3) AS _BYTE + STATIC byt2(3) AS _UNSIGNED _BYTE - Static i64(3) As _Integer64 - Static i64_1(3) As Integer64 - Static i64_2(3) As _Unsigned _Integer64 - Static i64_3(3) As Unsigned _Integer64 - Static i64_4(3) As _Unsigned Integer64 - Static i64_5(3) As Unsigned Integer64 + STATIC i64(3) AS _INTEGER64 + STATIC i64_2(3) AS _UNSIGNED _INTEGER64 - Static o(3) As _Offset - Static o1(3) As Offset - Static o2(3) As _Unsigned _Offset - Static o3(3) As Unsigned _Offset - Static o4(3) As _Unsigned Offset - Static o5(3) As Unsigned Offset + STATIC o(3) AS _OFFSET + STATIC o2(3) AS _UNSIGNED _OFFSET - Static i(3) As Integer - Static i2(3) As _Unsigned Integer - Static i3(3) As Unsigned Integer + STATIC i(3) AS INTEGER + STATIC i2(3) AS _UNSIGNED INTEGER - Static l(3) As Long - Static l2(3) As _Unsigned Long - Static l3(3) As Unsigned Long + STATIC l(3) AS LONG + STATIC l2(3) AS _UNSIGNED LONG - Static si(3) As Single - Static d(3) As Double - Static f(3) As _Float + STATIC si(3) AS SINGLE + STATIC d(3) AS DOUBLE + STATIC f(3) AS _FLOAT ' Just check a few of them s2(1) = "HI" @@ -71,4 +48,5 @@ Sub test () f(1) = 2.8 PRINT "TEST: "; s2(1); b(1); bn(1); byt(1); i64(1); i(1); l(1); si(1); d(1); f(1) -End Sub +END SUB +