paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 19:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* remove obsolete bt_specialize

Browse Source 
git-svn-id: trunk@12031 -
This commit is contained in:
peter 2008-11-07 00:14:08 +00:00
parent da13c20f59
commit b6dcffe79b
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/globtype.pas
View File

@ -262,7 +262,7 @@ interface
{ currently parsed block type } { currently parsed block type }
tblock_type = (bt_none, tblock_type = (bt_none,
bt_general,bt_type,bt_const,bt_except,bt_body,bt_specialize bt_general,bt_type,bt_const,bt_except,bt_body
); );
{ Temp types } { Temp types }

5
compiler/pexpr.pas
View File

@ -1399,8 +1399,7 @@ implementation
if (hdef=cvarianttype) and if (hdef=cvarianttype) and
not(cs_compilesystem in current_settings.moduleswitches) then not(cs_compilesystem in current_settings.moduleswitches) then
current_module.flags:=current_module.flags or uf_uses_variants; current_module.flags:=current_module.flags or uf_uses_variants;
if (block_type<>bt_specialize) and if try_to_consume(_LKLAMMER) then
try_to_consume(_LKLAMMER) then
begin begin
p1:=comp_expr(true); p1:=comp_expr(true);
consume(_RKLAMMER); consume(_RKLAMMER);
@ -1486,7 +1485,7 @@ implementation
{ For a type block we simply return only { For a type block we simply return only
the type. For all other blocks we return the type. For all other blocks we return
a loadvmt node } a loadvmt node }
if not(block_type in [bt_type,bt_specialize]) then if not(block_type in [bt_type]) then
p1:=cloadvmtaddrnode.create(p1); p1:=cloadvmtaddrnode.create(p1);
end; end;
end end

4
compiler/ptype.pas
View File

@ -86,7 +86,6 @@ implementation
err : boolean; err : boolean;
i : longint; i : longint;
sym : tsym; sym : tsym;
old_block_type : tblock_type;
genericdef : tstoreddef; genericdef : tstoreddef;
generictype : ttypesym; generictype : ttypesym;
generictypelist : TFPObjectList; generictypelist : TFPObjectList;
@ -132,8 +131,6 @@ implementation
end; end;
consume(_LSHARPBRACKET); consume(_LSHARPBRACKET);
old_block_type:=block_type;
block_type:=bt_specialize;
{ Parse generic parameters, for each undefineddef in the symtable of { Parse generic parameters, for each undefineddef in the symtable of
the genericdef we need to have a new def } the genericdef we need to have a new def }
err:=false; err:=false;
@ -271,7 +268,6 @@ implementation
generictypelist.free; generictypelist.free;
consume(_RSHARPBRACKET); consume(_RSHARPBRACKET);
block_type:=old_block_type;
end; end;

6
compiler/scanner.pas
View File

@ -3615,7 +3615,7 @@ In case not, the value returned can be arbitrary.
begin begin
readchar; readchar;
c:=upcase(c); c:=upcase(c);
if (block_type in [bt_type,bt_specialize]) or if (block_type in [bt_type]) or
(lasttoken=_ID) or (lasttoken=_NIL) or (lasttoken=_OPERATOR) or (lasttoken=_ID) or (lasttoken=_NIL) or (lasttoken=_OPERATOR) or
(lasttoken=_RKLAMMER) or (lasttoken=_RECKKLAMMER) or (lasttoken=_CARET) then (lasttoken=_RKLAMMER) or (lasttoken=_RECKKLAMMER) or (lasttoken=_CARET) then
begin begin
@ -3855,7 +3855,7 @@ In case not, the value returned can be arbitrary.
'>' : '>' :
begin begin
readchar; readchar;
if (block_type in [bt_type,bt_specialize]) then if (block_type in [bt_type]) then
token:=_RSHARPBRACKET token:=_RSHARPBRACKET
else else
begin begin
@ -3887,7 +3887,7 @@ In case not, the value returned can be arbitrary.
'<' : '<' :
begin begin
readchar; readchar;
if (block_type in [bt_type,bt_specialize]) then if (block_type in [bt_type]) then
token:=_LSHARPBRACKET token:=_LSHARPBRACKET
else else
begin begin