Skip to content

Commit 5656b1d

Browse files
authored
Add more Acornima friendly type aliases (sebastienros#1825)
1 parent aca8fb3 commit 5656b1d

29 files changed

+233
-232
lines changed

Directory.Build.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@
3030
<Using Include="Esprima" />
3131
<Using Include="Esprima.Ast" />
3232
<Using Include="Esprima.Utils" />
33-
<Using Include="Esprima.Location" Alias="SourceLocation" />
33+
34+
<Using Include="Esprima.Ast.BindingPattern" Alias="DestructuringPattern" />
3435
<Using Include="Esprima.Ast.Nodes" Alias="NodeType" />
36+
<Using Include="Esprima.JavaScriptParser" Alias="Parser" />
37+
<Using Include="Esprima.Location" Alias="SourceLocation" />
38+
<Using Include="Esprima.TokenType" Alias="TokenKind" />
39+
<Using Include="Esprima.ParserException" Alias="ParseErrorException" />
3540
</ItemGroup>
3641

3742
</Project>

Jint.Benchmark/EngineComparisonBenchmark.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class EngineComparisonBenchmark
3838
[GlobalSetup]
3939
public void Setup()
4040
{
41-
var javaScriptParser = new JavaScriptParser();
41+
var parser = new Parser();
4242
foreach (var fileName in _files.Keys.ToList())
4343
{
4444
var script = File.ReadAllText($"Scripts/{fileName}.js");
@@ -47,7 +47,7 @@ public void Setup()
4747
script = _dromaeoHelpers + Environment.NewLine + Environment.NewLine + script;
4848
}
4949
_files[fileName] = script;
50-
_parsedScripts[fileName] = javaScriptParser.ParseScript(script, strict: true);
50+
_parsedScripts[fileName] = parser.ParseScript(script, strict: true);
5151
}
5252
}
5353

Jint.Benchmark/EngineConstructionBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class EngineConstructionBenchmark
1212
[GlobalSetup]
1313
public void GlobalSetup()
1414
{
15-
var parser = new JavaScriptParser();
15+
var parser = new Parser();
1616
_program = parser.ParseScript("([].length + ''.length)");
1717
_simple = parser.ParseScript("1");
1818
new Engine().Evaluate(_program);

Jint.Benchmark/Jint.Benchmark.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
<ItemGroup>
3535
<Using Include="Esprima" />
3636
<Using Include="Esprima.Ast" />
37+
<Using Include="Esprima.JavaScriptParser" Alias="Parser" />
3738
</ItemGroup>
3839
</Project>

Jint.Tests.CommonScripts/ConcurrencyTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public void ConcurrentEnginesCanUseSameAst(bool prepared)
1111
var scriptContents = SunSpiderTests.GetEmbeddedFile("babel-standalone.js");
1212
var script = prepared
1313
? Engine.PrepareScript(scriptContents)
14-
: new JavaScriptParser().ParseScript(scriptContents);
14+
: new Parser().ParseScript(scriptContents);
1515

1616
Parallel.ForEach(Enumerable.Range(0, 3), x =>
1717
{

Jint.Tests.PublicInterface/ShadowRealmTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void CanReuseScriptWithShadowRealm()
8383
var shadowRealm2 = engine.Intrinsics.ShadowRealm.Construct();
8484
shadowRealm2.SetValue("message", "realm 2");
8585

86-
var parser = new Esprima.JavaScriptParser();
86+
var parser = new Parser();
8787
var script = parser.ParseScript("(function hello() {return \"hello \" + message})();");
8888

8989
// Act & Assert

Jint.Tests.Test262/Test262Test.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private Engine BuildTestExecutor(Test262File file)
3838
}
3939

4040
var options = new ParserOptions { RegExpParseMode = RegExpParseMode.AdaptToInterpreted, Tolerant = false };
41-
var parser = new JavaScriptParser(options);
41+
var parser = new Parser(options);
4242
var script = parser.ParseScript(args.At(0).AsString());
4343

4444
return engine.Evaluate(script);
@@ -93,7 +93,7 @@ private static void ExecuteTest(Engine engine, Test262File file)
9393
}
9494
else
9595
{
96-
engine.Execute(new JavaScriptParser().ParseScript(file.Program, source: file.FileName));
96+
engine.Execute(new Parser().ParseScript(file.Program, source: file.FileName));
9797
}
9898
}
9999

0 commit comments

Comments
 (0)