Merge pull request #27 from dmpas/develop

oscript 2-rc7 (#26)

Author: dmpas

NUnitTests/EngineHelpWrapper.cs

@@ -13,6 +13,7 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.HostedScript;
 using ScriptEngine.HostedScript.Extensions;
 using ScriptEngine.Hosting;
+using OneScript.Execution;
 
 namespace NUnitTests
 {
@@ -26,6 +27,8 @@ public EngineHelpWrapper()
 
 		private IValue TestRunner { get; set; }
 
+		private IBslProcess Process { get; set; }
+
 		public void StartEngine()
 		{
 			var builder = DefaultEngineBuilder.Create();
@@ -46,10 +49,11 @@ public void StartEngine()
 
 			var hosted = new HostedScriptEngine(Engine);
 			hosted.Initialize();
-			
+
 			var cs = Engine.GetCompilerService(); 
 			var testrunnerSource = LoadCodeFromAssemblyResource("NUnitTests.Tests.testrunner.os");
-			var testRunner = Engine.AttachedScriptsFactory.LoadFromString(cs, testrunnerSource);
+			Process = Engine.NewProcess();
+            var testRunner = Engine.AttachedScriptsFactory.LoadFromString(cs, testrunnerSource, Process);
 
 			TestRunner = (IValue)testRunner;
 
@@ -58,26 +62,26 @@ public void StartEngine()
 		public void RunTestScript(string resourceName)
 		{
 			var source = LoadCodeFromAssemblyResource(resourceName);
-			var test = Engine.AttachedScriptsFactory.LoadFromString(Engine.GetCompilerService(), source);
+			var test = Engine.AttachedScriptsFactory.LoadFromString(Engine.GetCompilerService(), source, Process);
 
 			ArrayImpl testArray;
 			{
 				var methodIndex = test.GetMethodNumber("ПолучитьСписокТестов");
-				test.CallAsFunction(methodIndex, new IValue[] { TestRunner }, out var ivTests);
+				test.CallAsFunction(methodIndex, new IValue[] { TestRunner }, out var ivTests, Process);
 				testArray = ivTests as ArrayImpl;
 			}
 
 			foreach (var ivTestName in testArray)
 			{
-				string testName = ivTestName.AsString();
+				string testName = ivTestName.ExplicitString();
 				var methodIndex = test.GetMethodNumber(testName);
 				if (methodIndex == -1)
 				{
 					// Тест указан, но процедуры нет или она не экспортирована
 					continue;
 				}
 
-				test.CallAsProcedure(methodIndex, new IValue[] { });
+				test.CallAsProcedure(methodIndex, new IValue[] { }, Process);
 			}
 		}
 

NUnitTests/NUnitTests.csproj

@@ -11,10 +11,10 @@
         <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
 
-        <PackageReference Include="OneScript" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc6" />
+        <PackageReference Include="OneScript" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc.7" />
     </ItemGroup>
 
     <ItemGroup>

TestApp/TestApp.csproj

@@ -10,9 +10,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneScript" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc6" />
+        <PackageReference Include="OneScript" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc.7" />
     </ItemGroup>
 
     <ItemGroup>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.7-{build}
+version: 1.0.8-{build}
 image: Visual Studio 2022
 environment:
   main_project: v8unpack
@@ -15,7 +15,7 @@ install:
 
     cd os2
 
-    appveyor DownloadFile https://oscript.io/downloads/2_0_0_rc6/OneScript-2.0.0-rc6-fdd-x64.zip -FileName fdd.zip
+    appveyor DownloadFile https://oscript.io/downloads/night-build/OneScript-2.0.0-rc.7+599-fdd-x64.zip -FileName fdd.zip
 
     7z x fdd.zip > NUL
     

oslib/packagedef

@@ -1,10 +1,9 @@
 Описание
 	.Имя("v8unpack")
-	.Версия("1.0.7")
+	.Версия("1.0.8")
 	.Автор("Sergey Batanov")
 	.АдресАвтора("sergey.batanov@dmpas.ru")
 	.Описание("Компонента работы с файлами формата 8")
-	//.ВерсияСреды("2.0.0")
 	.ВключитьФайл("Components")
 	.ВключитьФайл("package-loader.os")
 ;

v8unpack/File8Collection.cs

@@ -8,18 +8,18 @@ This Source Code Form is subject to the terms of the
 	Author:			disa_da
 	E-mail:			disa_da2@mail.ru
 /**
-	2014-2017       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
+	2014-2025       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
 */
-using System;
-using ScriptEngine.Machine.Contexts;
-using System.Collections.Generic;
-using ScriptEngine.Machine;
-using System.Linq;
-using System.Collections;
-using OneScript.Commons;
 using OneScript.Contexts;
 using OneScript.Exceptions;
+using OneScript.Execution;
 using OneScript.Types;
+using ScriptEngine.Machine;
+using ScriptEngine.Machine.Contexts;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace v8unpack
 {
@@ -48,22 +48,26 @@ public int Count()
 			return _data.Count;
 		}
 
-		/// <summary>
-		/// Получает файл по имени или индексу.
-		/// </summary>
-		/// <param name="index">Номер или имя.</param>
-		[ContextMethod("Получить")]
+		public int Count(IBslProcess process)
+		{
+			return Count();
+		}
+
+        /// <summary>
+        /// Получает файл по имени или индексу.
+        /// </summary>
+        /// <param name="index">Номер или имя.</param>
+        [ContextMethod("Получить")]
 		public File8 Get(IValue index)
 		{
-			var rawIndex = index.GetRawValue();
-			if (rawIndex.SystemType == BasicTypes.Number)
+			if (index.SystemType == BasicTypes.Number)
 			{
-				return Get((int)rawIndex.AsNumber());
+				return Get((int)index.AsNumber());
 			}
 
-			if (rawIndex.SystemType == BasicTypes.String)
+			if (index.SystemType == BasicTypes.String)
 			{
-				return Get(rawIndex.AsString());
+				return Get(index.ExplicitString());
 			}
 
 			throw RuntimeException.InvalidArgumentType(nameof(index));

v8unpack/File8Reader.cs

@@ -179,7 +179,7 @@ public void Close()
 		public static IRuntimeContextInstance Constructor(IValue filename, IValue dataPacked = null)
 		{
 			const int MAGIC_SIZE = 100 * 1024;
-			var fileStream = new FileStream(filename.AsString(), FileMode.Open);
+			var fileStream = new FileStream(filename.ExplicitString(), FileMode.Open);
 			if (fileStream.Length >= MAGIC_SIZE)
 			{
 				return new File8Reader(fileStream, dataPacked?.AsBoolean() ?? true);

v8unpack/v8unpack.csproj

@@ -11,8 +11,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneScript" Version="2.0.0-rc6" />
-        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc6" />
+        <PackageReference Include="OneScript" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc.7" />
+        <PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc.7" />
     </ItemGroup>
 
 </Project>