compiler: simplify _CLASS token handling in record declarations too

git-svn-id: trunk@16734 -
This commit is contained in:
paul 2011-01-08 05:27:19 +00:00
parent d37fde7302
commit def46487eb

View File

@ -753,17 +753,15 @@ implementation
_CLASS: _CLASS:
begin begin
is_classdef:=false; is_classdef:=false;
{ read class method } { read class method/field/property }
if try_to_consume(_CLASS) then consume(_CLASS);
begin { class modifier is only allowed for procedures, functions, }
{ class modifier is only allowed for procedures, functions, } { constructors, destructors, fields and properties }
{ constructors, destructors, fields and properties } if not(token in [_FUNCTION,_PROCEDURE,_PROPERTY,_VAR,_CONSTRUCTOR,_DESTRUCTOR,_OPERATOR]) and
if not(token in [_FUNCTION,_PROCEDURE,_PROPERTY,_VAR,_CONSTRUCTOR,_DESTRUCTOR,_OPERATOR]) and not((token=_ID) and (idtoken=_OPERATOR)) then
not((token=_ID) and (idtoken=_OPERATOR)) then Message(parser_e_procedure_or_function_expected);
Message(parser_e_procedure_or_function_expected);
is_classdef:=true; is_classdef:=true;
end;
end; end;
_PROCEDURE, _PROCEDURE,
_FUNCTION: _FUNCTION: