From f4f68fc6d96d15dfefa736403ef06a22e60e0adc Mon Sep 17 00:00:00 2001 From: adams85 <31276480+adams85@users.noreply.github.com> Date: Sun, 23 Jun 2024 08:18:52 +0200 Subject: [PATCH] Upgrade to Acornima v1.1.0 (#1898) --- Directory.Packages.props | 4 ++-- Jint.Tests.PublicInterface/RavenApiUsageTests.cs | 6 +++--- Jint/Engine.Ast.cs | 2 +- Jint/Native/Function/ClassDefinition.cs | 2 +- Jint/Runtime/Interpreter/Expressions/JintArrayExpression.cs | 2 +- .../Runtime/Interpreter/Expressions/JintObjectExpression.cs | 2 +- Jint/Runtime/Modules/ModuleBuilder.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ae41d50794..7d9cf4a198 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,8 +4,8 @@ false - - + + diff --git a/Jint.Tests.PublicInterface/RavenApiUsageTests.cs b/Jint.Tests.PublicInterface/RavenApiUsageTests.cs index e23781cbfd..2b82de3260 100644 --- a/Jint.Tests.PublicInterface/RavenApiUsageTests.cs +++ b/Jint.Tests.PublicInterface/RavenApiUsageTests.cs @@ -16,7 +16,7 @@ public void CanBuildCustomScriptFunctionInstance() { var engine = new Engine(); - var properties = new List + var properties = new Node[] { new ObjectProperty(PropertyKind.Init, new Identifier("field"), new MemberExpression(new Identifier("self"), new Identifier("field"), computed: false, optional: false), false, false, false) @@ -24,8 +24,8 @@ public void CanBuildCustomScriptFunctionInstance() var functionExp = new FunctionExpression( new Identifier("functionId"), - NodeList.Create(new List { new Identifier("self") }), - new FunctionBody(NodeList.Create(new List { new ReturnStatement(new ObjectExpression(NodeList.Create(properties))) }), strict: false), + NodeList.From(new Identifier("self")), + new FunctionBody(NodeList.From(new ReturnStatement(new ObjectExpression(NodeList.From(properties)))), strict: false), generator: false, async: false); diff --git a/Jint/Engine.Ast.cs b/Jint/Engine.Ast.cs index e3d20a3e88..78b92ea6e6 100644 --- a/Jint/Engine.Ast.cs +++ b/Jint/Engine.Ast.cs @@ -54,7 +54,7 @@ public AstAnalyzer(IPreparationOptions preparationOptions) _preparationOptions = preparationOptions; } - public void NodeVisitor(Node node) + public void NodeVisitor(Node node, OnNodeContext _) { switch (node.Type) { diff --git a/Jint/Native/Function/ClassDefinition.cs b/Jint/Native/Function/ClassDefinition.cs index b03c73d65d..6a919e7348 100644 --- a/Jint/Native/Function/ClassDefinition.cs +++ b/Jint/Native/Function/ClassDefinition.cs @@ -282,7 +282,7 @@ private sealed class ClassFieldFunction : Node, IFunction public ClassFieldFunction(Expression expression) : base(NodeType.ExpressionStatement) { - var nodeList = NodeList.Create(new [] { new ReturnStatement(expression) }); + var nodeList = NodeList.From(new ReturnStatement(expression)); _statement = new FunctionBody(nodeList, strict: true); } diff --git a/Jint/Runtime/Interpreter/Expressions/JintArrayExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintArrayExpression.cs index 523c70c507..8e051a7bcf 100644 --- a/Jint/Runtime/Interpreter/Expressions/JintArrayExpression.cs +++ b/Jint/Runtime/Interpreter/Expressions/JintArrayExpression.cs @@ -118,7 +118,7 @@ protected override void ProcessItem(JsValue[] arguments, JsValue currentValue) internal sealed class JintEmptyArrayExpression : JintExpression { - public static JintEmptyArrayExpression Instance = new(new ArrayExpression(NodeList.Create(System.Linq.Enumerable.Empty()))); + public static JintEmptyArrayExpression Instance = new(new ArrayExpression(NodeList.From(Array.Empty()))); private JintEmptyArrayExpression(Expression expression) : base(expression) { diff --git a/Jint/Runtime/Interpreter/Expressions/JintObjectExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintObjectExpression.cs index cf5ec9c8fb..fb6077e972 100644 --- a/Jint/Runtime/Interpreter/Expressions/JintObjectExpression.cs +++ b/Jint/Runtime/Interpreter/Expressions/JintObjectExpression.cs @@ -246,7 +246,7 @@ private object BuildObjectNormal(EvaluationContext context) internal sealed class JintEmptyObjectExpression : JintExpression { - public static JintEmptyObjectExpression Instance = new(new ObjectExpression(NodeList.Create(System.Linq.Enumerable.Empty()))); + public static JintEmptyObjectExpression Instance = new(new ObjectExpression(NodeList.From(Array.Empty()))); private JintEmptyObjectExpression(Expression expression) : base(expression) { diff --git a/Jint/Runtime/Modules/ModuleBuilder.cs b/Jint/Runtime/Modules/ModuleBuilder.cs index 135773813e..48ed1c2971 100644 --- a/Jint/Runtime/Modules/ModuleBuilder.cs +++ b/Jint/Runtime/Modules/ModuleBuilder.cs @@ -136,7 +136,7 @@ internal Prepared Parse() if (_sourceRaw.Count <= 0) { - return new Prepared(new AstModule(NodeList.Create(Array.Empty())), parserOptions); + return new Prepared(new AstModule(NodeList.From(Array.Empty())), parserOptions); } var parser = new Parser(parserOptions);