Support binary integers and underscores (Delphi 11)

Author: RomanYankovsky

Source/SimpleParser/SimpleParser.Lexer.pas

@@ -231,6 +231,7 @@   TmwBasePasLex = class(TObject)
     procedure AmpersandOpProc;
     procedure AsciiCharProc;
     procedure AnsiProc;
+    procedure BinaryIntegerProc;
     procedure BorProc;
     procedure BraceCloseProc;
     procedure BraceOpenProc;
@@ -1255,12 +1256,13 @@ procedure TmwBasePasLex.MakeMethodTables;
       #1..#9, #11, #12, #14..#32: FProcTable[I] := SpaceProc;
       '#': FProcTable[I] := AsciiCharProc;
       '$': FProcTable[I] := IntegerProc;
+      '%': FProcTable[I] := BinaryIntegerProc;
       #39: FProcTable[I] := StringProc;
       '0'..'9': FProcTable[I] := NumberProc;
       'A'..'Z', 'a'..'z', '_': FProcTable[I] := IdentProc;
       '{': FProcTable[I] := BraceOpenProc;
       '}': FProcTable[I] := BraceCloseProc;
-      '!', '"', '%', '&', '('..'/', ':'..'@', '['..'^', '`', '~':
+      '!', '"', '&', '('..'/', ':'..'@', '['..'^', '`', '~':
         begin
           case I of
             '(': FProcTable[I] := RoundOpenProc;
@@ -1433,6 +1435,14 @@ procedure TmwBasePasLex.BraceCloseProc;
     FOnMessage(Self, meError, 'Illegal character', PosXY.X, PosXY.Y);
 end;
 
+procedure TmwBasePasLex.BinaryIntegerProc;
+begin
+  Inc(FBuffer.Run);
+  FTokenID := ptIntegerConst;
+  while CharInSet(FBuffer.Buf[FBuffer.Run], ['0', '1', '_']) do
+    Inc(FBuffer.Run);
+end;
+
 procedure TmwBasePasLex.BorProc;
 var
   BeginRun: Integer;
@@ -1863,7 +1873,7 @@ procedure TmwBasePasLex.IntegerProc;
 begin
   Inc(FBuffer.Run);
   FTokenID := ptIntegerConst;
-  while CharInSet(FBuffer.Buf[FBuffer.Run], ['0'..'9', 'A'..'F', 'a'..'f']) do
+  while CharInSet(FBuffer.Buf[FBuffer.Run], ['0'..'9', 'A'..'F', 'a'..'f', '_']) do
     Inc(FBuffer.Run);
 end;
 
@@ -1944,7 +1954,7 @@ procedure TmwBasePasLex.NumberProc;
 begin
   Inc(FBuffer.Run);
   FTokenID := ptIntegerConst;
-  while CharInSet(FBuffer.Buf[FBuffer.Run], ['0'..'9', '.', 'e', 'E']) do
+  while CharInSet(FBuffer.Buf[FBuffer.Run], ['0'..'9', '.', 'e', 'E', '_']) do
   begin
     case FBuffer.Buf[FBuffer.Run] of
       '.':

Test/Snippets/numbers.pas

@@ -0,0 +1,20 @@
+unit constset;
+
+interface
+
+implementation
+
+procedure Test;
+var
+  A,B,C: Integer;
+  D: Double;
+begin
+  A := 123123_;
+  B := $_1241_3_;
+  C := %_01011;
+  D := 12_3_.12_3_;
+  A := 1____________23123_;
+  B := $_12_________41_3_;
+end;
+
+end.