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

codetools: fixed parsing variable hint modifiers not behind semicolon

Browse Source 
git-svn-id: branches/fixes_1_6@50722 -
This commit is contained in:
mattias 2015-12-09 17:02:24 +00:00
parent 73ebe1446e
commit 7c617e4023
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/pascalparsertool.pas
View File

@ -3358,7 +3358,8 @@ begin
end; end;
// optional: hint modifier // optional: hint modifier
ReadHintModifiers([cafSemicolon,cafEqual]); if CurPos.Flag<>cafSemicolon then
ReadHintModifiers([cafSemicolon,cafEqual]);
if (ParentNode.Desc=ctnVarSection) then begin if (ParentNode.Desc=ctnVarSection) then begin
// optional: initial value // optional: initial value
@ -3762,7 +3763,8 @@ begin
SaveRaiseStringExpectedButAtomFound(ctsStringConstant); SaveRaiseStringExpectedButAtomFound(ctsStringConstant);
ReadConstant(true,false,[]); ReadConstant(true,false,[]);
// read hint modifier // read hint modifier
ReadHintModifiers; if CurPos.Flag<>cafSemicolon then
ReadHintModifiers;
// read ; // read ;
if CurPos.Flag<>cafSemicolon then if CurPos.Flag<>cafSemicolon then
SaveRaiseCharExpectedButAtomFound(';'); SaveRaiseCharExpectedButAtomFound(';');
@ -3903,7 +3905,8 @@ begin
end; end;
ReadConstExpr; ReadConstExpr;
// optional: hint modifier // optional: hint modifier
ReadHintModifiers; if CurPos.Flag<>cafSemicolon then
ReadHintModifiers;
if CurPos.Flag=cafSemicolon then begin if CurPos.Flag=cafSemicolon then begin
if (CurNode.Parent.Desc=ctnConstSection) if (CurNode.Parent.Desc=ctnConstSection)
and (CurNode.Parent.Parent.Desc in AllCodeSections) then begin and (CurNode.Parent.Parent.Desc in AllCodeSections) then begin
@ -3993,7 +3996,8 @@ begin
ReadNextAtom; ReadNextAtom;
ParseType(CurPos.StartPos); ParseType(CurPos.StartPos);
// read hint modifier // read hint modifier
ReadHintModifiers; if CurPos.Flag<>cafSemicolon then
ReadHintModifiers;
// read ; // read ;
if CurPos.Flag<>cafSemicolon then if CurPos.Flag<>cafSemicolon then
SaveRaiseCharExpectedButAtomFound(';'); SaveRaiseCharExpectedButAtomFound(';');