mirror of
https://github.com/QB64Official/qb64.git
synced 2024-07-03 08:51:22 +00:00
Merge pull request #19 from QB64Team/ide-patches
IDE and compiler patches
This commit is contained in:
Fellippe Heitor
GitHub
commit
af5da42d61
|
|
@ -493,7 +493,7 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
IdeBmkN = 0
|
IdeBmkN = 0
|
||||||
ideerror = 1
|
ideerror = 1
|
||||||
ideprogname = f$: _TITLE ideprogname + " - QB64"
|
ideprogname = f$: _TITLE ideprogname + " - " + WindowTitle
|
||||||
IdeImportBookmarks idepath$ + idepathsep$ + ideprogname$
|
IdeImportBookmarks idepath$ + idepathsep$ + ideprogname$
|
||||||
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
||||||
END IF 'message 1
|
END IF 'message 1
|
||||||
|
|
@ -3053,9 +3053,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
a$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
a$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
a$ = idesaveas$(ProposedTitle$ + ".bas")
|
a$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
ELSE
|
ELSE
|
||||||
idesave idepath$ + idepathsep$ + ideprogname$
|
idesave idepath$ + idepathsep$ + ideprogname$
|
||||||
|
|
@ -3133,7 +3133,7 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
ideunsaved = 1
|
ideunsaved = 1
|
||||||
ideprogname$ = ""
|
ideprogname$ = ""
|
||||||
_TITLE "QB64"
|
_TITLE WindowTitle
|
||||||
ideundobase = -1 'release base restriction
|
ideundobase = -1 'release base restriction
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
|
@ -3396,8 +3396,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF idecy = 1 THEN idecx = 1: GOTO specialchar
|
IF idecy = 1 THEN idecx = 1: GOTO specialchar
|
||||||
idecy = idecy - 1
|
idecy = idecy - 1
|
||||||
a$ = idegetline(idecy)
|
a$ = idegetline(idecy)
|
||||||
idecx = LEN(a$)
|
idecx = LEN(a$) + 1
|
||||||
LOOP UNTIL LEN(a$)
|
LOOP UNTIL LEN(a$)
|
||||||
|
GOTO specialchar 'stop at the end of the previous line
|
||||||
END IF
|
END IF
|
||||||
'check character
|
'check character
|
||||||
IF alphanumeric(ASC(a$, idecx)) THEN
|
IF alphanumeric(ASC(a$, idecx)) THEN
|
||||||
|
|
@ -3431,6 +3432,7 @@ FUNCTION ide2 (ignore)
|
||||||
'move
|
'move
|
||||||
IF first = 0 THEN idecx = idecx + 1
|
IF first = 0 THEN idecx = idecx + 1
|
||||||
'latch onto next character
|
'latch onto next character
|
||||||
|
IF first = 0 AND idecx = LEN(a$) + 1 THEN GOTO specialchar 'stop at the end of the line
|
||||||
IF idecx > LEN(a$) THEN
|
IF idecx > LEN(a$) THEN
|
||||||
DO
|
DO
|
||||||
IF idecy = iden THEN GOTO specialchar
|
IF idecy = iden THEN GOTO specialchar
|
||||||
|
|
@ -4932,7 +4934,7 @@ FUNCTION ide2 (ignore)
|
||||||
PRINT "Generating list of cached content..."
|
PRINT "Generating list of cached content..."
|
||||||
|
|
||||||
'Create a list of all files to be recached
|
'Create a list of all files to be recached
|
||||||
f$ = CHR$(0) + idezfilelist$("internal/help", 1) + CHR$(0)
|
f$ = CHR$(0) + idezfilelist$("internal/help", 1, "") + CHR$(0)
|
||||||
IF LEN(f$) = 2 THEN f$ = CHR$(0)
|
IF LEN(f$) = 2 THEN f$ = CHR$(0)
|
||||||
|
|
||||||
'Prepend core pages to list
|
'Prepend core pages to list
|
||||||
|
|
@ -5355,9 +5357,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
r$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
r$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
r$ = idesaveas$(ProposedTitle$ + ".bas")
|
r$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
IF r$ = "C" THEN
|
IF r$ = "C" THEN
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
||||||
|
|
@ -5383,9 +5385,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
r$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
r$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
r$ = idesaveas$(ProposedTitle$ + ".bas")
|
r$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
|
||||||
IF r$ = "C" THEN GOTO ideloop
|
IF r$ = "C" THEN GOTO ideloop
|
||||||
|
|
@ -5406,7 +5408,7 @@ FUNCTION ide2 (ignore)
|
||||||
listOfCustomKeywords$ = LEFT$(listOfCustomKeywords$, customKeywordsLength)
|
listOfCustomKeywords$ = LEFT$(listOfCustomKeywords$, customKeywordsLength)
|
||||||
QuickNavTotal = 0
|
QuickNavTotal = 0
|
||||||
ModifyCOMMAND$ = ""
|
ModifyCOMMAND$ = ""
|
||||||
_TITLE "QB64"
|
_TITLE WindowTitle
|
||||||
idechangemade = 1
|
idechangemade = 1
|
||||||
idefocusline = 0
|
idefocusline = 0
|
||||||
ideundobase = 0 'reset
|
ideundobase = 0 'reset
|
||||||
|
|
@ -5481,9 +5483,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
r$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
r$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
r$ = idesaveas$(ProposedTitle$ + ".bas")
|
r$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
IF r$ = "C" THEN GOTO ideloop
|
IF r$ = "C" THEN GOTO ideloop
|
||||||
ELSE
|
ELSE
|
||||||
|
|
@ -5492,7 +5494,7 @@ FUNCTION ide2 (ignore)
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
|
||||||
END IF '"Y"
|
END IF '"Y"
|
||||||
END IF 'unsaved
|
END IF 'unsaved
|
||||||
r$ = ideopen
|
r$ = idefiledialog$("", 1)
|
||||||
IF r$ <> "C" THEN ideunsaved = -1: idechangemade = 1: idelayoutallow = 2: ideundobase = 0: QuickNavTotal = 0: ModifyCOMMAND$ = ""
|
IF r$ <> "C" THEN ideunsaved = -1: idechangemade = 1: idelayoutallow = 2: ideundobase = 0: QuickNavTotal = 0: ModifyCOMMAND$ = ""
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -5502,9 +5504,9 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
a$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
a$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
a$ = idesaveas$(ProposedTitle$ + ".bas")
|
a$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
ELSE
|
ELSE
|
||||||
idesave idepath$ + idepathsep$ + ideprogname$
|
idesave idepath$ + idepathsep$ + ideprogname$
|
||||||
|
|
@ -5518,12 +5520,12 @@ FUNCTION ide2 (ignore)
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
IF ProposedTitle$ = "" THEN
|
IF ProposedTitle$ = "" THEN
|
||||||
a$ = idesaveas$("untitled" + tempfolderindexstr$ + ".bas")
|
a$ = idefiledialog$("untitled" + tempfolderindexstr$ + ".bas", 2)
|
||||||
ELSE
|
ELSE
|
||||||
a$ = idesaveas$(ProposedTitle$ + ".bas")
|
a$ = idefiledialog$(ProposedTitle$ + ".bas", 2)
|
||||||
END IF
|
END IF
|
||||||
ELSE
|
ELSE
|
||||||
a$ = idesaveas$(ideprogname$)
|
a$ = idefiledialog$(ideprogname$, 2)
|
||||||
END IF
|
END IF
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt: GOTO ideloop
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -6627,7 +6629,7 @@ SUB ideerrormessage (mess$)
|
||||||
|
|
||||||
END SUB
|
END SUB
|
||||||
|
|
||||||
FUNCTION idefileexists$
|
FUNCTION idefileexists$(f$)
|
||||||
'-------- generic dialog box header --------
|
'-------- generic dialog box header --------
|
||||||
PCOPY 3, 0
|
PCOPY 3, 0
|
||||||
PCOPY 0, 2
|
PCOPY 0, 2
|
||||||
|
|
@ -6643,7 +6645,18 @@ FUNCTION idefileexists$
|
||||||
'-------- init --------
|
'-------- init --------
|
||||||
i = 0
|
i = 0
|
||||||
'idepar p, 30, 6, "File already exists. Overwrite?"
|
'idepar p, 30, 6, "File already exists. Overwrite?"
|
||||||
idepar p, 35, 4, ""
|
|
||||||
|
l = LEN(f$)
|
||||||
|
DO
|
||||||
|
IF l < LEN(f$) THEN
|
||||||
|
m$ = "File " + CHR$(34) + STRING$(3, 250) + RIGHT$(f$, l) + CHR$(34) + " already exists. Overwrite?"
|
||||||
|
ELSE
|
||||||
|
m$ = "File " + CHR$(34) + f$ + CHR$(34) + " already exists. Overwrite?"
|
||||||
|
END IF
|
||||||
|
l = l - 1
|
||||||
|
LOOP UNTIL LEN(m$) + 4 < (idewx - 6)
|
||||||
|
|
||||||
|
idepar p, LEN(m$) + 4, 4, ""
|
||||||
i = i + 1
|
i = i + 1
|
||||||
o(i).typ = 3
|
o(i).typ = 3
|
||||||
o(i).y = 4
|
o(i).y = 4
|
||||||
|
|
@ -6673,7 +6686,7 @@ FUNCTION idefileexists$
|
||||||
'-------- end of generic display dialog box & objects --------
|
'-------- end of generic display dialog box & objects --------
|
||||||
|
|
||||||
'-------- custom display changes --------
|
'-------- custom display changes --------
|
||||||
COLOR 0, 7: LOCATE p.y + 2, p.x + 3: PRINT "File already exists. Overwrite?";
|
COLOR 0, 7: LOCATE p.y + 2, p.x + 3: PRINT m$;
|
||||||
'-------- end of custom display changes --------
|
'-------- end of custom display changes --------
|
||||||
|
|
||||||
'update visual page and cursor position
|
'update visual page and cursor position
|
||||||
|
|
@ -7517,7 +7530,7 @@ SUB idenomatch
|
||||||
|
|
||||||
END SUB
|
END SUB
|
||||||
|
|
||||||
FUNCTION ideopen$
|
FUNCTION idefiledialog$(programname$, mode AS _BYTE)
|
||||||
STATIC AllFiles
|
STATIC AllFiles
|
||||||
|
|
||||||
'-------- generic dialog box header --------
|
'-------- generic dialog box header --------
|
||||||
|
|
@ -7533,16 +7546,27 @@ FUNCTION ideopen$
|
||||||
|
|
||||||
'-------- init --------
|
'-------- init --------
|
||||||
path$ = idepath$
|
path$ = idepath$
|
||||||
filelist$ = idezfilelist$(path$, AllFiles)
|
filelist$ = idezfilelist$(path$, AllFiles, "")
|
||||||
pathlist$ = idezpathlist$(path$)
|
pathlist$ = idezpathlist$(path$)
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
idepar p, 70, idewy + idesubwindow - 7, "Open"
|
IF mode = 1 THEN
|
||||||
|
idepar p, 70, idewy + idesubwindow - 7, "Open"
|
||||||
|
ELSEIF mode = 2 THEN
|
||||||
|
idepar p, 70, idewy + idesubwindow - 7, "Save As"
|
||||||
|
END IF
|
||||||
i = i + 1
|
i = i + 1
|
||||||
PrevFocus = 1
|
PrevFocus = 1
|
||||||
o(i).typ = 1
|
o(i).typ = 1
|
||||||
o(i).y = 2
|
o(i).y = 2
|
||||||
o(i).nam = idenewtxt("File #Name")
|
o(i).nam = idenewtxt("File #Name")
|
||||||
|
IF mode = 2 THEN
|
||||||
|
o(i).txt = idenewtxt(programname$)
|
||||||
|
o(i).issel = -1
|
||||||
|
o(i).sx1 = 0
|
||||||
|
o(i).v1 = LEN(programname$)
|
||||||
|
END IF
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
o(i).typ = 2
|
o(i).typ = 2
|
||||||
o(i).y = 5
|
o(i).y = 5
|
||||||
|
|
@ -7561,6 +7585,7 @@ FUNCTION ideopen$
|
||||||
o(i).y = idewy + idesubwindow - 9
|
o(i).y = idewy + idesubwindow - 9
|
||||||
o(i).nam = idenewtxt(".BAS Only")
|
o(i).nam = idenewtxt(".BAS Only")
|
||||||
IF AllFiles THEN o(i).sel = 0 ELSE o(i).sel = 1
|
IF AllFiles THEN o(i).sel = 0 ELSE o(i).sel = 1
|
||||||
|
prevBASOnly = o(i).sel
|
||||||
i = i + 1
|
i = i + 1
|
||||||
o(i).typ = 3
|
o(i).typ = 3
|
||||||
o(i).y = idewy + idesubwindow - 7
|
o(i).y = idewy + idesubwindow - 7
|
||||||
|
|
@ -7572,7 +7597,7 @@ FUNCTION ideopen$
|
||||||
FOR i = 1 TO 100: o(i).par = p: NEXT 'set parent info of objects
|
FOR i = 1 TO 100: o(i).par = p: NEXT 'set parent info of objects
|
||||||
'-------- end of generic init --------
|
'-------- end of generic init --------
|
||||||
|
|
||||||
IF LEN(IdeOpenFile) THEN f$ = IdeOpenFile: GOTO DirectLoad
|
IF mode = 1 AND LEN(IdeOpenFile) > 0 THEN f$ = IdeOpenFile: GOTO DirectLoad
|
||||||
|
|
||||||
DO 'main loop
|
DO 'main loop
|
||||||
|
|
||||||
|
|
@ -7616,12 +7641,14 @@ FUNCTION ideopen$
|
||||||
alt = KALT: IF alt <> oldalt THEN change = 1
|
alt = KALT: IF alt <> oldalt THEN change = 1
|
||||||
oldalt = alt
|
oldalt = alt
|
||||||
|
|
||||||
IF _TOTALDROPPEDFILES > 0 THEN
|
IF mode = 1 THEN
|
||||||
idetxt(o(1).txt) = _DROPPEDFILE$(1)
|
IF _TOTALDROPPEDFILES > 0 THEN
|
||||||
o(1).v1 = LEN(idetxt(o(1).txt))
|
idetxt(o(1).txt) = _DROPPEDFILE$(1)
|
||||||
focus = 1
|
o(1).v1 = LEN(idetxt(o(1).txt))
|
||||||
_FINISHDROP
|
focus = 1
|
||||||
change = 1
|
_FINISHDROP
|
||||||
|
change = 1
|
||||||
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
_LIMIT 100
|
_LIMIT 100
|
||||||
|
|
@ -7675,21 +7702,16 @@ FUNCTION ideopen$
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF AllFiles = 1 AND o(4).sel <> 0 THEN
|
IF o(4).sel <> prevBASOnly THEN
|
||||||
AllFiles = 0
|
prevBASOnly = o(4).sel
|
||||||
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles)
|
IF o(4).sel = 0 THEN AllFiles = 1 ELSE AllFiles = 0
|
||||||
o(2).sel = -1
|
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles, "")
|
||||||
GOTO ideopenloop
|
|
||||||
END IF
|
|
||||||
IF AllFiles = 0 AND o(4).sel = 0 THEN
|
|
||||||
AllFiles = 1
|
|
||||||
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles)
|
|
||||||
o(2).sel = -1
|
o(2).sel = -1
|
||||||
GOTO ideopenloop
|
GOTO ideopenloop
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF K$ = CHR$(27) OR (focus = 6 AND info <> 0) THEN
|
IF K$ = CHR$(27) OR (focus = 6 AND info <> 0) THEN
|
||||||
ideopen$ = "C"
|
idefiledialog$ = "C"
|
||||||
EXIT FUNCTION
|
EXIT FUNCTION
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
|
@ -7700,99 +7722,158 @@ FUNCTION ideopen$
|
||||||
|
|
||||||
IF focus = 3 THEN
|
IF focus = 3 THEN
|
||||||
IF K$ = CHR$(13) OR info = 1 THEN
|
IF K$ = CHR$(13) OR info = 1 THEN
|
||||||
|
|
||||||
path$ = idezchangepath(path$, idetxt(o(3).stx))
|
path$ = idezchangepath(path$, idetxt(o(3).stx))
|
||||||
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles)
|
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles, "")
|
||||||
idetxt(o(3).txt) = idezpathlist$(path$)
|
idetxt(o(3).txt) = idezpathlist$(path$)
|
||||||
|
|
||||||
o(2).sel = -1
|
o(2).sel = -1
|
||||||
o(3).sel = 1
|
o(3).sel = -1
|
||||||
IF info = 1 THEN o(3).sel = -1
|
focus = 1
|
||||||
GOTO ideopenloop
|
GOTO ideopenloop
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
'load file
|
'load or save file
|
||||||
IF K$ = CHR$(13) OR (info = 1 AND focus = 2) OR (focus = 5 AND info <> 0) THEN
|
IF K$ = CHR$(13) OR (info = 1 AND focus = 2) OR (focus = 5 AND info <> 0) THEN
|
||||||
f$ = idetxt(o(1).txt)
|
f$ = idetxt(o(1).txt)
|
||||||
|
|
||||||
'change path?
|
IF _FILEEXISTS(f$) THEN GOTO DirectLoad
|
||||||
IF f$ = ".." OR f$ = "." THEN f$ = f$ + idepathsep$
|
|
||||||
IF RIGHT$(f$, 1) = idepathsep$ THEN
|
IF f$ = "" AND focus = 1 AND K$ = CHR$(13) THEN
|
||||||
path$ = idezgetfilepath$(path$, f$) 'note: path ending with pathsep needn't contain a file
|
'reset filters
|
||||||
idetxt(o(1).txt) = ""
|
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles, "")
|
||||||
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles)
|
|
||||||
o(2).sel = -1
|
o(2).sel = -1
|
||||||
idetxt(o(3).txt) = idezpathlist$(path$)
|
GOTO ideopenloop
|
||||||
o(3).sel = -1
|
ELSEIF f$ = "" AND focus = 5 AND info <> 0 THEN
|
||||||
GOTO ideopenloop
|
GOTO ideopenloop
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
'add .bas if not given
|
'change path?
|
||||||
IF (LCASE$(RIGHT$(f$, 4)) <> ".bas") AND AllFiles = 0 THEN f$ = f$ + ".bas"
|
IF _DIREXISTS(path$ + idepathsep$ + f$) THEN
|
||||||
|
'check/acquire file path
|
||||||
DirectLoad:
|
path$ = idezgetfilepath$(path$, f$ + idepathsep$) 'note: path ending with pathsep needn't contain a file
|
||||||
|
idetxt(o(1).txt) = ""
|
||||||
'check/acquire file path
|
idetxt(o(2).txt) = idezfilelist$(path$, AllFiles, "")
|
||||||
path$ = idezgetfilepath$(path$, f$)
|
o(2).sel = -1
|
||||||
'check file exists
|
idetxt(o(3).txt) = idezpathlist$(path$)
|
||||||
ideerror = 2
|
o(3).sel = -1
|
||||||
OPEN path$ + idepathsep$ + f$ FOR INPUT AS #150: CLOSE #150
|
idetxt(o(1).txt) = ""
|
||||||
|
focus = 1
|
||||||
IF BinaryFormatCheck%(path$, idepathsep$, f$) > 0 THEN
|
GOTO ideopenloop
|
||||||
IF LEN(IdeOpenFile) THEN
|
|
||||||
ideopen$ = "C"
|
|
||||||
EXIT FUNCTION
|
|
||||||
ELSE
|
|
||||||
info = 0: GOTO ideopenloop
|
|
||||||
END IF
|
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
'load file
|
'wildcards search
|
||||||
ideerror = 3
|
IF INSTR(f$, "?") > 0 OR INSTR(f$, "*") > 0 THEN
|
||||||
idet$ = MKL$(0) + MKL$(0): idel = 1: ideli = 1: iden = 1: IdeBmkN = 0
|
IF INSTR(f$, "/") > 0 OR INSTR(f$, "\") > 0 THEN
|
||||||
idesx = 1
|
'path + wildcards
|
||||||
idesy = 1
|
path$ = idezgetfilepath$(path$, f$) 'note: path ending with pathsep needn't contain a file
|
||||||
idecx = 1
|
idetxt(o(3).txt) = idezpathlist$(path$)
|
||||||
idecy = 1
|
o(3).sel = -1
|
||||||
ideselect = 0
|
|
||||||
idefocusline = 0
|
|
||||||
lineinput3load path$ + idepathsep$ + f$
|
|
||||||
idet$ = SPACE$(LEN(lineinput3buffer) * 8)
|
|
||||||
i2 = 1
|
|
||||||
n = 0
|
|
||||||
chrtab$ = CHR$(9)
|
|
||||||
space1$ = " ": space2$ = " ": space3$ = " ": space4$ = " "
|
|
||||||
chr7$ = CHR$(7): chr11$ = CHR$(11): chr12$ = CHR$(12): chr28$ = CHR$(28): chr29$ = CHR$(29): chr30$ = CHR$(30): chr31$ = CHR$(31)
|
|
||||||
DO
|
|
||||||
a$ = lineinput3$
|
|
||||||
l = LEN(a$)
|
|
||||||
IF l THEN asca = ASC(a$) ELSE asca = -1
|
|
||||||
IF asca <> 13 THEN
|
|
||||||
IF asca <> -1 THEN
|
|
||||||
'fix tabs
|
|
||||||
ideopenfixtabs:
|
|
||||||
x = INSTR(a$, chrtab$)
|
|
||||||
IF x THEN
|
|
||||||
x2 = (x - 1) MOD 4
|
|
||||||
IF x2 = 0 THEN a$ = LEFT$(a$, x - 1) + space4$ + RIGHT$(a$, l - x): l = l + 3: GOTO ideopenfixtabs
|
|
||||||
IF x2 = 1 THEN a$ = LEFT$(a$, x - 1) + space3$ + RIGHT$(a$, l - x): l = l + 2: GOTO ideopenfixtabs
|
|
||||||
IF x2 = 2 THEN a$ = LEFT$(a$, x - 1) + space2$ + RIGHT$(a$, l - x): l = l + 1: GOTO ideopenfixtabs
|
|
||||||
IF x2 = 3 THEN a$ = LEFT$(a$, x - 1) + space1$ + RIGHT$(a$, l - x): GOTO ideopenfixtabs
|
|
||||||
END IF
|
|
||||||
END IF 'asca<>-1
|
|
||||||
MID$(idet$, i2, l + 8) = MKL$(l) + a$ + MKL$(l): i2 = i2 + l + 8: n = n + 1
|
|
||||||
END IF
|
END IF
|
||||||
LOOP UNTIL asca = 13
|
idetxt(o(1).txt) = f$
|
||||||
lineinput3buffer = ""
|
idetxt(o(2).txt) = idezfilelist$(path$, 2, f$)
|
||||||
iden = n: IF n = 0 THEN idet$ = MKL$(0) + MKL$(0): iden = 1 ELSE idet$ = LEFT$(idet$, i2 - 1)
|
o(2).sel = -1
|
||||||
ideerror = 1
|
o(1).v1 = LEN(idetxt(o(1).txt))
|
||||||
ideprogname = f$: _TITLE ideprogname + " - QB64"
|
o(1).issel = -1
|
||||||
listOfCustomKeywords$ = LEFT$(listOfCustomKeywords$, customKeywordsLength)
|
o(1).sx1 = 0
|
||||||
idepath$ = path$
|
IF LCASE$(RIGHT$(f$, 4)) <> ".bas" THEN
|
||||||
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
AllFiles = 0
|
||||||
IdeImportBookmarks idepath$ + idepathsep$ + ideprogname$
|
o(4).sel = 0
|
||||||
EXIT FUNCTION
|
prevBASOnly = o(4).sel
|
||||||
|
END IF
|
||||||
|
GOTO ideopenloop
|
||||||
|
END IF
|
||||||
|
|
||||||
|
DirectLoad:
|
||||||
|
path$ = idezgetfilepath$(path$, f$) 'repeat in case of DirectLoad
|
||||||
|
|
||||||
|
IF mode = 1 THEN
|
||||||
|
IF _FILEEXISTS(path$ + idepathsep$ + f$) = 0 THEN
|
||||||
|
'add .bas if not given
|
||||||
|
IF (LCASE$(RIGHT$(f$, 4)) <> ".bas") AND AllFiles = 0 THEN f$ = f$ + ".bas"
|
||||||
|
END IF
|
||||||
|
|
||||||
|
'check file exists
|
||||||
|
ideerror = 2
|
||||||
|
OPEN path$ + idepathsep$ + f$ FOR INPUT AS #150: CLOSE #150
|
||||||
|
|
||||||
|
IF BinaryFormatCheck%(path$, idepathsep$, f$) > 0 THEN
|
||||||
|
IF LEN(IdeOpenFile) THEN
|
||||||
|
idefiledialog$ = "C"
|
||||||
|
EXIT FUNCTION
|
||||||
|
ELSE
|
||||||
|
info = 0: GOTO ideopenloop
|
||||||
|
END IF
|
||||||
|
END IF
|
||||||
|
|
||||||
|
'load file
|
||||||
|
ideerror = 3
|
||||||
|
idet$ = MKL$(0) + MKL$(0): idel = 1: ideli = 1: iden = 1: IdeBmkN = 0
|
||||||
|
idesx = 1
|
||||||
|
idesy = 1
|
||||||
|
idecx = 1
|
||||||
|
idecy = 1
|
||||||
|
ideselect = 0
|
||||||
|
idefocusline = 0
|
||||||
|
lineinput3load path$ + idepathsep$ + f$
|
||||||
|
idet$ = SPACE$(LEN(lineinput3buffer) * 8)
|
||||||
|
i2 = 1
|
||||||
|
n = 0
|
||||||
|
chrtab$ = CHR$(9)
|
||||||
|
space1$ = " ": space2$ = " ": space3$ = " ": space4$ = " "
|
||||||
|
chr7$ = CHR$(7): chr11$ = CHR$(11): chr12$ = CHR$(12): chr28$ = CHR$(28): chr29$ = CHR$(29): chr30$ = CHR$(30): chr31$ = CHR$(31)
|
||||||
|
DO
|
||||||
|
a$ = lineinput3$
|
||||||
|
l = LEN(a$)
|
||||||
|
IF l THEN asca = ASC(a$) ELSE asca = -1
|
||||||
|
IF asca <> 13 THEN
|
||||||
|
IF asca <> -1 THEN
|
||||||
|
'fix tabs
|
||||||
|
ideopenfixtabs:
|
||||||
|
x = INSTR(a$, chrtab$)
|
||||||
|
IF x THEN
|
||||||
|
x2 = (x - 1) MOD 4
|
||||||
|
IF x2 = 0 THEN a$ = LEFT$(a$, x - 1) + space4$ + RIGHT$(a$, l - x): l = l + 3: GOTO ideopenfixtabs
|
||||||
|
IF x2 = 1 THEN a$ = LEFT$(a$, x - 1) + space3$ + RIGHT$(a$, l - x): l = l + 2: GOTO ideopenfixtabs
|
||||||
|
IF x2 = 2 THEN a$ = LEFT$(a$, x - 1) + space2$ + RIGHT$(a$, l - x): l = l + 1: GOTO ideopenfixtabs
|
||||||
|
IF x2 = 3 THEN a$ = LEFT$(a$, x - 1) + space1$ + RIGHT$(a$, l - x): GOTO ideopenfixtabs
|
||||||
|
END IF
|
||||||
|
END IF 'asca<>-1
|
||||||
|
MID$(idet$, i2, l + 8) = MKL$(l) + a$ + MKL$(l): i2 = i2 + l + 8: n = n + 1
|
||||||
|
END IF
|
||||||
|
LOOP UNTIL asca = 13
|
||||||
|
lineinput3buffer = ""
|
||||||
|
iden = n: IF n = 0 THEN idet$ = MKL$(0) + MKL$(0): iden = 1 ELSE idet$ = LEFT$(idet$, i2 - 1)
|
||||||
|
ideerror = 1
|
||||||
|
ideprogname = f$: _TITLE ideprogname + " - " + WindowTitle
|
||||||
|
listOfCustomKeywords$ = LEFT$(listOfCustomKeywords$, customKeywordsLength)
|
||||||
|
idepath$ = path$
|
||||||
|
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
||||||
|
IdeImportBookmarks idepath$ + idepathsep$ + ideprogname$
|
||||||
|
EXIT FUNCTION
|
||||||
|
ELSEIF mode = 2 THEN
|
||||||
|
IF FileHasExtension(f$) = 0 THEN f$ = f$ + ".bas"
|
||||||
|
|
||||||
|
ideerror = 3
|
||||||
|
OPEN path$ + idepathsep$ + f$ FOR BINARY AS #150
|
||||||
|
ideerror = 1
|
||||||
|
IF LOF(150) THEN
|
||||||
|
CLOSE #150
|
||||||
|
a$ = idefileexists(f$)
|
||||||
|
IF a$ = "N" THEN
|
||||||
|
idefiledialog$ = "C"
|
||||||
|
EXIT FUNCTION 'user didn't agree to overwrite
|
||||||
|
END IF
|
||||||
|
ELSE
|
||||||
|
CLOSE #150
|
||||||
|
END IF
|
||||||
|
ideprogname$ = f$: _TITLE ideprogname + " - " + WindowTitle
|
||||||
|
idesave path$ + idepathsep$ + f$
|
||||||
|
idepath$ = path$
|
||||||
|
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
||||||
|
IdeSaveBookmarks idepath$ + idepathsep$ + ideprogname$
|
||||||
|
EXIT FUNCTION
|
||||||
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
ideopenloop:
|
ideopenloop:
|
||||||
|
|
@ -8055,202 +8136,6 @@ SUB idesave (f$)
|
||||||
ideunsaved = 0
|
ideunsaved = 0
|
||||||
END SUB
|
END SUB
|
||||||
|
|
||||||
FUNCTION idesaveas$ (programname$)
|
|
||||||
'-------- generic dialog box header --------
|
|
||||||
PCOPY 0, 2
|
|
||||||
PCOPY 0, 1
|
|
||||||
SCREEN , , 1, 0
|
|
||||||
focus = 1
|
|
||||||
DIM p AS idedbptype
|
|
||||||
DIM o(1 TO 100) AS idedbotype
|
|
||||||
DIM sep AS STRING * 1
|
|
||||||
sep = CHR$(0)
|
|
||||||
'-------- end of generic dialog box header --------
|
|
||||||
|
|
||||||
'-------- init --------
|
|
||||||
path$ = idepath$
|
|
||||||
pathlist$ = idezpathlist$(path$)
|
|
||||||
|
|
||||||
i = 0
|
|
||||||
idepar p, 48, idewy + idesubwindow - 7, "Save As"
|
|
||||||
|
|
||||||
i = i + 1
|
|
||||||
PrevFocus = 1
|
|
||||||
o(i).typ = 1
|
|
||||||
o(i).y = 2
|
|
||||||
o(i).nam = idenewtxt("File #Name")
|
|
||||||
o(i).txt = idenewtxt(programname$)
|
|
||||||
o(i).issel = -1
|
|
||||||
o(i).sx1 = 0
|
|
||||||
o(i).v1 = LEN(programname$)
|
|
||||||
|
|
||||||
'i = i + 1
|
|
||||||
'o(i).typ = 2
|
|
||||||
'o(i).y = 5
|
|
||||||
'o(i).w = 32: o(i).h = 11
|
|
||||||
'o(i).nam = idenewtxt("#Files")
|
|
||||||
'o(i).txt = idenewtxt(filelist$): filelist$ = ""
|
|
||||||
|
|
||||||
i = i + 1
|
|
||||||
o(i).typ = 2
|
|
||||||
'o(i).x = 10:
|
|
||||||
o(i).y = 5
|
|
||||||
o(i).w = 44: o(i).h = idewy + idesubwindow - 14
|
|
||||||
o(i).nam = idenewtxt("#Paths")
|
|
||||||
o(i).txt = idenewtxt(pathlist$): pathlist$ = ""
|
|
||||||
|
|
||||||
i = i + 1
|
|
||||||
o(i).typ = 3
|
|
||||||
o(i).y = idewy + idesubwindow - 7
|
|
||||||
o(i).txt = idenewtxt("OK" + sep + "#Cancel")
|
|
||||||
o(i).dft = 1
|
|
||||||
'-------- end of init --------
|
|
||||||
|
|
||||||
'-------- generic init --------
|
|
||||||
FOR i = 1 TO 100: o(i).par = p: NEXT 'set parent info of objects
|
|
||||||
'-------- end of generic init --------
|
|
||||||
|
|
||||||
DO 'main loop
|
|
||||||
|
|
||||||
'-------- generic display dialog box & objects --------
|
|
||||||
idedrawpar p
|
|
||||||
f = 1: cx = 0: cy = 0
|
|
||||||
FOR i = 1 TO 100
|
|
||||||
IF o(i).typ THEN
|
|
||||||
'prepare object
|
|
||||||
o(i).foc = focus - f 'focus offset
|
|
||||||
o(i).cx = 0: o(i).cy = 0
|
|
||||||
idedrawobj o(i), f 'display object
|
|
||||||
IF o(i).cx THEN cx = o(i).cx: cy = o(i).cy
|
|
||||||
END IF
|
|
||||||
NEXT i
|
|
||||||
lastfocus = f - 1
|
|
||||||
'-------- end of generic display dialog box & objects --------
|
|
||||||
|
|
||||||
'-------- custom display changes --------
|
|
||||||
COLOR 0, 7: LOCATE p.y + 4, p.x + 2: PRINT "Path: ";
|
|
||||||
a$ = path$
|
|
||||||
w = p.w - 8
|
|
||||||
IF LEN(a$) > w - 3 THEN a$ = STRING$(3, 250) + RIGHT$(a$, w - 3)
|
|
||||||
PRINT a$;
|
|
||||||
'-------- end of custom display changes --------
|
|
||||||
|
|
||||||
'update visual page and cursor position
|
|
||||||
PCOPY 1, 0
|
|
||||||
IF cx THEN SCREEN , , 0, 0: LOCATE cy, cx, 1: SCREEN , , 1, 0
|
|
||||||
|
|
||||||
'-------- read input --------
|
|
||||||
change = 0
|
|
||||||
DO
|
|
||||||
GetInput
|
|
||||||
IF mWHEEL THEN change = 1
|
|
||||||
IF KB THEN change = 1
|
|
||||||
IF mCLICK THEN mousedown = 1: change = 1
|
|
||||||
IF mRELEASE THEN mouseup = 1: change = 1
|
|
||||||
IF mB THEN change = 1
|
|
||||||
alt = KALT: IF alt <> oldalt THEN change = 1
|
|
||||||
oldalt = alt
|
|
||||||
_LIMIT 100
|
|
||||||
LOOP UNTIL change
|
|
||||||
IF alt AND NOT KCTRL THEN idehl = 1 ELSE idehl = 0
|
|
||||||
'convert "alt+letter" scancode to letter's ASCII character
|
|
||||||
altletter$ = ""
|
|
||||||
IF alt AND NOT KCTRL THEN
|
|
||||||
IF LEN(K$) = 1 THEN
|
|
||||||
k = ASC(UCASE$(K$))
|
|
||||||
IF k >= 65 AND k <= 90 THEN altletter$ = CHR$(k)
|
|
||||||
END IF
|
|
||||||
END IF
|
|
||||||
SCREEN , , 0, 0: LOCATE , , 0: SCREEN , , 1, 0
|
|
||||||
'-------- end of read input --------
|
|
||||||
|
|
||||||
'-------- generic input response --------
|
|
||||||
info = 0
|
|
||||||
IF K$ = "" THEN K$ = CHR$(255)
|
|
||||||
IF KSHIFT = 0 AND K$ = CHR$(9) THEN focus = focus + 1
|
|
||||||
IF (KSHIFT AND K$ = CHR$(9)) OR (INSTR(_OS$, "MAC") AND K$ = CHR$(25)) THEN focus = focus - 1: K$ = ""
|
|
||||||
IF focus < 1 THEN focus = lastfocus
|
|
||||||
IF focus > lastfocus THEN focus = 1
|
|
||||||
f = 1
|
|
||||||
FOR i = 1 TO 100
|
|
||||||
t = o(i).typ
|
|
||||||
IF t THEN
|
|
||||||
focusoffset = focus - f
|
|
||||||
ideobjupdate o(i), focus, f, focusoffset, K$, altletter$, mB, mousedown, mouseup, mX, mY, info, mWHEEL
|
|
||||||
END IF
|
|
||||||
NEXT
|
|
||||||
'-------- end of generic input response --------
|
|
||||||
|
|
||||||
IF focus <> PrevFocus THEN
|
|
||||||
'Always start with TextBox values selected upon getting focus
|
|
||||||
PrevFocus = focus
|
|
||||||
IF focus = 1 THEN
|
|
||||||
o(focus).v1 = LEN(idetxt(o(focus).txt))
|
|
||||||
IF o(focus).v1 > 0 THEN o(focus).issel = -1
|
|
||||||
o(focus).sx1 = 0
|
|
||||||
END IF
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF K$ = CHR$(27) OR (focus = 4 AND info <> 0) THEN
|
|
||||||
idesaveas$ = "C"
|
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF focus = 2 THEN
|
|
||||||
IF K$ = CHR$(13) OR info = 1 THEN
|
|
||||||
path$ = idezchangepath(path$, idetxt(o(2).stx))
|
|
||||||
idetxt(o(2).txt) = idezpathlist$(path$)
|
|
||||||
o(2).sel = 1
|
|
||||||
IF info = 1 THEN o(2).sel = -1
|
|
||||||
END IF
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF (K$ = CHR$(13) AND focus <> 2) OR (focus = 3 AND info <> 0) THEN
|
|
||||||
f$ = idetxt(o(1).txt)
|
|
||||||
|
|
||||||
'change path?
|
|
||||||
IF f$ = ".." OR f$ = "." THEN f$ = f$ + idepathsep$
|
|
||||||
IF RIGHT$(f$, 1) = idepathsep$ THEN
|
|
||||||
path$ = idezgetfilepath$(path$, f$) 'note: path ending with pathsep needn't contain a file
|
|
||||||
idetxt(o(1).txt) = ""
|
|
||||||
idetxt(o(2).txt) = idezpathlist$(path$)
|
|
||||||
o(2).sel = -1
|
|
||||||
GOTO idesaveasloop
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF FileHasExtension(f$) = 0 THEN f$ = f$ + ".bas"
|
|
||||||
|
|
||||||
path$ = idezgetfilepath$(path$, f$)
|
|
||||||
ideerror = 3
|
|
||||||
OPEN path$ + idepathsep$ + f$ FOR BINARY AS #150
|
|
||||||
ideerror = 1
|
|
||||||
IF LOF(150) THEN
|
|
||||||
CLOSE #150
|
|
||||||
a$ = idefileexists
|
|
||||||
IF a$ = "N" THEN
|
|
||||||
idesaveas$ = "C"
|
|
||||||
EXIT FUNCTION 'user didn't agree to overwrite
|
|
||||||
END IF
|
|
||||||
ELSE
|
|
||||||
CLOSE #150
|
|
||||||
END IF
|
|
||||||
ideprogname$ = f$: _TITLE ideprogname + " - QB64"
|
|
||||||
idesave path$ + idepathsep$ + f$
|
|
||||||
idepath$ = path$
|
|
||||||
IdeAddRecent idepath$ + idepathsep$ + ideprogname$
|
|
||||||
IdeSaveBookmarks idepath$ + idepathsep$ + ideprogname$
|
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
idesaveasloop:
|
|
||||||
|
|
||||||
'end of custom controls
|
|
||||||
mousedown = 0
|
|
||||||
mouseup = 0
|
|
||||||
LOOP
|
|
||||||
|
|
||||||
END FUNCTION
|
|
||||||
|
|
||||||
FUNCTION idesavenow$
|
FUNCTION idesavenow$
|
||||||
|
|
||||||
'-------- generic dialog box header --------
|
'-------- generic dialog box header --------
|
||||||
|
|
@ -8574,6 +8459,10 @@ SUB ideshowtext
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF l <= iden THEN
|
IF l <= iden THEN
|
||||||
|
DO UNTIL l < UBOUND(InValidLine) 'make certain we have enough InValidLine elements to cover us in case someone scrolls QB64
|
||||||
|
REDIM _PRESERVE InValidLine(UBOUND(InValidLine) + 1000) AS _BIT ' to the end of a program before the IDE has finished
|
||||||
|
LOOP ' verifying the code and growing the array during the IDE passes.
|
||||||
|
|
||||||
a$ = idegetline(l)
|
a$ = idegetline(l)
|
||||||
link_idecx = 0
|
link_idecx = 0
|
||||||
rgb_idecx = 0
|
rgb_idecx = 0
|
||||||
|
|
@ -8668,13 +8557,12 @@ SUB ideshowtext
|
||||||
FindInclude = INSTR(a2$, "$INCLUDE")
|
FindInclude = INSTR(a2$, "$INCLUDE")
|
||||||
IF FindInclude > 0 THEN
|
IF FindInclude > 0 THEN
|
||||||
link_idecx = LEN(a$)
|
link_idecx = LEN(a$)
|
||||||
ActiveINCLUDELink = idecy
|
|
||||||
FindApostrophe1 = INSTR(FindInclude + 8, a2$, "'")
|
FindApostrophe1 = INSTR(FindInclude + 8, a2$, "'")
|
||||||
FindApostrophe2 = INSTR(FindApostrophe1 + 1, a2$, "'")
|
FindApostrophe2 = INSTR(FindApostrophe1 + 1, a2$, "'")
|
||||||
ActiveINCLUDELinkFile = MID$(a$, FindApostrophe1 + 1, FindApostrophe2 - FindApostrophe1 - 1)
|
ActiveINCLUDELinkFile = MID$(a$, FindApostrophe1 + 1, FindApostrophe2 - FindApostrophe1 - 1)
|
||||||
p$ = idepath$ + pathsep$
|
p$ = idepath$ + pathsep$
|
||||||
f$ = p$ + ActiveINCLUDELinkFile
|
f$ = p$ + ActiveINCLUDELinkFile
|
||||||
IF _FILEEXISTS(f$) THEN a$ = a$ + " --> Double-click to open"
|
IF _FILEEXISTS(f$) THEN a$ = a$ + " --> Double-click to open": ActiveINCLUDELink = idecy
|
||||||
END IF
|
END IF
|
||||||
END IF 'l = idecy
|
END IF 'l = idecy
|
||||||
|
|
||||||
|
|
@ -8731,6 +8619,8 @@ SUB ideshowtext
|
||||||
|
|
||||||
COLOR 13
|
COLOR 13
|
||||||
|
|
||||||
|
IF InValidLine(l) AND 1 THEN COLOR 7: GOTO SkipSyntaxHighlighter
|
||||||
|
|
||||||
IF (LEN(oldChar$) > 0 OR m = 1) AND inquote = 0 AND isKeyword = 0 THEN
|
IF (LEN(oldChar$) > 0 OR m = 1) AND inquote = 0 AND isKeyword = 0 THEN
|
||||||
IF INSTR(initialNum.char$, thisChar$) > 0 AND oldChar$ <> ")" AND (INSTR(char.sep$, oldChar$) > 0 OR oldChar$ = "?") THEN
|
IF INSTR(initialNum.char$, thisChar$) > 0 AND oldChar$ <> ")" AND (INSTR(char.sep$, oldChar$) > 0 OR oldChar$ = "?") THEN
|
||||||
'a number literal
|
'a number literal
|
||||||
|
|
@ -8805,6 +8695,11 @@ SUB ideshowtext
|
||||||
COLOR 14
|
COLOR 14
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
SkipSyntaxHighlighter:
|
||||||
|
|
||||||
|
IF l = idecy AND ((link_idecx > 0 AND m > link_idecx) OR _
|
||||||
|
(rgb_idecx > 0 AND m > rgb_idecx)) THEN COLOR 10
|
||||||
|
|
||||||
IF l = idecy AND (m = bracket1 OR m = bracket2) THEN
|
IF l = idecy AND (m = bracket1 OR m = bracket2) THEN
|
||||||
COLOR , 5
|
COLOR , 5
|
||||||
ELSEIF multiHighlightLength > 0 AND multihighlight = -1 THEN
|
ELSEIF multiHighlightLength > 0 AND multihighlight = -1 THEN
|
||||||
|
|
@ -8814,14 +8709,6 @@ SUB ideshowtext
|
||||||
COLOR , prevBG%
|
COLOR , prevBG%
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF l = idecy AND ((link_idecx > 0 AND m > link_idecx) OR _
|
|
||||||
(rgb_idecx > 0 AND m > rgb_idecx)) THEN COLOR 10
|
|
||||||
|
|
||||||
DO UNTIL l < UBOUND(InValidLine) 'make certain we have enough InValidLine elements to cover us in case someone scrolls QB64
|
|
||||||
REDIM _PRESERVE InValidLine(UBOUND(InValidLine) + 1000) AS _BIT ' to the end of a program before the IDE has finished
|
|
||||||
LOOP ' verifying the code and growing the array during the IDE passes.
|
|
||||||
IF InValidLine(l) AND 1 THEN COLOR 7
|
|
||||||
|
|
||||||
IF ShowLineNumbers THEN
|
IF ShowLineNumbers THEN
|
||||||
IF (2 + m - idesx) + maxLineNumberLength >= 2 + maxLineNumberLength AND (2 + m - idesx) + maxLineNumberLength < idewx THEN
|
IF (2 + m - idesx) + maxLineNumberLength >= 2 + maxLineNumberLength AND (2 + m - idesx) + maxLineNumberLength < idewx THEN
|
||||||
LOCATE y + 3, (2 + m - idesx) + maxLineNumberLength
|
LOCATE y + 3, (2 + m - idesx) + maxLineNumberLength
|
||||||
|
|
@ -9920,7 +9807,7 @@ SUB ideobjupdate (o AS idedbotype, focus, f, focusoffset, kk$, altletter$, mb, m
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF k = 255 THEN
|
IF k = 255 THEN
|
||||||
IF o.sel > 0 THEN idetxt(o.stx) = ListBoxITEMS(o.sel)
|
IF o.sel > 0 AND o.sel <= UBOUND(ListBoxITEMS) THEN idetxt(o.stx) = ListBoxITEMS(o.sel)
|
||||||
GOTO selected 'Search is not performed if kk$ isn't a printable character
|
GOTO selected 'Search is not performed if kk$ isn't a printable character
|
||||||
ELSE
|
ELSE
|
||||||
SearchTerm$ = SearchTerm$ + UCASE$(kk$)
|
SearchTerm$ = SearchTerm$ + UCASE$(kk$)
|
||||||
|
|
@ -10260,7 +10147,7 @@ FUNCTION idezchangepath$ (path$, newpath$)
|
||||||
|
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
||||||
FUNCTION idezfilelist$ (path$, method) 'method0=*.bas, method1=*.*
|
FUNCTION idezfilelist$ (path$, method, mask$) 'method0=*.bas, method1=*.*, method2=custom mask
|
||||||
DIM sep AS STRING * 1
|
DIM sep AS STRING * 1
|
||||||
sep = CHR$(0)
|
sep = CHR$(0)
|
||||||
|
|
||||||
|
|
@ -10268,6 +10155,7 @@ FUNCTION idezfilelist$ (path$, method) 'method0=*.bas, method1=*.*
|
||||||
OPEN ".\internal\temp\files.txt" FOR OUTPUT AS #150: CLOSE #150
|
OPEN ".\internal\temp\files.txt" FOR OUTPUT AS #150: CLOSE #150
|
||||||
IF method = 0 THEN SHELL _HIDE "dir /b /ON /A-D " + QuotedFilename$(path$) + "\*.bas >.\internal\temp\files.txt"
|
IF method = 0 THEN SHELL _HIDE "dir /b /ON /A-D " + QuotedFilename$(path$) + "\*.bas >.\internal\temp\files.txt"
|
||||||
IF method = 1 THEN SHELL _HIDE "dir /b /ON /A-D " + QuotedFilename$(path$) + "\*.* >.\internal\temp\files.txt"
|
IF method = 1 THEN SHELL _HIDE "dir /b /ON /A-D " + QuotedFilename$(path$) + "\*.* >.\internal\temp\files.txt"
|
||||||
|
IF method = 2 THEN SHELL _HIDE "dir /b /ON /A-D " + QuotedFilename$(path$) + "\" + QuotedFilename$(mask$) + " >.\internal\temp\files.txt"
|
||||||
filelist$ = ""
|
filelist$ = ""
|
||||||
OPEN ".\internal\temp\files.txt" FOR INPUT AS #150
|
OPEN ".\internal\temp\files.txt" FOR INPUT AS #150
|
||||||
DO UNTIL EOF(150)
|
DO UNTIL EOF(150)
|
||||||
|
|
@ -10283,32 +10171,39 @@ FUNCTION idezfilelist$ (path$, method) 'method0=*.bas, method1=*.*
|
||||||
|
|
||||||
IF os$ = "LNX" THEN
|
IF os$ = "LNX" THEN
|
||||||
filelist$ = ""
|
filelist$ = ""
|
||||||
FOR i = 1 TO 2 - method
|
IF method = 0 THEN
|
||||||
OPEN "./internal/temp/files.txt" FOR OUTPUT AS #150: CLOSE #150
|
FOR i = 1 TO 2
|
||||||
IF method = 0 THEN
|
OPEN "./internal/temp/files.txt" FOR OUTPUT AS #150: CLOSE #150
|
||||||
IF i = 1 THEN SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*.bas" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
IF i = 1 THEN SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*.bas" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
||||||
IF i = 2 THEN SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*.BAS" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
IF i = 2 THEN SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*.BAS" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
||||||
END IF
|
GOSUB AddToList
|
||||||
IF method = 1 THEN
|
NEXT
|
||||||
IF i = 1 THEN SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
ELSEIF method = 1 THEN
|
||||||
END IF
|
SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + "*" + CHR$(34) + " | sort >./internal/temp/files.txt"
|
||||||
OPEN "./internal/temp/files.txt" FOR INPUT AS #150
|
GOSUB AddToList
|
||||||
DO UNTIL EOF(150)
|
ELSEIF method = 2 THEN
|
||||||
LINE INPUT #150, a$
|
SHELL _HIDE "find " + QuotedFilename$(path$) + " -maxdepth 1 -type f -name " + CHR$(34) + mask$ + CHR$(34) + " | sort >./internal/temp/files.txt"
|
||||||
IF LEN(a$) = 0 THEN EXIT DO
|
GOSUB AddToList
|
||||||
FOR x = LEN(a$) TO 1 STEP -1
|
END IF
|
||||||
a2$ = MID$(a$, x, 1)
|
|
||||||
IF a2$ = "/" THEN
|
|
||||||
a$ = RIGHT$(a$, LEN(a$) - x)
|
|
||||||
EXIT FOR
|
|
||||||
END IF
|
|
||||||
NEXT
|
|
||||||
IF filelist$ = "" THEN filelist$ = a$ ELSE filelist$ = filelist$ + sep + a$
|
|
||||||
LOOP
|
|
||||||
CLOSE #150
|
|
||||||
NEXT
|
|
||||||
idezfilelist$ = filelist$
|
idezfilelist$ = filelist$
|
||||||
EXIT FUNCTION
|
EXIT FUNCTION
|
||||||
|
|
||||||
|
AddToList:
|
||||||
|
OPEN "./internal/temp/files.txt" FOR INPUT AS #150
|
||||||
|
DO UNTIL EOF(150)
|
||||||
|
LINE INPUT #150, a$
|
||||||
|
IF LEN(a$) = 0 THEN EXIT DO
|
||||||
|
FOR x = LEN(a$) TO 1 STEP -1
|
||||||
|
a2$ = MID$(a$, x, 1)
|
||||||
|
IF a2$ = "/" THEN
|
||||||
|
a$ = RIGHT$(a$, LEN(a$) - x)
|
||||||
|
EXIT FOR
|
||||||
|
END IF
|
||||||
|
NEXT
|
||||||
|
IF filelist$ = "" THEN filelist$ = a$ ELSE filelist$ = filelist$ + sep + a$
|
||||||
|
LOOP
|
||||||
|
CLOSE #150
|
||||||
|
RETURN
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
@ -10316,23 +10211,7 @@ END FUNCTION
|
||||||
FUNCTION idezgetroot$
|
FUNCTION idezgetroot$
|
||||||
'note: does NOT including a trailing / or \ on the right
|
'note: does NOT including a trailing / or \ on the right
|
||||||
|
|
||||||
IF os$ = "WIN" THEN
|
idezgetroot$ = _CWD$
|
||||||
SHELL _HIDE "cd >.\internal\temp\root.txt"
|
|
||||||
OPEN ".\internal\temp\root.txt" FOR INPUT AS #150
|
|
||||||
LINE INPUT #150, a$
|
|
||||||
idezgetroot$ = a$
|
|
||||||
CLOSE #150
|
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF os$ = "LNX" THEN
|
|
||||||
SHELL _HIDE "pwd >./internal/temp/root.txt"
|
|
||||||
OPEN "./internal/temp/root.txt" FOR INPUT AS #150
|
|
||||||
LINE INPUT #150, a$
|
|
||||||
idezgetroot$ = a$
|
|
||||||
CLOSE #150
|
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
||||||
|
|
@ -10403,32 +10282,16 @@ END FUNCTION
|
||||||
FUNCTION ideztakepath$ (f$) 'assume f$ contains a filename with an optional path
|
FUNCTION ideztakepath$ (f$) 'assume f$ contains a filename with an optional path
|
||||||
p$ = ""
|
p$ = ""
|
||||||
|
|
||||||
IF os$ = "WIN" THEN
|
FOR i = LEN(f$) TO 1 STEP -1
|
||||||
FOR i = LEN(f$) TO 1 STEP -1
|
a$ = MID$(f$, i, 1)
|
||||||
a$ = MID$(f$, i, 1)
|
IF a$ = "\" OR a$ = "/" THEN
|
||||||
IF a$ = "\" THEN
|
p$ = LEFT$(f$, i - 1)
|
||||||
p$ = LEFT$(f$, i - 1)
|
f$ = RIGHT$(f$, LEN(f$) - i)
|
||||||
f$ = RIGHT$(f$, LEN(f$) - i)
|
EXIT FOR
|
||||||
EXIT FOR
|
END IF
|
||||||
END IF
|
NEXT
|
||||||
NEXT
|
ideztakepath$ = p$
|
||||||
ideztakepath$ = p$
|
EXIT FUNCTION
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
IF os$ = "LNX" THEN
|
|
||||||
FOR i = LEN(f$) TO 1 STEP -1
|
|
||||||
a$ = MID$(f$, i, 1)
|
|
||||||
IF a$ = "/" THEN
|
|
||||||
p$ = LEFT$(f$, i - 1)
|
|
||||||
f$ = RIGHT$(f$, LEN(f$) - i)
|
|
||||||
EXIT FOR
|
|
||||||
END IF
|
|
||||||
NEXT
|
|
||||||
ideztakepath$ = p$
|
|
||||||
EXIT FUNCTION
|
|
||||||
END IF
|
|
||||||
|
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
||||||
'file f$ exists, and may contain a path
|
'file f$ exists, and may contain a path
|
||||||
|
|
@ -10438,10 +10301,13 @@ END FUNCTION
|
||||||
FUNCTION idezgetfilepath$ (root$, f$)
|
FUNCTION idezgetfilepath$ (root$, f$)
|
||||||
'step #1: seperate file's name from its path (if any)
|
'step #1: seperate file's name from its path (if any)
|
||||||
p$ = ideztakepath$(f$) 'note: this is a simple seperation of the string
|
p$ = ideztakepath$(f$) 'note: this is a simple seperation of the string
|
||||||
|
|
||||||
'step #2: if path was undefined, set it to root
|
'step #2: if path was undefined, set it to root
|
||||||
IF LEN(p$) = 0 THEN p$ = root$
|
IF LEN(p$) = 0 THEN p$ = root$
|
||||||
|
|
||||||
'step #3: if path is relative, make it relative to root$
|
'step #3: if path is relative, make it relative to root$
|
||||||
IF LEFT$(p$, 1) = "." THEN p$ = root$ + idepathsep$ + p$
|
IF _DIREXISTS(root$ + idepathsep$ + p$) THEN p$ = root$ + idepathsep$ + p$
|
||||||
|
|
||||||
'step #4: attempt a CHDIR to the path to (i) validate its existance
|
'step #4: attempt a CHDIR to the path to (i) validate its existance
|
||||||
' & (ii) allow listing the paths full name
|
' & (ii) allow listing the paths full name
|
||||||
ideerror = 4 'path not found
|
ideerror = 4 'path not found
|
||||||
|
|
@ -10449,22 +10315,11 @@ FUNCTION idezgetfilepath$ (root$, f$)
|
||||||
IF os$ = "WIN" THEN
|
IF os$ = "WIN" THEN
|
||||||
IF RIGHT$(p2$, 1) = ":" THEN p2$ = p2$ + "\" 'force change to root of drive
|
IF RIGHT$(p2$, 1) = ":" THEN p2$ = p2$ + "\" 'force change to root of drive
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
CHDIR p2$
|
CHDIR p2$
|
||||||
ideerror = 1
|
ideerror = 1
|
||||||
'step #5: get the path's full name (assume success)
|
'step #5: get the path's full name (assume success)
|
||||||
IF os$ = "WIN" THEN
|
p$ = _CWD$
|
||||||
SHELL _HIDE "cd >" + QuotedFilename$(ideroot$) + "\internal\temp\root.txt"
|
|
||||||
OPEN ideroot$ + "\internal\temp\root.txt" FOR INPUT AS #150
|
|
||||||
LINE INPUT #150, p$
|
|
||||||
IF RIGHT$(p$, 1) = "\" THEN p$ = LEFT$(p$, LEN(p$) - 1) 'strip trailing \ after root drive path
|
|
||||||
CLOSE #150
|
|
||||||
END IF
|
|
||||||
IF os$ = "LNX" THEN
|
|
||||||
SHELL _HIDE "pwd >" + QuotedFilename$(ideroot$) + "/internal/temp/root.txt"
|
|
||||||
OPEN ideroot$ + "/internal/temp/root.txt" FOR INPUT AS #150
|
|
||||||
LINE INPUT #150, p$
|
|
||||||
CLOSE #150
|
|
||||||
END IF
|
|
||||||
'step #6: restore root path (assume success)
|
'step #6: restore root path (assume success)
|
||||||
CHDIR ideroot$
|
CHDIR ideroot$
|
||||||
'important: no validation of f$ necessary
|
'important: no validation of f$ necessary
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ DEFLNG A-Z
|
||||||
REDIM SHARED OName(0) AS STRING 'Operation Name
|
REDIM SHARED OName(0) AS STRING 'Operation Name
|
||||||
REDIM SHARED PL(0) AS INTEGER 'Priority Level
|
REDIM SHARED PL(0) AS INTEGER 'Priority Level
|
||||||
DIM SHARED QuickReturn AS INTEGER
|
DIM SHARED QuickReturn AS INTEGER
|
||||||
Set_OrderOfOperations 'This will also make certain our directories are valid, and if not make them.
|
Set_OrderOfOperations
|
||||||
|
|
||||||
REDIM EveryCaseSet(100), SelectCaseCounter AS _UNSIGNED LONG
|
REDIM EveryCaseSet(100), SelectCaseCounter AS _UNSIGNED LONG
|
||||||
DIM ExecLevel(255), ExecCounter AS INTEGER
|
DIM ExecLevel(255), ExecCounter AS INTEGER
|
||||||
|
|
@ -53,7 +53,7 @@ IF _DIREXISTS("internal") = 0 THEN
|
||||||
DO
|
DO
|
||||||
_LIMIT 1
|
_LIMIT 1
|
||||||
LOOP UNTIL INKEY$ <> ""
|
LOOP UNTIL INKEY$ <> ""
|
||||||
SYSTEM
|
SYSTEM 1
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
DIM SHARED Include_GDB_Debugging_Info 'set using "options.bin"
|
DIM SHARED Include_GDB_Debugging_Info 'set using "options.bin"
|
||||||
|
|
@ -80,10 +80,11 @@ DIM SHARED DEPENDENCY(1 TO DEPENDENCY_LAST)
|
||||||
DIM SHARED UseGL 'declared SUB _GL (no params)
|
DIM SHARED UseGL 'declared SUB _GL (no params)
|
||||||
|
|
||||||
|
|
||||||
DIM SHARED OS_BITS AS LONG
|
DIM SHARED OS_BITS AS LONG, WindowTitle AS STRING
|
||||||
OS_BITS = 64: IF INSTR(_OS$, "[32BIT]") THEN OS_BITS = 32
|
OS_BITS = 64: IF INSTR(_OS$, "[32BIT]") THEN OS_BITS = 32
|
||||||
|
|
||||||
IF OS_BITS = 32 THEN _TITLE "QB64 x32" ELSE _TITLE "QB64 x64"
|
IF OS_BITS = 32 THEN WindowTitle = "QB64 x32" ELSE WindowTitle = "QB64 x64"
|
||||||
|
_TITLE WindowTitle
|
||||||
|
|
||||||
DIM SHARED ConsoleMode, No_C_Compile_Mode, NoIDEMode
|
DIM SHARED ConsoleMode, No_C_Compile_Mode, NoIDEMode
|
||||||
DIM SHARED VerboseMode AS _BYTE, CMDLineFile AS STRING
|
DIM SHARED VerboseMode AS _BYTE, CMDLineFile AS STRING
|
||||||
|
|
@ -255,7 +256,7 @@ ELSE
|
||||||
OPEN tmpdir$ + "temp.bin" FOR OUTPUT LOCK WRITE AS #26
|
OPEN tmpdir$ + "temp.bin" FOR OUTPUT LOCK WRITE AS #26
|
||||||
DO WHILE E
|
DO WHILE E
|
||||||
i = i + 1
|
i = i + 1
|
||||||
IF i = 1000 THEN PRINT "Unable to locate the 'internal' folder": END
|
IF i = 1000 THEN PRINT "Unable to locate the 'internal' folder": END 1
|
||||||
MKDIR ".\internal\temp" + str2$(i)
|
MKDIR ".\internal\temp" + str2$(i)
|
||||||
IF os$ = "WIN" THEN tmpdir$ = ".\internal\temp" + str2$(i) + "\": tmpdir2$ = "..\\temp" + str2$(i) + "\\"
|
IF os$ = "WIN" THEN tmpdir$ = ".\internal\temp" + str2$(i) + "\": tmpdir2$ = "..\\temp" + str2$(i) + "\\"
|
||||||
IF os$ = "LNX" THEN tmpdir$ = "./internal/temp" + str2$(i) + "/": tmpdir2$ = "../temp" + str2$(i) + "/"
|
IF os$ = "LNX" THEN tmpdir$ = "./internal/temp" + str2$(i) + "/": tmpdir2$ = "../temp" + str2$(i) + "/"
|
||||||
|
|
@ -4966,12 +4967,14 @@ DO
|
||||||
|
|
||||||
'check for open controls (copy #2)
|
'check for open controls (copy #2)
|
||||||
IF controllevel <> 0 AND controltype(controllevel) <> 6 THEN 'It's OK for subs to be inside $IF blocks
|
IF controllevel <> 0 AND controltype(controllevel) <> 6 THEN 'It's OK for subs to be inside $IF blocks
|
||||||
x = controltype(controllevel)
|
a$ = "Unidentified open control block"
|
||||||
IF x = 1 THEN a$ = "IF without END IF"
|
SELECT CASE controltype(controllevel)
|
||||||
IF x = 2 THEN a$ = "FOR without NEXT"
|
CASE 1: a$ = "IF without END IF"
|
||||||
IF x = 3 OR x = 4 THEN a$ = "DO without LOOP"
|
CASE 2: a$ = "FOR without NEXT"
|
||||||
IF x = 5 THEN a$ = "WHILE without WEND"
|
CASE 3, 4: a$ = "DO without LOOP"
|
||||||
IF (x >= 10 AND x <= 17) OR x = 18 OR x = 19 THEN a$ = "SELECT CASE without END SELECT"
|
CASE 5: a$ = "WHILE without WEND"
|
||||||
|
CASE 10 TO 19: a$ = "SELECT CASE without END SELECT"
|
||||||
|
END SELECT
|
||||||
linenumber = controlref(controllevel)
|
linenumber = controlref(controllevel)
|
||||||
GOTO errmes
|
GOTO errmes
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -5449,12 +5452,14 @@ DO
|
||||||
|
|
||||||
'check for open controls (copy #3)
|
'check for open controls (copy #3)
|
||||||
IF controllevel <> 0 AND controltype(controllevel) <> 6 AND controltype(controllevel) <> 32 THEN 'It's OK for subs to be inside $IF blocks
|
IF controllevel <> 0 AND controltype(controllevel) <> 6 AND controltype(controllevel) <> 32 THEN 'It's OK for subs to be inside $IF blocks
|
||||||
x = controltype(controllevel)
|
a$ = "Unidentified open control block"
|
||||||
IF x = 1 THEN a$ = "IF without END IF"
|
SELECT CASE controltype(controllevel)
|
||||||
IF x = 2 THEN a$ = "FOR without NEXT"
|
CASE 1: a$ = "IF without END IF"
|
||||||
IF x = 3 OR x = 4 THEN a$ = "DO without LOOP"
|
CASE 2: a$ = "FOR without NEXT"
|
||||||
IF x = 5 THEN a$ = "WHILE without WEND"
|
CASE 3, 4: a$ = "DO without LOOP"
|
||||||
IF (x >= 10 AND x <= 17) OR x = 18 OR x = 19 THEN a$ = "SELECT CASE without END SELECT"
|
CASE 5: a$ = "WHILE without WEND"
|
||||||
|
CASE 10 TO 19: a$ = "SELECT CASE without END SELECT"
|
||||||
|
END SELECT
|
||||||
linenumber = controlref(controllevel)
|
linenumber = controlref(controllevel)
|
||||||
GOTO errmes
|
GOTO errmes
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -11043,19 +11048,23 @@ IF definingtype THEN linenumber = definingtypeerror: a$ = "TYPE without END TYPE
|
||||||
|
|
||||||
'check for open controls (copy #1)
|
'check for open controls (copy #1)
|
||||||
IF controllevel THEN
|
IF controllevel THEN
|
||||||
x = controltype(controllevel)
|
|
||||||
a$ = "Unidentified open control block"
|
a$ = "Unidentified open control block"
|
||||||
IF x = 1 THEN a$ = "IF without END IF"
|
SELECT CASE controltype(controllevel)
|
||||||
IF x = 2 THEN a$ = "FOR without NEXT"
|
CASE 1: a$ = "IF without END IF"
|
||||||
IF x = 3 OR x = 4 THEN a$ = "DO without LOOP"
|
CASE 2: a$ = "FOR without NEXT"
|
||||||
IF x = 5 THEN a$ = "WHILE without WEND"
|
CASE 3, 4: a$ = "DO without LOOP"
|
||||||
IF x = 6 THEN a$ = "$IF without $END IF"
|
CASE 5: a$ = "WHILE without WEND"
|
||||||
IF (x >= 10 AND x <= 17) OR x = 18 OR x = 19 THEN a$ = "SELECT CASE without END SELECT"
|
CASE 6: a$ = "$IF without $END IF"
|
||||||
|
CASE 10 TO 19: a$ = "SELECT CASE without END SELECT"
|
||||||
|
CASE 32: a$ = "SUB/FUNCTION without END SUB/FUNCTION"
|
||||||
|
END SELECT
|
||||||
linenumber = controlref(controllevel)
|
linenumber = controlref(controllevel)
|
||||||
GOTO errmes
|
GOTO errmes
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF LEN(subfunc) THEN a$ = "SUB/FUNCTION without END SUB/FUNCTION": GOTO errmes
|
IF ideindentsubs = 0 THEN
|
||||||
|
IF LEN(subfunc) THEN a$ = "SUB/FUNCTION without END SUB/FUNCTION": GOTO errmes
|
||||||
|
END IF
|
||||||
|
|
||||||
'close the error handler (cannot be put in 'closemain' because subs/functions can also add error jumps to this file)
|
'close the error handler (cannot be put in 'closemain' because subs/functions can also add error jumps to this file)
|
||||||
PRINT #14, "exit(99);" 'in theory this line should never be run!
|
PRINT #14, "exit(99);" 'in theory this line should never be run!
|
||||||
|
|
@ -12946,7 +12955,7 @@ FUNCTION ParseCMDLineArgs$ ()
|
||||||
'in which case they're simply asking for trouble).
|
'in which case they're simply asking for trouble).
|
||||||
FOR i = 1 TO _COMMANDCOUNT
|
FOR i = 1 TO _COMMANDCOUNT
|
||||||
token$ = COMMAND$(i)
|
token$ = COMMAND$(i)
|
||||||
IF LCASE$(token$) = "-help" OR LCASE$(token$) = "--help" OR LCASE$(token$) = "-h" OR LCASE$(token$) = "/help" THEN token$ = "-?"
|
IF LCASE$(token$) = "/?" OR LCASE$(token$) = "--help" OR LCASE$(token$) = "/help" THEN token$ = "-?"
|
||||||
SELECT CASE LCASE$(LEFT$(token$, 2))
|
SELECT CASE LCASE$(LEFT$(token$, 2))
|
||||||
CASE "-?" 'Command-line help
|
CASE "-?" 'Command-line help
|
||||||
_DEST _CONSOLE
|
_DEST _CONSOLE
|
||||||
|
|
@ -12962,7 +12971,7 @@ FUNCTION ParseCMDLineArgs$ ()
|
||||||
PRINT " console"
|
PRINT " console"
|
||||||
PRINT " -p Purge all pre-compiled content first"
|
PRINT " -p Purge all pre-compiled content first"
|
||||||
PRINT " -z Generate C code without compiling to executable"
|
PRINT " -z Generate C code without compiling to executable"
|
||||||
PRINT " -o <output file> Write output executable to <output file>"
|
PRINT " -o <output file> Write output executable to <output file>"
|
||||||
PRINT " -e Enables OPTION _EXPLICIT, making variable declaration"
|
PRINT " -e Enables OPTION _EXPLICIT, making variable declaration"
|
||||||
PRINT " mandatory (per-compilation; doesn't affect the"
|
PRINT " mandatory (per-compilation; doesn't affect the"
|
||||||
PRINT " source file or global settings)"
|
PRINT " source file or global settings)"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue