Changeset 233 for branches/xpascal/Tokenizer.pas

Timestamp:

Jun 26, 2023, 6:08:23 PM (17 months ago)

Author:

chronos

Message:

• Added: Support for procedures.
• Added: Project pascal file can be opened from main menu. Last file name is remembered.
• Modified: Improved XML output of source structure.

File:

• branches/xpascal/Tokenizer.pas (modified) (5 diffs)

branches/xpascal/Tokenizer.pas

@@ -62 +62 @@
 implementation
 
+resourcestring
+  SUnknownToken = 'Unknown token %s';
+  SUnsupportedTokenizerState = 'Unsupported tokenizer state.';
+  SExpectedButFound = 'Expected %s but %s found.';
+
 { TToken }
 
@@ -155 +160 @@
   (Text = 'else') or (Text = 'while') or (Text = 'do') or (Text = 'for') or
   (Text = 'to') or (Text = 'repeat') or (Text = 'until') or (Text = 'break') or
-  (Text = 'continue') or (Text = 'function');
+  (Text = 'continue') or (Text = 'function') or (Text = 'procedure');
 end;
 
@@ -203 +208 @@
         Pos.Increment;
       end else begin
-        Error('Unknown token ' + C);
+        Error(Format(SUnknownToken, [C]));
         Break;
       end;
@@ -260 +265 @@
       end;
     end else
-      raise Exception.Create('Unsupported tokenizer state.');
+      raise Exception.Create(SUnsupportedTokenizerState);
   end;
 end;
@@ -314 +319 @@
   Token := GetNext;
   if (Token.Text <> Text) or (Token.Kind <> Kind) then
-    Error('Expected ' + Text + ' but ' + Token.Text + ' found.');
+    Error(Format(SExpectedButFound, [Text, Token.Text]));
 end;