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

* Renamed "fieldoffset" to "iioffset" to avoid confusion with fieldvarsym.fieldoffset

Browse Source 
git-svn-id: trunk@6214 -
This commit is contained in:
chrivers 2007-01-26 22:11:39 +00:00
parent 83f5a5747c
commit 0e6348e7b7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/nobj.pas
View File

@ -521,7 +521,7 @@ implementation
ImplIntf.AddImplProc(implprocdef) ImplIntf.AddImplProc(implprocdef)
end end
else else
if ImplIntf.iitype = etStandard then if ImplIntf.itype = etStandard then
Message1(sym_e_no_matching_implementation_found,tprocdef(def).fullprocname(false)); Message1(sym_e_no_matching_implementation_found,tprocdef(def).fullprocname(false));
end; end;
end; end;
@ -1224,7 +1224,7 @@ implementation
if AImplIntf.VtblImplIntf.itype = etStandard then if AImplIntf.VtblImplIntf.itype = etStandard then
current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.ioffset)) current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.ioffset))
else else
current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.fieldoffset)); current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.iioffset));
{ IIDStr } { IIDStr }
current_asmdata.getdatalabel(iidlabel); current_asmdata.getdatalabel(iidlabel);
rawdata.concat(cai_align.create(const_align(sizeof(aint)))); rawdata.concat(cai_align.create(const_align(sizeof(aint))));
@ -1235,8 +1235,8 @@ implementation
else else
rawdata.concat(Tai_string.Create(AImplIntf.IntfDef.iidstr^)); rawdata.concat(Tai_string.Create(AImplIntf.IntfDef.iidstr^));
current_asmdata.asmlists[al_globals].concat(Tai_const.Create_sym(iidlabel)); current_asmdata.asmlists[al_globals].concat(Tai_const.Create_sym(iidlabel));
{ IIType } { IType }
current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(aint(AImplIntf.iitype))); current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(aint(AImplIntf.itype)));
end; end;

6
compiler/symdef.pas
View File

@ -204,7 +204,6 @@ interface
VtblImplIntf : TImplementedInterface; VtblImplIntf : TImplementedInterface;
NameMappings : TFPHashList; NameMappings : TFPHashList;
ProcDefs : TFPObjectList; ProcDefs : TFPObjectList;
iitype : tinterfaceentrytype;
// IIOffset can be merged with IOffset. But then, fpc is not allowed to genrate a vmtentry. // IIOffset can be merged with IOffset. But then, fpc is not allowed to genrate a vmtentry.
// Right now, fpc generate an entry for all implemented interfaces (but it should just for etStandard ones) // Right now, fpc generate an entry for all implemented interfaces (but it should just for etStandard ones)
// - Ivo Steinmann // - Ivo Steinmann
@ -4031,10 +4030,9 @@ implementation
intfdef:=aintf; intfdef:=aintf;
ioffset:=-1; ioffset:=-1;
itype:=etStandard; itype:=etStandard;
fieldoffset:=-1; iioffset:=-1;
NameMappings:=nil; NameMappings:=nil;
procdefs:=nil; procdefs:=nil;
iitype := etStandard;
iioffset := 0; iioffset := 0;
end; end;
@ -4046,7 +4044,7 @@ implementation
intfdefderef:=d; intfdefderef:=d;
ioffset:=-1; ioffset:=-1;
itype:=etStandard; itype:=etStandard;
fieldoffset:=-1; iioffset:=-1;
NameMappings:=nil; NameMappings:=nil;
procdefs:=nil; procdefs:=nil;
end; end;