Changeset 235 for branches/xpascal/Parsers

Timestamp:

Jun 27, 2023, 10:09:21 AM (17 months ago)

Author:

chronos

Message:

• Modified: Improved function var parameter handling.
• Modified: Code cleanup.

File:

• branches/xpascal/Parsers/ParserPascal.pas (modified) (5 diffs)

branches/xpascal/Parsers/ParserPascal.pas

@@ -44 +44 @@
 implementation
 
+resourcestring
+  SExpectedFunctionParameter = 'Expected function parameter.';
+  SExpectedProcedureParameter = 'Expected procedure parameter.';
+  SFunctionParameterMismatch = 'Function parameter mismatch.';
+  SUnexpectedToken = 'Unexpected token %s';
+
 function TParserPascal.ParseBeginEnd(Block: TBlock; out BeginEnd: TBeginEnd): Boolean;
 var
@@ -57 +63 @@
         Tokenizer.Expect(';', tkSpecialSymbol);
       end else begin
-        Error('Unexpected token ' + Tokenizer.GetNext.Text);
+        Error(Format(SUnexpectedToken, [Tokenizer.GetNext.Text]));
         Result := False;
         Break;
@@ -88 +94 @@
             if Expression.GetType = TFunctionParameter(FunctionDef.Params[I]).TypeRef then
               FunctionCall.Params.Add(Expression)
-              else Error('Function parameter mismatch.');
-          end else Error('Expected function parameter.');
+              else Error(SFunctionParameterMismatch);
+          end else Error(SExpectedFunctionParameter);
         end;
         Tokenizer.Expect(')', tkSpecialSymbol);
@@ -126 +132 @@
             if Expression.GetType = TFunctionParameter(ProcedureDef.Params[I]).TypeRef then
               ProcedureCall.Params.Add(Expression)
-              else Error('Function parameter mismatch.');
-          end else Error('Expected procedure parameter.');
+              else Error(SFunctionParameterMismatch);
+          end else Error(SExpectedProcedureParameter);
         end;
         Tokenizer.Expect(')', tkSpecialSymbol);
@@ -396 +402 @@
       if ParseFunctionParameter(Block, FunctionParameter) then begin
         Params.Add(FunctionParameter);
-      end else Error('Expected function parameter.');
+      end else Error(SExpectedFunctionParameter);
     end;
     Tokenizer.Expect(')', tkSpecialSymbol);