Upgrade to Esprima 1.0.1270 (#712)

sebastienros · Mar 11, 2020 · 9e7027a · 9e7027a
1 parent a81a881
commit 9e7027a
Show file tree

Hide file tree

Showing 22 changed files with 254 additions and 337 deletions.
diff --git a/Jint.Benchmark/EngineConstructionBenchmark.cs b/Jint.Benchmark/EngineConstructionBenchmark.cs
@@ -1,17 +1,18 @@
 using BenchmarkDotNet.Attributes;
 using Esprima;
+using Esprima.Ast;
 
 namespace Jint.Benchmark
 {
     [MemoryDiagnoser]
     public class EngineConstructionBenchmark
     {
-        private readonly Esprima.Ast.Program _program;
+        private readonly Script _program;
 
         public EngineConstructionBenchmark()
         {
             var parser = new JavaScriptParser("return [].length + ''.length");
-            _program = parser.ParseProgram();
+            _program = parser.ParseScript();
         }
 
         [Benchmark]

diff --git a/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj b/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\*.*" />

diff --git a/Jint.Tests.Ecma/Jint.Tests.Ecma.csproj b/Jint.Tests.Ecma/Jint.Tests.Ecma.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Jint\Jint.csproj" />

diff --git a/Jint.Tests.Test262/Jint.Tests.Test262.csproj b/Jint.Tests.Test262/Jint.Tests.Test262.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Jint\Jint.csproj" />

diff --git a/Jint.Tests.Test262/test/skipped.json b/Jint.Tests.Test262/test/skipped.json
@@ -61,6 +61,10 @@
     "source": "built-ins/Symbol/species/builtin-getter-name.js",
     "reason": "Promise not implemented"
   },
+  {
+    "source": "language/expressions/object/method-definition/object-method-returns-promise.js",
+    "reason": "Promise not implemented"
+  },
   {
     "source": "built-ins/Symbol/species/subclassing.js",
     "reason": "subclassing not implemented"
@@ -613,199 +617,11 @@
   },
 
   // Esprima problems
-
-  {
-    "source": "language/statements/for/dstr-var-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-var-obj-ptrn-rest-skip-non-enumerable",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-var-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-const-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-const-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-const-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-const-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-let-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-let-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-let-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/statements/for/dstr-var-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/call/trailing-comma.js",
-    "reason": "Esprima problem"
-  },
+
   {
     "source": "language/statements/for/head-lhs-let.js",
     "reason": "Esprima problem"
   },
-  {
-    "source": "language/white-space/mongolian-vowel-separator-eval.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dflt-params-trailing-comma.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-dflt-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-dflt-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-dflt-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/dstr-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/params-trailing-comma-multiple.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/arrow-function/params-trailing-comma-single.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dflt-params-trailing-comma.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-dflt-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-dflt-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-dflt-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/dstr-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/params-trailing-comma-multiple.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-dflt-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-dflt-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-obj-ptrn-rest-getter.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-obj-ptrn-rest-val-obj.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/let-non-strict-access.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/async-meth-dflt-params-abrupt.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/async-meth-dflt-params-arg-val-not-undefined.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/async-meth-dflt-params-ref-later.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/async-meth-dflt-params-ref-prior.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/async-meth-dflt-params-ref-self.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-dflt-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/dstr-meth-obj-ptrn-rest-skip-non-enumerable.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/let-non-strict-syntax.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/meth-dflt-params-trailing-comma.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/meth-params-trailing-comma-multiple.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/meth-params-trailing-comma-single.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/object/method-definition/name-param-id-yield.js",
-    "reason": "Esprima problem"
-  },
   {
     "source": "language/expressions/object/yield-non-strict-access.js",
     "reason": "Esprima problem"
@@ -814,14 +630,6 @@
     "source": "language/expressions/object/yield-non-strict-syntax.js",
     "reason": "Esprima problem"
   },
-  {
-    "source": "language/expressions/object/method-definition/object-method-returns-promise.js",
-    "reason": "Esprima problem"
-  },
-  {
-    "source": "language/expressions/function/params-trailing-comma-single.js",
-    "reason": "Esprima problem"
-  },
   {
     "source": "built-ins/RegExp/prototype/source/value-u.js",
     "reason": "Esprima problem"
@@ -854,4 +662,12 @@
     "source": "built-ins/RegExp/S15.10.2.13_A2_T8.js",
     "reason": "Esprima problem"
   },
+  {
+    "source": "language/expressions/object/let-non-strict-access.js",
+    "reason": "Esprima problem"
+  },
+  {
+    "source": "language/expressions/object/let-non-strict-syntax.js",
+    "reason": "Esprima problem"
+  },
 ]
diff --git a/Jint.Tests/Jint.Tests.csproj b/Jint.Tests/Jint.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Runtime\Scripts\*.*;Parser\Scripts\*.*" />
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" Condition=" '$(TargetFramework)' == 'net452' " />
+    <Reference Include="Microsoft.CSharp" Condition=" '$(TargetFramework)' == 'net461' " />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />

diff --git a/Jint.Tests/Parser/JavascriptParserTests.cs b/Jint.Tests/Parser/JavascriptParserTests.cs
@@ -12,7 +12,7 @@ public class JavascriptParserTests
         [Fact]
         public void ShouldParseThis()
         {
-            var program = new JavaScriptParser("this").ParseProgram();
+            var program = new JavaScriptParser("this").ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -22,7 +22,7 @@ public void ShouldParseThis()
         [Fact]
         public void ShouldParseNull()
         {
-            var program = new JavaScriptParser("null").ParseProgram();
+            var program = new JavaScriptParser("null").ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -37,7 +37,7 @@ public void ShouldParseNumeric()
             var program = new JavaScriptParser(
                 @"
                 42
-            ").ParseProgram();
+            ").ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -51,7 +51,7 @@ public void ShouldParseBinaryExpression()
         {
             BinaryExpression binary;
 
-            var program = new JavaScriptParser("(1 + 2 ) * 3").ParseProgram();
+            var program = new JavaScriptParser("(1 + 2 ) * 3").ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -87,7 +87,7 @@ public void ShouldParseNumericLiterals(object expected, string source)
         {
             Literal literal;
 
-            var program = new JavaScriptParser(source).ParseProgram();
+            var program = new JavaScriptParser(source).ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -106,7 +106,7 @@ public void ShouldParseStringLiterals(string expected, string source)
         {
             Literal literal;
 
-            var program = new JavaScriptParser(source).ParseProgram();
+            var program = new JavaScriptParser(source).ParseScript();
             var body = program.Body;
 
             Assert.Single(body);
@@ -149,7 +149,7 @@ public void ShouldParseStringLiterals(string expected, string source)
 
         public void ShouldInsertSemicolons(string source)
         {
-            new JavaScriptParser(source).ParseProgram();
+            new JavaScriptParser(source).ParseScript();
         }
 
         [Fact]
@@ -159,7 +159,7 @@ public void ShouldProvideLocationForMultiLinesStringLiterals()
 \
 '
 ";
-            var program = new JavaScriptParser(source, new ParserOptions { Loc = true }).ParseProgram();
+            var program = new JavaScriptParser(source, new ParserOptions { Loc = true }).ParseScript();
             var expr = program.Body.First().As<ExpressionStatement>().Expression;
             Assert.Equal(1, expr.Location.Start.Line);
             Assert.Equal(0, expr.Location.Start.Column);
@@ -181,7 +181,7 @@ public void ShouldThrowErrorForInvalidLeftHandOperation()
         [InlineData("-.-")]
         public void ShouldThrowParserExceptionForInvalidCode(string code)
         {
-            Assert.Throws<ParserException>(() => new JavaScriptParser(code).ParseProgram());
+            Assert.Throws<ParserException>(() => new JavaScriptParser(code).ParseScript());
         }
     }
 }
diff --git a/Jint.Tests/Runtime/EngineTests.cs b/Jint.Tests/Runtime/EngineTests.cs
@@ -1458,7 +1458,12 @@ public void DateShouldAllowEntireDotNetDateRange()
             Assert.Equal(new DateTime(1, 1, 1, 0, 0, 0, DateTimeKind.Utc), minValue);
 
             var maxValue = engine.Execute("new Date('9999-12-31T23:59:59.999')").GetCompletionValue().ToObject();
+
+#if NETCOREAPP
+            Assert.Equal(new DateTime(9999, 12, 31, 23, 59, 59, 998, DateTimeKind.Utc), maxValue);
+#else
             Assert.Equal(new DateTime(9999, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc), maxValue);
+#endif
         }
 
         [Fact]