paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 13:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* support // parsing in skipuntildirective

Browse Source
This commit is contained in:
peter 2002-03-01 12:39:26 +00:00
parent d661632b51
commit cb16c423fe
1 changed files with 101 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
compiler/scanner.pas
View File

@ -311,15 +311,71 @@ implementation
current_scanner.preproc_token:=current_scanner.readpreproc; current_scanner.preproc_token:=current_scanner.readpreproc;
end; end;
function readpreproc: string;
var
hs: string;
mac : tmacro;
len : integer;
begin
hs := current_scanner.preproc_pattern;
mac:=tmacro(current_scanner.macros.search(hs));
if assigned(mac) then
begin
if mac.defined and assigned(mac.buftext) then
begin
if mac.buflen>255 then
begin
len:=255;
Message(scan_w_macro_cut_after_255_chars);
end
else
len:=mac.buflen;
hs[0]:=char(len);
move(mac.buftext^,hs[1],len);
end;
end;
readpreproc := hs;
end;
function read_factor : string; function read_factor : string;
var var
hs : string; hs : string;
mac : tmacro; mac: tmacro;
len : byte;
begin begin
if current_scanner.preproc_token=_ID then if current_scanner.preproc_token=_ID then
begin begin
if current_scanner.preproc_pattern='NOT' then if readpreproc='DEFINED' then
begin
preproc_consume(_ID);
current_scanner.skipspace;
if current_scanner.preproc_token =_LKLAMMER then
begin
preproc_consume(_LKLAMMER);
current_scanner.skipspace;
end
else
Message(scan_e_error_in_preproc_expr);
if current_scanner.preproc_token =_ID then
begin
hs := current_scanner.preproc_pattern;
mac := tmacro(current_scanner.macros.search(hs));
if assigned(mac) then
hs := '1'
else
hs := '0';
read_factor := hs;
preproc_consume(_ID);
current_scanner.skipspace;
end
else
Message(scan_e_error_in_preproc_expr);
if current_scanner.preproc_token =_RKLAMMER then
preproc_consume(_RKLAMMER)
else
Message(scan_e_error_in_preproc_expr);
end
else
if readpreproc='NOT' then
begin begin
preproc_consume(_ID); preproc_consume(_ID);
hs:=read_expr; hs:=read_expr;
@ -330,31 +386,12 @@ implementation
end end
else else
begin begin
mac:=tmacro(current_scanner.macros.search(hs)); hs:=readpreproc;
hs:=current_scanner.preproc_pattern;
preproc_consume(_ID); preproc_consume(_ID);
if assigned(mac) then read_factor:=hs;
begin
if mac.defined and assigned(mac.buftext) then
begin
if mac.buflen>255 then
begin
len:=255;
Message(scan_w_macro_cut_after_255_chars);
end
else
len:=mac.buflen;
hs[0]:=char(len);
move(mac.buftext^,hs[1],len);
end
else
read_factor:='';
end
else
read_factor:=hs;
end end
end end
else if current_scanner.preproc_token=_LKLAMMER then else if current_scanner.preproc_token =_LKLAMMER then
begin begin
preproc_consume(_LKLAMMER); preproc_consume(_LKLAMMER);
read_factor:=read_expr; read_factor:=read_expr;
@ -367,18 +404,25 @@ implementation
function read_term : string; function read_term : string;
var var
hs1,hs2 : string; hs1,hs2 : string;
l1,l2 : longint;
w : integer;
begin begin
hs1:=read_factor; hs1:=read_factor;
while true do while true do
begin begin
if (current_scanner.preproc_token=_ID) then if (current_scanner.preproc_token=_ID) then
begin begin
if current_scanner.preproc_pattern='AND' then if readpreproc='AND' then
begin begin
preproc_consume(_ID); preproc_consume(_ID);
hs2:=read_factor; hs2:=read_expr;
if (hs1<>'0') and (hs2<>'0') then valint(hs1,l1,w); valint(hs2,l2,w);
hs1:='1'; if (l1>0) and (l2>0) then
hs1:='1'
else
hs1:='0';
read_term := hs1;
exit;
end end
else else
break; break;
@ -393,18 +437,25 @@ implementation
function read_simple_expr : string; function read_simple_expr : string;
var var
hs1,hs2 : string; hs1,hs2 : string;
l1,l2 : longint;
w : integer;
begin begin
hs1:=read_term; hs1:=read_term;
while true do while true do
begin begin
if (current_scanner.preproc_token=_ID) then if (current_scanner.preproc_token=_ID) then
begin begin
if current_scanner.preproc_pattern='OR' then if readpreproc='OR' then
begin begin
preproc_consume(_ID); preproc_consume(_ID);
hs2:=read_term; hs2:=read_expr;
if (hs1<>'0') or (hs2<>'0') then valint(hs1,l1,w); valint(hs2,l2,w);
hs1:='1'; if (l1>0) or (l2>0) then
hs1:='1'
else
hs1:='0';
read_simple_expr := hs1;
exit;
end end
else else
break; break;
@ -647,7 +698,7 @@ implementation
hs:=target_cpu_string hs:=target_cpu_string
else else
if hs='FPCTARGETOS' then if hs='FPCTARGETOS' then
hs:=target_info.name hs:=target_info.shortname
else else
hs:=getenv(hs); hs:=getenv(hs);
if hs='' then if hs='' then
@ -1710,6 +1761,18 @@ implementation
else else
next_char_loaded:=true; next_char_loaded:=true;
end; end;
'/' :
begin
readchar;
if c='/' then
begin
readchar;
skipdelphicomment;
aktcommentstyle:=oldcommentstyle;
end
else
next_char_loaded:=true;
end;
else else
found:=0; found:=0;
end; end;
@ -2662,7 +2725,10 @@ exit_label:
end. end.
{ {
$Log$ $Log$
Revision 1.29 2002-01-27 21:44:26 peter Revision 1.30 2002-03-01 12:39:26 peter
* support // parsing in skipuntildirective
Revision 1.29 2002/01/27 21:44:26 peter
* FPCTARGETOS/FPCTARGETCPU added as internal environment variable * FPCTARGETOS/FPCTARGETCPU added as internal environment variable
Revision 1.28 2002/01/24 18:25:50 peter Revision 1.28 2002/01/24 18:25:50 peter