updated parser, 8.2 language level added, 8.2 default language level

peachpiecompiler · May 22, 2023 · 531bcf0 · 531bcf0
1 parent f629a42
commit 531bcf0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -42,7 +42,7 @@
 
     <PeachpieLibraryRegularExpressionsVersion>1.6.0</PeachpieLibraryRegularExpressionsVersion>
     <MySqlConnectorVersion>2.0.0</MySqlConnectorVersion>
-    <ParserVersion>8.2.12198</ParserVersion>
+    <ParserVersion>8.2.13126</ParserVersion>
     <PeachpieMicrosoftCodeAnalysisVersion>3.7.1</PeachpieMicrosoftCodeAnalysisVersion>
 
   </PropertyGroup>

diff --git a/src/Peachpie.CodeAnalysis/Semantics/Graph/BuilderVisitor.cs b/src/Peachpie.CodeAnalysis/Semantics/Graph/BuilderVisitor.cs
@@ -795,14 +795,14 @@ public override void VisitIfStmt(IfStmt x)
             var end = NewBlock();
 
             var conditions = x.Conditions;
-            Debug.Assert(conditions.Count != 0);
+            Debug.Assert(conditions.Length != 0);
             BoundBlock elseBlock = null;
-            for (int i = 0; i < conditions.Count; i++)
+            for (int i = 0; i < conditions.Length; i++)
             {
                 var cond = conditions[i];
                 if (cond.Condition != null)  // if (Condition) ...
                 {
-                    elseBlock = (i == conditions.Count - 1) ? end : NewBlock();
+                    elseBlock = (i == conditions.Length - 1) ? end : NewBlock();
                     _current = Connect(_current, NewBlock(), elseBlock, cond.Condition);
                 }
                 else  // else ...

diff --git a/src/Peachpie.CodeAnalysis/Syntax/AdditionalSyntaxProvider.cs b/src/Peachpie.CodeAnalysis/Syntax/AdditionalSyntaxProvider.cs
@@ -50,6 +50,8 @@ public TValue TokenValue
 
         public string TokenText => _provider.TokenText;
 
+        public ReadOnlySpan<char> TokenTextSpan => _provider.TokenTextSpan;
+
         public IDocBlock DocComment { get => _provider.DocComment; set => _provider.DocComment = value; }
 
         public int GetNextToken()

diff --git a/src/Peachpie.CodeAnalysis/Syntax/NodesFactory.cs b/src/Peachpie.CodeAnalysis/Syntax/NodesFactory.cs
@@ -127,7 +127,7 @@ FunctionCall WithGenericTypes(FunctionCall call, Span nameSpan)
             return call;
         }
 
-        public override LangElement GlobalCode(Span span, IEnumerable<LangElement> statements, NamingContext context)
+        public override LangElement GlobalCode(Span span, Statement[] statements, NamingContext context)
         {
             Debug.Assert(_annotations == null || _annotations.Count == 0, $"file {this.SourceUnit.FilePath} contains CLR annotations we did not consume! Probably a bogus in AdditionalSyntaxProvider."); // all parsed custom annotations have to be consumed
 
@@ -189,13 +189,19 @@ public override LangElement YieldFrom(Span span, LangElement fromExpr)
             return AddAndReturn(ref _yieldNodes, base.YieldFrom(span, fromExpr));
         }
 
-        public Literal Literal(Span span, long lvalue) => new LongIntLiteral(span, lvalue); // overload to avoid boxing
+        public override LangElement Literal(Span span, double value, ReadOnlySpan<char> originalValue)
+        {
+            return base.Literal(span, value, originalValue: null);
+        }
 
-        public Literal Literal(Span span, double dvalue) => new DoubleLiteral(span, dvalue); // overload to avoid boxing
+        public override LangElement Literal(Span span, long value, ReadOnlySpan<char> originalValue)
+        {
+            return base.Literal(span, value, originalValue: null);
+        }
 
-        public override LangElement Literal(Span span, object value, string originalValue)
+        public override LangElement Literal(Span span, object value, ReadOnlySpan<char> originalValue)
         {
-            return base.Literal(span, value, originalValue: null);  // discard the original value string, not needed, free some memory
+            return base.Literal(span, value, originalValue: null);
         }
 
         public override LangElement EncapsedExpression(Span span, LangElement expression, Tokens openDelimiter) => expression;

diff --git a/src/Peachpie.CodeAnalysis/Syntax/PhpSyntaxTree.cs b/src/Peachpie.CodeAnalysis/Syntax/PhpSyntaxTree.cs
@@ -85,11 +85,12 @@ public class PhpSyntaxTree : SyntaxTree
 
             { new Version(8, 0), LanguageFeatures.Php80Set },
             { new Version(8, 1), LanguageFeatures.Php81Set },
+            { new Version(8, 2), LanguageFeatures.Php82Set },
         };
 
         public static Version LatestLanguageVersion => SupportedLanguageVersions.Max();
 
-        public static Version DefaultLanguageVersion => new Version(8, 0);
+        public static Version DefaultLanguageVersion => new Version(8, 2);
 
         public static IReadOnlyCollection<Version> SupportedLanguageVersions => s_langversions.Keys;
 
@@ -178,7 +179,7 @@ static LanguageFeatures GetLanguageFeatures(PhpParseOptions options)
             {
                 // Parser leaves factory.Root to null in the case of syntax errors -> create a proxy syntax node
                 var fullSpan = new Devsense.PHP.Text.Span(0, sourceText.Length);
-                result.Root = new GlobalCode(fullSpan, ImmutableArray<Statement>.Empty, unit);
+                result.Root = new GlobalCode(fullSpan, Array.Empty<Statement>(), unit);
             }
 
             //

diff --git a/src/Peachpie.CodeAnalysis/Syntax/PhpTokenProvider.cs b/src/Peachpie.CodeAnalysis/Syntax/PhpTokenProvider.cs
@@ -81,6 +81,8 @@ public string TokenText
             }
         }
 
+        public ReadOnlySpan<char> TokenTextSpan => TokenText.AsSpan();
+
         public IDocBlock DocComment
         {
             get => _docblock;