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

codetools: support 'CVAR' variable/const modifier

Browse Source 
git-svn-id: trunk@32562 -
This commit is contained in:
paul 2011-09-30 02:06:21 +00:00
parent 046df2da25
commit 6fc4a3abf4
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/codetools/pascalparsertool.pas
View File

@ -3139,7 +3139,7 @@ begin
ReadNextAtom;
end;
if (CurNode.Parent.Desc=ctnVarSection)
and (UpAtomIs('PUBLIC') or UpAtomIs('EXPORT') or UpAtomIs('EXTERNAL')) then
and (UpAtomIs('PUBLIC') or UpAtomIs('EXPORT') or UpAtomIs('EXTERNAL') or UpAtomIs('WEAKEXTERNAL') or UpAtomIs('CVAR')) then
begin
// examples:
// a: b; public;
@ -3147,7 +3147,7 @@ begin
// a: b; external c;
// a: b; external name 'c';
// a: b; external 'library' name 'c';
if UpAtomIs('EXTERNAL') then begin
if UpAtomIs('EXTERNAL') or UpAtomIs('WEAKEXTERNAL') then begin
// read external identifier
ReadNextAtom;
if (CurPos.Flag<>cafSemicolon) and (not UpAtomIs('NAME')) then
@ -3612,25 +3612,35 @@ begin
// optional: hint modifier
ReadHintModifier;
if CurPos.Flag=cafSemicolon then begin
ReadNextAtom;
if UpAtomIs('PUBLIC') then begin
repeat
ReadNextAtom;
if UpAtomIs('NAME') then begin
if UpAtomIs('PUBLIC') then begin
ReadNextAtom;
if not AtomIsStringConstant then
RaiseStringExpectedButAtomFound(ctsStringConstant);
ReadNextAtom;
if UpAtomIs('SECTION') then begin
if UpAtomIs('NAME') then begin
ReadNextAtom;
if not AtomIsStringConstant then
RaiseStringExpectedButAtomFound(ctsStringConstant);
ReadNextAtom;
if UpAtomIs('SECTION') then begin
ReadNextAtom;
if not AtomIsStringConstant then
RaiseStringExpectedButAtomFound(ctsStringConstant);
ReadNextAtom;
end;
end;
if CurPos.Flag<>cafSemicolon then
RaiseStringExpectedButAtomFound(';');
end else
if UpAtomIs('CVAR') then begin
ReadNextAtom;
if CurPos.Flag<>cafSemicolon then
RaiseStringExpectedButAtomFound(';');
end else
begin
UndoReadNextAtom;
break;
end;
if CurPos.Flag<>cafSemicolon then
RaiseStringExpectedButAtomFound(';');
end else
UndoReadNextAtom;
until false;
end;
end;