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

Merged revisions 2263,2269 via svnmerge from

Browse Source 
http://peter@svn.freepascal.org/svn/fpc/trunk

........
r2263 | peter | 2006-01-12 07:59:43 +0100 (Thu, 12 Jan 2006) | 2 lines

  * support FPCDATE include

........
r2269 | florian | 2006-01-12 21:38:22 +0100 (Thu, 12 Jan 2006) | 2 lines

* symbol_end for typed consts

........

git-svn-id: branches/fixes_2_0@2308 -
This commit is contained in:
peter 2006-01-16 13:59:57 +00:00
parent e84e39b14c
commit e07583b654
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/ptconst.pas
View File

@ -84,18 +84,19 @@ implementation
error : boolean; error : boolean;
old_block_type : tblock_type; old_block_type : tblock_type;
storefilepos : tfileposinfo; storefilepos : tfileposinfo;
sizelabel : tasmlabel;
procedure check_range(def:torddef); procedure check_range(def:torddef);
begin begin
if ((tordconstnode(p).value>def.high) or if ((tordconstnode(p).value>def.high) or
(tordconstnode(p).value<def.low)) then (tordconstnode(p).value<def.low)) then
begin begin
if (cs_check_range in aktlocalswitches) then if (cs_check_range in aktlocalswitches) then
Message(parser_e_range_check_error) Message(parser_e_range_check_error)
else else
Message(parser_w_range_check_error); Message(parser_w_range_check_error);
end; end;
end; end;
begin begin
old_block_type:=block_type; old_block_type:=block_type;
@ -1086,6 +1087,15 @@ implementation
end; end;
myexit: myexit:
block_type:=old_block_type; block_type:=old_block_type;
if assigned(sym) then
begin
storefilepos:=aktfilepos;
aktfilepos:=sym.fileinfo;
asmlist[cural].concat(tai_symbol_end.Createname(sym.mangledname));
aktfilepos:=storefilepos;
end;
end; end;
{$ifdef fpc} {$ifdef fpc}
{$maxfpuregisters default} {$maxfpuregisters default}

3
compiler/scanner.pas
View File

@ -1451,6 +1451,9 @@ compile time variables as the old format (0/1), continue to work.
else else
if hs='FPCVERSION' then if hs='FPCVERSION' then
hs:=version_string hs:=version_string
else
if hs='FPCDATE' then
hs:=date_string
else else
if hs='FPCTARGET' then if hs='FPCTARGET' then
hs:=target_cpu_string hs:=target_cpu_string