Merge pull request #35 from phantasma-io/dev

Dev
phantasma-io-archive · Aug 5, 2023 · 244795e · 244795e
2 parents ee20d6c + 5e325d4
commit 244795e
Show file tree

Hide file tree

Showing 40 changed files with 1,767 additions and 1,492 deletions.
diff --git a/Compiler/Properties/PublishProfiles/FolderProfile.pubxml b/Compiler/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>C:\Code\TOMB\Publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>
diff --git a/Compiler/TombCompiler.csproj b/Compiler/TombCompiler.csproj
@@ -7,10 +7,6 @@
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Phantasma.Business" Version="1.0.7" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Library\src\TOMBLib.csproj" />
   </ItemGroup>

diff --git a/Library/src/AST/Declarations/EventDeclaration.cs b/Library/src/AST/Declarations/EventDeclaration.cs
@@ -9,6 +9,15 @@
 using Phantasma.Business.Blockchain;
 using Phantasma.Business.CodeGen.Assembler;
 using Phantasma.Business.Blockchain.VM;
+using Phantasma.Core.Domain.VM;
+using Phantasma.Core.Domain.Interfaces;
+using Phantasma.Core.Domain.Token.Structs;
+using Phantasma.Core.Cryptography.Structs;
+using Phantasma.Core.Domain.Token.Enums;
+using Phantasma.Core.Domain.Contract;
+using Phantasma.Core.Domain.VM.Enums;
+using Phantasma.Core.Domain.Events.Structs;
+using Phantasma.Core.Domain.Execution.Enums;
 
 namespace Phantasma.Tomb.AST.Declarations
 {

diff --git a/Library/src/AST/Declarations/LibraryDeclaration.cs b/Library/src/AST/Declarations/LibraryDeclaration.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.Validation;
 using Phantasma.Tomb.CodeGen;
 
 namespace Phantasma.Tomb.AST.Declarations

diff --git a/Library/src/AST/Declarations/MethodDeclaration.cs b/Library/src/AST/Declarations/MethodDeclaration.cs
@@ -1,4 +1,7 @@
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.Contract;
+using Phantasma.Core.Domain.Contract.Structs;
+using Phantasma.Core.Domain.VM.Enums;
 using Phantasma.Tomb.AST.Statements;
 using Phantasma.Tomb.CodeGen;
 

diff --git a/Library/src/AST/Expressions/ArrayElementExpression.cs b/Library/src/AST/Expressions/ArrayElementExpression.cs
@@ -31,7 +31,15 @@ public override Register GenerateCode(CodeGenerator output)
             var dstReg = Compiler.Instance.AllocRegister(output, this);
             var idxReg = indexExpression.GenerateCode(output);
 
-            output.AppendLine(this, $"GET {decl.Register} {dstReg} {idxReg}");
+            var reg = decl.Register;
+            output.AppendLine(this, $"GET {reg} {dstReg} {idxReg}");
+
+            var arrayType = decl.Type as ArrayVarType;
+            if (arrayType == null)
+            {
+                throw new CompilerException(this, $"expected array type:" + decl.Name);
+            }
+            this.CallNecessaryConstructors(output, arrayType.elementType, decl.Register);
 
             Compiler.Instance.DeallocRegister(ref idxReg);
 

diff --git a/Library/src/AST/Expressions/BinaryExpression.cs b/Library/src/AST/Expressions/BinaryExpression.cs
@@ -1,4 +1,5 @@
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.VM.Enums;
 using Phantasma.Tomb.CodeGen;
 
 using System;

diff --git a/Library/src/AST/Expressions/MacroExpression.cs b/Library/src/AST/Expressions/MacroExpression.cs
@@ -1,4 +1,5 @@
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.Contract;
 using Phantasma.Core.Numerics;
 using Phantasma.Tomb.CodeGen;
 

diff --git a/Library/src/AST/MethodInterface.cs b/Library/src/AST/MethodInterface.cs
@@ -4,6 +4,7 @@
 using Phantasma.Tomb.AST.Expressions;
 using Phantasma.Tomb.AST.Declarations;
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.VM.Enums;
 
 namespace Phantasma.Tomb.AST
 {

diff --git a/Library/src/CodeGen/Contract.cs b/Library/src/CodeGen/Contract.cs
@@ -1,5 +1,8 @@
 using Phantasma.Business.VM;
 using Phantasma.Core.Domain;
+using Phantasma.Core.Domain.Contract;
+using Phantasma.Core.Domain.Validation;
+using Phantasma.Core.Domain.VM.Structs;
 using Phantasma.Tomb.AST;
 using Phantasma.Tomb.AST.Declarations;
 using Phantasma.Tomb.AST.Expressions;

diff --git a/Library/src/CodeGen/Libraries.cs b/Library/src/CodeGen/Libraries.cs