|
@@ -736,6 +736,7 @@ implementation
|
|
|
var
|
|
|
pd : tprocdef;
|
|
|
hs : string;
|
|
|
+ oldst : tsymtable;
|
|
|
isclassmethod : boolean;
|
|
|
begin
|
|
|
pd:=nil;
|
|
@@ -760,7 +761,12 @@ implementation
|
|
|
if try_to_consume(_COLON) then
|
|
|
begin
|
|
|
inc(testcurobject);
|
|
|
+ { Don't look in the objectsymtable for types }
|
|
|
+ oldst:=symtablestack;
|
|
|
+ if symtablestack.symtabletype=objectsymtable then
|
|
|
+ symtablestack:=symtablestack.next;
|
|
|
single_type(pd.rettype,hs,false);
|
|
|
+ symtablestack:=oldst;
|
|
|
pd.test_if_fpu_result;
|
|
|
dec(testcurobject);
|
|
|
end
|
|
@@ -2149,7 +2155,10 @@ const
|
|
|
end.
|
|
|
{
|
|
|
$Log$
|
|
|
- Revision 1.140 2003-10-01 16:49:05 florian
|
|
|
+ Revision 1.141 2003-10-01 18:28:55 peter
|
|
|
+ * don't look in objectsymtable when parsing the function return type
|
|
|
+
|
|
|
+ Revision 1.140 2003/10/01 16:49:05 florian
|
|
|
* para items are now reversed for pascal calling conventions
|
|
|
|
|
|
Revision 1.139 2003/09/28 21:44:55 peter
|