Разделители _ в числовых константах

spectatorBH · Sep 13, 2023 · b33efb5 · b33efb5
1 parent 131c55e
commit b33efb5
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 19 deletions.
diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "9";
 	public const string Build = "0";
-	public const string Revision = "3349";
+	public const string Revision = "3351";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

diff --git a/Configuration/Version.defs b/Configuration/Version.defs
@@ -1,4 +1,4 @@
 %MINOR%=9
-%REVISION%=3349
+%REVISION%=3351
 %COREVERSION%=0
 %MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
@@ -2,7 +2,7 @@
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
 //  Machine:  DESKTOP-G8V08V4
-//  DateTime: 23.06.2023 13:17:35
+//  DateTime: 13.09.2023 10:23:20
 //  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
@@ -1221,15 +1221,18 @@ static sbyte Map(int code)
           -1, -1, -1, -1, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
           -1, 28, 28, 28, 28, 28, 28}),
 /* NxS[  29] */ new Table(0, 0, -1, null),
-/* NxS[  30] */ new Table(16, 34, -1, new sbyte[] {75, -1, -1, -1, -1, -1, 
+/* NxS[  30] */ new Table(16, 34, -1, new sbyte[] {75, -1, -1, -1, -1, 30, 
           -1, -1, -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, 
           -1, -1, -1, -1, -1, -1, -1, 30, 77, -1, -1, 76}),
 /* NxS[  31] */ new Table(50, 2, 74, new sbyte[] {32, -1}),
 /* NxS[  32] */ new Table(50, 1, -1, new sbyte[] {74}),
 /* NxS[  33] */ new Table(0, 0, -1, null),
-/* NxS[  34] */ new Table(45, 1, -1, new sbyte[] {34}),
-/* NxS[  35] */ new Table(31, 19, -1, new sbyte[] {76, -1, -1, -1, -1, -1, 
-          -1, -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, -1, 76}),
+/* NxS[  34] */ new Table(21, 25, -1, new sbyte[] {34, -1, -1, -1, -1, -1, 
+          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+          -1, -1, 34}),
+/* NxS[  35] */ new Table(21, 29, -1, new sbyte[] {35, -1, -1, -1, -1, -1, 
+          -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+          -1, -1, 35, -1, -1, -1, 76}),
 /* NxS[  36] */ new Table(0, 0, -1, null),
 /* NxS[  37] */ new Table(0, 0, -1, null),
 /* NxS[  38] */ new Table(0, 0, -1, null),
@@ -1256,8 +1259,9 @@ static sbyte Map(int code)
 /* NxS[  55] */ new Table(0, 0, -1, null),
 /* NxS[  56] */ new Table(0, 0, -1, null),
 /* NxS[  57] */ new Table(0, 0, -1, null),
-/* NxS[  58] */ new Table(31, 19, -1, new sbyte[] {58, -1, -1, -1, -1, -1, 
-          -1, -1, -1, 58, -1, -1, -1, -1, 58, 58, -1, 58, 58}),
+/* NxS[  58] */ new Table(21, 29, -1, new sbyte[] {58, -1, -1, -1, -1, -1, 
+          -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, 
+          -1, -1, 58, 58, -1, 58, 58}),
 /* NxS[  59] */ new Table(50, 1, -1, new sbyte[] {108}),
 /* NxS[  60] */ new Table(0, 0, -1, null),
 /* NxS[  61] */ new Table(0, 7, 61, new sbyte[] {-1, 61, 61, 61, 61, 61, 

diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex
@@ -20,9 +20,11 @@
 
 Letter [[:IsLetter:]_]
 Digit [0-9]
+Digit_ [0-9_]
 LetterDigit {Letter}|{Digit}
 ID {Letter}{LetterDigit}* 
 HexDigit {Digit}|[abcdefABCDEF]
+HexDigit_ {Digit}|[abcdefABCDEF_]
 DotChr [^\r\n]
 OneLineCmnt  \/\/{DotChr}*
 
@@ -31,13 +33,13 @@ DotChr1 [^\r\n}]
 NOTASCII [^\x00-x7F]
 
 CHARACTERNUM '[^'\n]'
-INTNUM {Digit}+
+INTNUM {Digit}{Digit_}*
 BIGINTNUM {INTNUM}[bB][iI]
 FLOATNUM {INTNUM}\.{INTNUM}
 EXPNUM ({INTNUM}\.)?{INTNUM}[eE][+\-]?{INTNUM}
 STRINGNUM \'([^\'\n]|\'\')*\'
 FORMATSTRINGNUM \$\'([^\'\n]|\'\')*\'
-HEXNUM ${HexDigit}+
+HEXNUM ${HexDigit}{HexDigit_}*
 SHARPCHARNUM #{Digit}+
 OLDDIRECTIVE #{ID}
 IFDEF \{\$ifdef\ {DotChr1}*\} 

diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs
@@ -334,6 +334,9 @@ public const_node create_double_const(string text, SourceContext sc)
             {
                 System.Globalization.NumberFormatInfo sgnfi = new System.Globalization.NumberFormatInfo();
                 sgnfi.NumberDecimalSeparator = ".";
+
+                text = RemoveThousandsDelimiter(text, sc);
+
                 double val = double.Parse(text, sgnfi);
                 cn = new double_const(val);
                 cn.source_context = sc;
@@ -357,11 +360,13 @@ public const_node create_int_const(string text, SourceContext sc)
 
         public const_node create_bigint_const(string text, SourceContext sc)
         {
+            text = RemoveThousandsDelimiter(text, sc);
+
             var txt = text.Substring(0, text.Length - 2);
-            const_node cn = new bigint_const();
+            var cn = new bigint_const();
             try
             {
-                (cn as bigint_const).val = System.UInt64.Parse(txt);
+                cn.val = System.UInt64.Parse(txt);
             }
             catch (Exception)
             {
@@ -371,12 +376,24 @@ public const_node create_bigint_const(string text, SourceContext sc)
             return cn;
         }
 
+        public string RemoveThousandsDelimiter(string s, SourceContext sc)
+        {
+            if (s.EndsWith("_") || s.Contains("__"))
+            {
+                var errstr = ParserErrorsStringResources.Get("BAD_FORMED_NUM_CONST");
+                errors.Add(new SyntaxError(errstr, CurrentFileName, sc, null));
+            }
+
+            return s.Replace("_", "");
+        }
+
         public const_node create_int_const(string text, SourceContext sc, System.Globalization.NumberStyles NumberStyles)
         {
             //таблица целых констант на уровне синтаксиса
             //      не может быть - 0 +
             // 32--------16----8----|----8----16--------32----------------64(bits)
             // [  int64  )[       int32       ](  int64 ](      uint64     ]
+            text = RemoveThousandsDelimiter(text, sc);
             if (NumberStyles == System.Globalization.NumberStyles.HexNumber)
                 text = text.Substring(1);
             const_node cn = new int32_const();

diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
@@ -2,7 +2,7 @@
 
 // GPPG version 1.3.6
 // Machine:  DESKTOP-G8V08V4
-// DateTime: 23.06.2023 13:17:36
+// DateTime: 13.09.2023 10:23:21
 // UserName: ?????????
 // Input file <ABCPascal.y>
 

diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
@@ -366,6 +366,8 @@ script=
 
 
 
+
+
 
 
 
diff --git a/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj b/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj
@@ -63,6 +63,7 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>

diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
@@ -1 +1 @@
-3.9.0.3349
+3.9.0.3351
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.9.0.3349'
+!define VERSION '3.9.0.3351'
diff --git a/SemanticTree/SemanticTree.cs b/SemanticTree/SemanticTree.cs
@@ -1711,6 +1711,16 @@ int constant_value
         }
     }
 
+    //Интерфейс для представления BigInteger констант.
+    public interface IBigIntConstantNode : IConstantNode
+    {
+        //Значение константы.
+        System.Numerics.BigInteger constant_value
+        {
+            get;
+        }
+    }
+
     //Интерфейс для представления unsigned int констант.
     public interface IUIntConstantNode : IConstantNode
     {

diff --git a/SemanticTree/SemanticTree.csproj b/SemanticTree/SemanticTree.csproj
@@ -102,6 +102,7 @@
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>

diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -10158,7 +10158,6 @@ function Product(Self: sequence of BigInteger): BigInteger; extensionmethod;
     Result *= a
 end;
 
-
 /// Возвращает отсортированную по возрастанию последовательность
 function Sorted<T>(Self: sequence of T): sequence of T; extensionmethod;
 begin

diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -17778,7 +17778,7 @@ public override void visit(SyntaxTree.int32_const int32)
             motivation_keeper.reset();
             switch (mot)
             {
-                case motivation.address_receiving: throw new CompilerInternalError("Addres receiving from constant"); 
+                case motivation.address_receiving: throw new CompilerInternalError("Address receiving from constant"); 
                 case motivation.expression_evaluation: return_value(en); break;
                 case motivation.semantic_node_reciving: return_semantic_value(en); break;
             }

diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
@@ -10158,7 +10158,6 @@ function Product(Self: sequence of BigInteger): BigInteger; extensionmethod;
     Result *= a
 end;
 
-
 /// Возвращает отсортированную по возрастанию последовательность
 function Sorted<T>(Self: sequence of T): sequence of T; extensionmethod;
 begin

diff --git a/bin/Lng/Rus/ParserErrors.dat b/bin/Lng/Rus/ParserErrors.dat
@@ -3,6 +3,7 @@
 
 BAD_FLOAT=Слишком большое вещественное
 BAD_INT=Слишком большое целое
+BAD_FORMED_NUM_CONST=Неверное использование разделителя в числовой константе
 BAD_HEX=Неправильная запись hex числа
 UNEXPECTED_SYMBOL{0}=Неожиданный символ '{0}'
 BAD_EXPR=Неверное выражение