This commit is contained in:
peter 1999-06-21 16:45:01 +00:00
parent 39630ae945
commit ce0a8e3f26
2 changed files with 19 additions and 5 deletions

View File

@ -272,6 +272,7 @@ begin
{ local variables are case sensitive } { local variables are case sensitive }
actasmtoken:=AS_LLABEL; actasmtoken:=AS_LLABEL;
c:=current_scanner^.asmgetchar; c:=current_scanner^.asmgetchar;
firsttoken:=true;
exit; exit;
end end
{ must be a directive } { must be a directive }
@ -297,6 +298,7 @@ begin
actasmtoken:=AS_LABEL; actasmtoken:=AS_LABEL;
{ let us point to the next character } { let us point to the next character }
c:=current_scanner^.asmgetchar; c:=current_scanner^.asmgetchar;
firsttoken:=true;
exit; exit;
end; end;
{ Opcode ? } { Opcode ? }
@ -1930,9 +1932,15 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.52 1999-06-14 17:48:03 peter Revision 1.53 1999-06-21 16:45:01 peter
* merged * merged
Revision 1.52 1999/06/14 17:48:03 peter
* merged
Revision 1.50.2.2 1999/06/21 16:42:57 peter
* fixed label and opcode on the same line
Revision 1.50.2.1 1999/06/14 17:30:44 peter Revision 1.50.2.1 1999/06/14 17:30:44 peter
* align fixes from pierre * align fixes from pierre

View File

@ -1,6 +1,6 @@
{ {
$Id$ $Id$
Copyright (c) 1997-98 by Carl Eric Codere Copyright (c) 1997-99 by Carl Eric Codere and Peter Vreman
Does the parsing process for the intel styled inline assembler. Does the parsing process for the intel styled inline assembler.
@ -254,6 +254,7 @@ begin
{ Local Label, Label, Directive, Prefix or Opcode } { Local Label, Label, Directive, Prefix or Opcode }
if firsttoken and not (c in [newline,#13,'{',';']) then if firsttoken and not (c in [newline,#13,'{',';']) then
begin begin
firsttoken:=FALSE;
len:=0; len:=0;
while c in ['A'..'Z','a'..'z','0'..'9','_','@'] do while c in ['A'..'Z','a'..'z','0'..'9','_','@'] do
begin begin
@ -275,14 +276,13 @@ begin
actasmtoken:=AS_LABEL; actasmtoken:=AS_LABEL;
{ let us point to the next character } { let us point to the next character }
c:=current_scanner^.asmgetchar; c:=current_scanner^.asmgetchar;
firsttoken:=true;
exit; exit;
end; end;
{ Are we trying to create an identifier with } { Are we trying to create an identifier with }
{ an at-sign...? } { an at-sign...? }
if forcelabel then if forcelabel then
Message(asmr_e_none_label_contain_at); Message(asmr_e_none_label_contain_at);
{ we're not the first token anymore }
firsttoken:=FALSE;
{ opcode ? } { opcode ? }
If is_asmopcode(actasmpattern) then If is_asmopcode(actasmpattern) then
Begin Begin
@ -1640,7 +1640,13 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.37 1999-06-08 11:52:00 peter Revision 1.38 1999-06-21 16:45:02 peter
* merged
Revision 1.37.2.1 1999/06/21 16:43:00 peter
* fixed label and opcode on the same line
Revision 1.37 1999/06/08 11:52:00 peter
* fixed some intel bugs with scale parsing * fixed some intel bugs with scale parsing
* end is now also a separator in many more cases * end is now also a separator in many more cases