paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 16:09:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

compiler: better handling of '$','%','&' in macros

Browse Source 
git-svn-id: trunk@25462 -
This commit is contained in:
paul 2013-09-12 02:33:02 +00:00
parent 0eb4244a67
commit cac09f9df1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/scanner.pas
View File

@ -201,7 +201,6 @@ interface
procedure readnumber;
function readid:string;
function readval:longint;
function readval_asstring:string;
function readcomment:string;
function readquotedstring:string;
function readstate:char;
@ -3834,13 +3833,6 @@ type
end;
function tscannerfile.readval_asstring:string;
begin
readnumber;
readval_asstring:=pattern;
end;
function tscannerfile.readcomment:string;
var
i : longint;
@ -5102,10 +5094,23 @@ exit_label:
readpreproc:=_INTCONST;
current_scanner.preproc_pattern:=pattern;
end;
'$','%','&' :
'$','%':
begin
current_scanner.preproc_pattern:=readval_asstring;
readpreproc:=_ID;
readnumber;
current_scanner.preproc_pattern:=pattern;
readpreproc:=_INTCONST;
end;
'&' :
begin
readnumber;
if length(pattern)=1 then
begin
readstring;
readpreproc:=_ID;
end
else
readpreproc:=_INTCONST;
current_scanner.preproc_pattern:=pattern;
end;
'.' :
begin