* Fix bug ID #31699 (@@end label in asm block)

git-svn-id: trunk@35914 -

packages/fcl-passrc/src/pparser.pp

@@ -4155,6 +4155,10 @@ begin
 end;
 
 procedure TPasParser.ParseAsmBlock(AsmBlock: TPasImplAsmStatement);
+
+Var
+  LastToken : TToken;
+
 begin
   if po_asmwhole in Options then
     begin
@@ -4187,11 +4191,13 @@ begin
     end
   else
     begin
+    LastToken:=tkEOF;
     NextToken;
-    While CurToken<>tkEnd do
+    While Not ((CurToken=tkEnd) and (LastToken<>tkAt)) do
       begin
       // ToDo: allow @@end
       AsmBlock.Tokens.Add(CurTokenText);
+      LastToken:=CurToken;
       NextToken;
       end;
     end;

packages/fcl-passrc/tests/tcstatements.pas

@@ -113,6 +113,7 @@ Type
     procedure TestTryExceptRaise;
     Procedure TestAsm;
     Procedure TestAsmBlock;
+    Procedure TestAdmBlockWithEndLabel;
     Procedure TestGotoInIfThen;
     procedure AssignToAddress;
   end;
@@ -1660,6 +1661,23 @@ begin
   ParseModule;
 end;
 
+procedure TTestStatementParser.TestAdmBlockWithEndLabel;
+begin
+  Source.Add('{$MODE DELPHI}');
+  Source.Add('function BitsHighest(X: Cardinal): Integer;');
+  Source.Add('asm');
+  Source.Add('  MOV ECX, EAX');
+  Source.Add('  MOV EAX, -1');
+  Source.Add('  BSR EAX, ECX');
+  Source.Add('  JNZ @@End');
+  Source.Add('  MOV EAX, -1');
+  Source.Add('@@End:');
+  Source.Add('end;');
+  Source.Add('begin');
+  Source.Add('end.');
+  ParseModule;
+end;
+
 Procedure TTestStatementParser.AssignToAddress;
 
 begin