Changeset 59 for branches/ByteArray/Parser.pas

Timestamp:

Nov 25, 2023, 11:47:52 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Assembler and disassembler to work correctly with supported instructions.

File:

• branches/ByteArray/Parser.pas (modified) (3 diffs)

branches/ByteArray/Parser.pas

@@ -45 +45 @@
     function CheckNextKind(Kind: TTokenKind): Boolean;
     function CheckNextAndRead(Kind: TTokenKind; Value: string = ''): Boolean;
-    procedure Expect(Kind: TTokenKind; Value: string = '');
+    function Expect(Kind: TTokenKind; Value: string = ''): Boolean;
     procedure Error(Text: string; Pos: TPoint);
     procedure Reset;
@@ -57 +57 @@
 resourcestring
   SUnknownCharacter = 'Unknown character %s';
+  SExpectedButFound = 'Expected %s but %s found.';
 
 { TParserPos }
@@ -227 +228 @@
 end;
 
-procedure TParser.Expect(Kind: TTokenKind; Value: string = '');
-var
-  Token: TToken;
-begin
-  Token := ReadNext;
-  if (Token.Kind <> Kind) or (LowerCase(Token.Value) <> LowerCase(Value)) then
-    Error('Expected ' + Value + ' but ' + Token.Value +' found.', Token.Pos);
+function TParser.Expect(Kind: TTokenKind; Value: string = ''): Boolean;
+var
+  Token: TToken;
+begin
+  Result := True;
+  Token := ReadNext;
+  if (Token.Kind <> Kind) or (LowerCase(Token.Value) <> LowerCase(Value)) then begin
+    Result := False;
+    Error(Format(SExpectedButFound, [Value, Token.Value]), Token.Pos);
+  end;
 end;