Merge branch 'dev'

Author: AminRezaei0x443

README.md

@@ -1,7 +1,7 @@
 <img align="left" width="64" height="64" src="./assets/dbuilder-icon.png">
 
 # dBuilder.py
-[![PyPI version](https://img.shields.io/badge/dbuilder-0.1.0-informational?style=flat-square&color=FFFF91)](https://pypi.org/project/dbuilder/)
+[![PyPI version](https://img.shields.io/badge/dbuilder-0.2.0-informational?style=flat-square&color=FFFF91)](https://pypi.org/project/dbuilder/)
 [![Telegram](https://img.shields.io/badge/Telegram-@d__builder-informational?style=flat-square&color=0088cc)](https://t.me/d_builder)
 
 dBuilder.py is smart contract development framework in Python for [TON (The Open Network)](https://ton.org). Its purpose is to make the development, testing, and deployment procedures much easier!

dbuilder/__init__.py

@@ -1,3 +1,4 @@
 from dbuilder.ast import *
-from dbuilder.func import *
 from dbuilder.core import *
+from dbuilder.func import *
+from dbuilder.types import *

dbuilder/ast/__init__.py

@@ -1,8 +1,5 @@
+from dbuilder.ast.ast import AST
+from dbuilder.ast.ast_patcher import patch
+from dbuilder.ast.calls import CallStacks
+from dbuilder.ast.compiled_contract import CompiledContract
 from dbuilder.ast.printer import Printer
-from dbuilder.ast.node import Node
-from dbuilder.ast.statement import Statement
-from dbuilder.ast.expr import Expr
-from dbuilder.ast.method import Method
-from dbuilder.ast.contract import Contract
-from dbuilder.ast.control_flow import ControlFlow
-from dbuilder.ast.condition import IfFlow

dbuilder/ast/ast.py

@@ -1,4 +1,4 @@
-from dbuilder.ast import Node
+from dbuilder.ast.types import Node
 
 
 class AST:

dbuilder/func/ast_patcher.py dbuilder/ast/ast_patcher.pydbuilder/func/ast_patcher.py renamed to dbuilder/ast/ast_patcher.py

@@ -115,6 +115,18 @@ def visit_Assign(self, node):
         else:
             target = node.targets[0].id
             nodes = [node]
+            if isinstance(node.value, ast.Constant):
+                if isinstance(node.value.value, int):
+                    node.value = ast.Call(
+                        func=ast.Attribute(
+                            value=ast.Name(id="self", ctx=ast.Load()),
+                            attr="factory_",
+                            ctx=ast.Load(),
+                        ),
+                        args=[ast.Constant("int"), node.value],
+                        keywords=[],
+                    )
+
             c_expr = ast.Call(
                 func=ast.Attribute(
                     value=ast.Name(id=target, ctx=ast.Load()),

dbuilder/func/calls.py dbuilder/ast/calls.pydbuilder/func/calls.py renamed to dbuilder/ast/calls.py

@@ -1,5 +1,12 @@
-from dbuilder.ast import Contract, IfFlow, Method, Node, Statement
-from dbuilder.ast.loop import WhileLoop
+from dbuilder.ast.types import (
+    AsmMethod,
+    Contract,
+    IfFlow,
+    Method,
+    Node,
+    Statement,
+    WhileLoop,
+)
 
 
 class CallStacks(object):
@@ -35,6 +42,15 @@ def declare_method(name, args, annotations):
         m = Method(name, args, annotations)
         CallStacks.current_contract.add_method(m)
 
+    @staticmethod
+    def declare_asm(name, args, annotations, asm_annoations):
+        m = AsmMethod(name, args, annotations, asm_annoations)
+        CallStacks.current_contract.add_method(m)
+
+    @staticmethod
+    def add_raw_statement(raw):
+        CallStacks.current_contract.add_statement(raw)
+
     @staticmethod
     def add_statement(type, *args):
         s = Statement(type, args)
@@ -44,6 +60,7 @@ def add_statement(type, *args):
     @staticmethod
     def return_(entity):
         CallStacks.add_statement(Statement.RETURN, entity)
+        return entity
 
     @staticmethod
     def end_method(method):

dbuilder/func/compiled_contract.py dbuilder/ast/compiled_contract.pydbuilder/func/compiled_contract.py renamed to dbuilder/ast/compiled_contract.py

@@ -1,4 +1,4 @@
-from dbuilder import Printer
+from dbuilder.ast.printer import Printer
 
 
 class CompiledContract(object):

dbuilder/ast/types/__init__.py

@@ -0,0 +1,9 @@
+from dbuilder.ast.types.asm_method import AsmMethod
+from dbuilder.ast.types.condition import IfFlow
+from dbuilder.ast.types.contract import Contract
+from dbuilder.ast.types.control_flow import ControlFlow
+from dbuilder.ast.types.expr import Expr
+from dbuilder.ast.types.loop import WhileLoop
+from dbuilder.ast.types.method import Method
+from dbuilder.ast.types.node import Node
+from dbuilder.ast.types.statement import Statement

dbuilder/ast/types/asm_method.py

@@ -0,0 +1,80 @@
+from dbuilder.ast.printer import Printer
+from dbuilder.ast.types.node import Node
+from dbuilder.ast.types.statement import Statement
+from dbuilder.ast.utils import _type_name
+
+
+class AsmMethod(Node):
+    statement: Statement
+
+    def __init__(self, name, args, annotations, asm_annotations):
+        super().__init__()
+        self.name = name
+        self.args = args
+        self.annotations = annotations
+        self.asm_annotations = asm_annotations
+        self.statement = None
+
+    def add_statement(self, statement):
+        if statement.type != Statement.RETURN:
+            raise RuntimeError("Unexpected statement on asm method")
+        self.statement = statement
+
+    def _get_specs(self):
+        sd = self.annotations.get("_method")
+        if not sd:
+            return ""
+        res = []
+        if sd["impure"]:
+            res.append("impure")
+        if sd["inline"]:
+            res.append("inline")
+        elif sd["inline_ref"]:
+            res.append("inline_ref")
+        elif sd["method_id"]:
+            if sd["method_id_v"]:
+                res.append("method_id(%d)" % sd["method_id_v"])
+            else:
+                res.append("method_id")
+        if len(res) == 0:
+            return ""
+        return " ".join(res) + " "
+
+    def print_func(self, printer: Printer):
+        type_namer = lambda x: "{type} {name}".format(
+            type=_type_name(x[0]),
+            name=x[1],
+        )
+        tupler = lambda x: (self.annotations[x], x)
+        arg_defs = list(map(type_namer, map(tupler, self.args)))
+
+        name = self.name
+        fname = self.annotations["_fname"]
+        name = name if fname is None else fname
+
+        entity = self.statement.args[0]
+        entity = entity if isinstance(entity, tuple) else (entity,)
+        rearrange = []
+        input_order = self.asm_annotations["input_order"]
+        out_order = self.asm_annotations["out_order"]
+        # TODO: Check Args (Better on annotation side)
+        if input_order:
+            input_arrange = " ".join(input_order)
+            rearrange.append(input_arrange)
+        if out_order:
+            out_arrange = "-> " + " ".join(str(i) for i in out_order)
+            rearrange.append(out_arrange)
+        rearrange = " ".join(rearrange)
+        if rearrange != "":
+            rearrange = f"({rearrange})"
+
+        printer.print(
+            "{output} {name}({args}) {specs}asm{rearrange} {entity};",
+            output=_type_name(self.annotations["return"]),
+            name=name,
+            args=", ".join(arg_defs),
+            specs=self._get_specs(),
+            o="{",
+            rearrange=rearrange,
+            entity=" ".join(f'"{x}"' for x in entity),
+        )

dbuilder/ast/condition.py dbuilder/ast/types/condition.pydbuilder/ast/condition.py renamed to dbuilder/ast/types/condition.py

@@ -1,4 +1,6 @@
-from dbuilder.ast import ControlFlow, Printer, Statement
+from dbuilder.ast.printer import Printer
+from dbuilder.ast.types.control_flow import ControlFlow
+from dbuilder.ast.types.statement import Statement
 
 
 class IfFlow(ControlFlow):