Apple-2gs-SW/ORCA-C
1
0
Fork 0
mirror of https://github.com/byteworksinc/ORCA-C.git synced 2024-05-29 04:41:27 +00:00
Code Issues Projects Releases Wiki Activity

Allow '/*' or '//' in character constants.

Browse Source 
These should not start a comment.
This commit is contained in:
Stephen Heumann 2020-02-04 18:42:55 -06:00
parent 0065e89842
commit 32614abfca
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scanner.asm
View File

@ -332,10 +332,10 @@ lb9 anop
! !
! {if it's a comment, skip the comment } ! {if it's a comment, skip the comment }
! {characters and return a space. } ! {characters and return a space. }
! if (not doingstring) and (ch = '/') and (chPtr <> eofPtr) ! if (not doingStringOrCharacter) and (ch = '/') and (chPtr <> eofPtr)
! and ((chr(chPtr^) = '*') ! and ((chr(chPtr^) = '*')
! or ((chr(chPtr^) = '/') and allowSlashSlashComments))then begin ! or ((chr(chPtr^) = '/') and allowSlashSlashComments))then begin
lda doingstring lda doingStringOrCharacter
jne lc6 jne lc6
lda ch lda ch
cmp #'/' cmp #'/'

14
Scanner.pas
View File

@ -238,7 +238,7 @@ type
var var
dateStr: longStringPtr; {macro date string} dateStr: longStringPtr; {macro date string}
doingPPExpression: boolean; {are we processing a preprocessor expression?} doingPPExpression: boolean; {are we processing a preprocessor expression?}
doingstring: boolean; {used to suppress comments in strings} doingStringOrCharacter: boolean; {used to suppress comments in strings}
errors: array[1..maxErr] of errorType; {errors in this line} errors: array[1..maxErr] of errorType; {errors in this line}
eofPtr: ptr; {points one byte past the last char in the file} eofPtr: ptr; {points one byte past the last char in the file}
fileList: filePtr; {include file list} fileList: filePtr; {include file list}
@ -3677,7 +3677,7 @@ needWriteLine := false; {no lines are pending}
wroteLine := false; {current line has not been written} wroteLine := false; {current line has not been written}
switchLanguages := false; {not switching languages} switchLanguages := false; {not switching languages}
lastWasReturn := false; {last char was not return} lastWasReturn := false; {last char was not return}
doingstring := false; {not doing a string} doingStringOrCharacter := false; {not doing a string}
doingPPExpression := false; {not doing a preprocessor expression} doingPPExpression := false; {not doing a preprocessor expression}
unix_1 := false; {int is 16 bits} unix_1 := false; {int is 16 bits}
lintIsError := true; {lint messages are considered errors} lintIsError := true; {lint messages are considered errors}
@ -4044,7 +4044,9 @@ var
{set up locals} {set up locals}
cnt := 0; cnt := 0;
result := 0; result := 0;
doingStringOrCharacter := true;
{skip the leading quote} {skip the leading quote}
NextCh; NextCh;
@ -4054,6 +4056,7 @@ var
cnt := cnt + 1; cnt := cnt + 1;
result := (result << 8) | EscapeCh; result := (result << 8) | EscapeCh;
end; {while} end; {while}
doingStringOrCharacter := false;
{skip the closing quote} {skip the closing quote}
if (charKinds[ord(ch)] = ch_char) then begin if (charKinds[ord(ch)] = ch_char) then begin
@ -4429,7 +4432,7 @@ case charKinds[ord(ch)] of
ch_char : CharConstant; {character constants} ch_char : CharConstant; {character constants}
ch_string: begin {string constants} ch_string: begin {string constants}
doingstring := true; {change character scanning} doingStringOrCharacter := true; {change character scanning}
token.kind := stringconst; {set up the token} token.kind := stringconst; {set up the token}
token.class := stringConstant; token.class := stringConstant;
i := 0; {set up for the string scan} i := 0; {set up for the string scan}
@ -4462,7 +4465,7 @@ case charKinds[ord(ch)] of
if (i = 1) and ispstring then if (i = 1) and ispstring then
setLength := true; setLength := true;
end; {while} end; {while}
doingstring := false; {process the end of the string} doingStringOrCharacter := false; {process the end of the string}
if ch = '"' then if ch = '"' then
NextCh NextCh
else else
@ -4474,7 +4477,6 @@ case charKinds[ord(ch)] of
token.sval := pointer(Malloc(i+3)); {put the string in the string pool} token.sval := pointer(Malloc(i+3)); {put the string in the string pool}
CopyLongString(token.sval, pointer(sPtr)); CopyLongString(token.sval, pointer(sPtr));
dispose(sPtr); dispose(sPtr);
doingstring := false;
token.sval^.str[i+1] := chr(0); {add null in case the string is extended} token.sval^.str[i+1] := chr(0); {add null in case the string is extended}
end; end;