More

Source/ide/mpaslex.pas

@@ -71,7 +71,6 @@   TmwBasePasLex = class(TObject)
     fLineNumber: Integer;
     fTokenID: TptTokenKind;
     fLinePos: Integer;
-    fExID: TptTokenKind;
     fOnCompilerDirective: TDirectiveEvent;
     fOnIDEDirective: TDirectiveEvent;
     fOnElseDirect: TDirectiveEvent;
@@ -187,7 +186,6 @@   TmwBasePasLex = class(TObject)
     property TokenLen: Integer read GetTokenLen;
     property TokenPos: Integer read fTokenPos;
     property TokenID: TptTokenKind read FTokenID;
-    property ExID: TptTokenKind read fExID;
 
     property OnCompilerDirective: TDirectiveEvent read fOnCompilerDirective write fOnCompilerDirective;
     property OnIDEDirective: TDirectiveEvent read fOnIDEDirective write fOnIDEDirective;
@@ -213,7 +211,6 @@   TmwPasLex = class(TmwBasePasLex)
   private
     fAheadLex: TmwBasePasLex;
 
-    function GetAheadExID: TptTokenKind;
     function GetAheadToken: string;
     function GetAheadTokenID: TptTokenKind;
   public
@@ -224,7 +221,6 @@   TmwPasLex = class(TmwBasePasLex)
     property AheadLex: TmwBasePasLex read fAheadLex;
     property AheadToken: string read GetAheadToken;
     property AheadTokenID: TptTokenKind read GetAheadTokenID;
-    property AheadExID: TptTokenKind read GetAheadExID;
   end;
 
   TLexerStack = specialize TSimbaStack<TmwPasLex>;
@@ -344,8 +340,6 @@ constructor TmwBasePasLex.Create(Doc: String; AFileName: String = '');
   if (fFileName <> '') and FileExists(fFileName) then
     fFileAge := SysUtils.FileAge(fFileName);
 
-  fExID := tokUnKnown;
-
   FIdentBuffer := GetMem(MaxTokenNameLength + 1);
   FIdentBufferUpper := PtrUInt(@FIdentBuffer[MaxTokenNameLength]);
 
@@ -727,14 +721,8 @@ procedure TmwBasePasLex.IdentProc;
   Ptr^ := #0;
 
   if (fRun - fTokenPos <= MaxTokenNameLength) then
-  begin
-    fTokenID := KeywordDictionary[FIdentBuffer];
-    if (fTokenID in ExTokens) then
-    begin
-      fExID := fTokenID;
-      fTokenID := tokIdentifier;
-    end;
-  end else
+    fTokenID := KeywordDictionary[FIdentBuffer]
+  else
     fTokenID := tokIdentifier;
 end;
 
@@ -1098,7 +1086,6 @@ procedure TmwBasePasLex.UnknownProc;
 
 procedure TmwBasePasLex.Next;
 begin
-  fExID := tokUnknown;
   fTokenPos := fRun;
 
   case fCommentState of
@@ -1291,11 +1278,6 @@ procedure TmwPasLex.AheadNext;
   fAheadLex.NextNoJunk;
 end;
 
-function TmwPasLex.GetAheadExID: TptTokenKind;
-begin
-  Result := fAheadLex.ExID;
-end;
-
 function TmwPasLex.GetAheadToken: string;
 begin
   Result := fAheadLex.Token;

Source/ide/mpaslextypes.pas

@@ -51,7 +51,6 @@ interface
 
     tokAdd,
     tokAddressOp,
-    tokAmpersand,
     tokAnd,
     tokAnsiComment,
     tokArray,
@@ -63,14 +62,13 @@ interface
     tokBorComment,
     tokBraceClose,
     tokBraceOpen,
-    tokBreak,
     tokCase,
     tokColon,
     tokComma,
     tokCompilerDirective,
     tokConst,
     tokConstRef,
-    tokContinue,
+
     tokCRLF,
     tokCRLFCo,
     tokDefineDirect,
@@ -87,7 +85,6 @@ interface
     tokEnum,
     tokEqual,
     tokExcept,
-    tokExit,
     tokExternal,
     tokFinally,
     tokFloat,
@@ -121,7 +118,6 @@ interface
     tokNull,
     tokObject,
     tokOf,
-    tokOn,
     tokOperator,
     tokOr,
     tokOut,
@@ -210,11 +206,7 @@   TKeywordDictionary = class(TObject)
 
 const
   KeywordTokens = [
-    tokAdd, tokIf, tokDo, tokAnd, tokAs, tokOf, tokAt, tokEnd, tokIn, tokCase, tokIs, tokOn, tokLabel, tokMod, tokOr, tokTo, tokDiv, tokBegin, tokBreak, tokFor, tokShl, tokPacked, tokVar, tokElse, tokSet, tokShr, tokThen, tokNot, tokRaise, tokEnum, tokObject, tokOut, tokWhile, tokXor, tokGoto, tokExit, tokWith, tokArray, tokTry, tokRecord, tokRepeat, tokType, tokConst, tokNative, tokStatic, tokExcept, tokUnion, tokUntil, tokFinally, tokDeprecated, tokForward, tokProgram, tokStrict, tokDownto, tokOverload, tokOverride, tokExternal, tokConstref, tokContinue, tokFunction, tokProcedure, tokOperator, tokProperty
-  ];
-
-  ExTokens = [
-    tokAdd, tokAt, tokOn, tokBreak, tokOut, tokExit, tokDeprecated, tokForward, tokOverload, tokOverride, tokExternal, tokContinue, tokStatic
+    tokIf, tokDo, tokAnd, tokAs, tokOf, tokEnd, tokIn, tokCase, tokIs, tokLabel, tokMod, tokOr, tokTo, tokDiv, tokBegin, tokFor, tokShl, tokPacked, tokVar, tokElse, tokSet, tokShr, tokThen, tokNot, tokEnum, tokObject, tokOut, tokWhile, tokXor, tokGoto, tokWith, tokArray, tokTry, tokRecord, tokRepeat, tokType, tokConst, tokNative, tokStatic, tokExcept, tokUnion, tokUntil, tokFinally, tokDeprecated, tokForward, tokProgram, tokStrict, tokDownto, tokOverload, tokOverride, tokExternal, tokConstref, tokFunction, tokProcedure, tokOperator, tokProperty, tokRaise
   ];
 
   JunkTokens = [