hebi.compilerhebi.compilerhebi.compilerhebi.compilerhebi.compilerhebi.compilerhebi.compilerhebi.compilerdef visit_Return(self, node: TypedReturn) -> typing.Callable[[plt.AST], plt.AST]:
# Throw away the term we were passed, this is going to be the last!
compiled_return = self.visit(node.value)
- if isinstance(node.typ.typ.rettyp.typ, AnyType):
+ if isinstance(node.typ.typ, AnyType):
# if the function returns generic data, wrap the function return value
compiled_return = transform_output_map(node.value.typ)(compiled_return)
return lambda _: compiled_returnYou can sponsor the development of hebi through GitHub or Teiki or just by sending ADA. Drop me a message on social media and let me know what it is for.
$opshin or addr1qyz3vgd5xxevjy2rvqevz9n7n7dney8n6hqggp23479fm6vwpj9clsvsf85cd4xc59zjztr5zwpummwckmzr2myjwjns74lhmr.hebi.std.fractionshebi.tests.test_mischebi.tests.test_mischebi.tests.test_mischebi.tests.test_mischebi.tests.test_mischebi.tests.test_mischebi.tests.test_misc
@@ -2097,8 +2013,8 @@ Methods
self.assertTrue(failed, "Machine did validate the content")
-
-def test_dict_items_values_deconstr(self) ‑> None
+
+def test_different_return_types_anything(self)
-
@@ -2106,48 +2022,22 @@
Methods
Expand source code
- @given(
- xs=st.dictionaries(
- st.binary(),
- st.dictionaries(st.binary(), st.integers(), max_size=3),
- max_size=5,
- )
- )
- def test_dict_items_values_deconstr(self, xs):
- # nested deconstruction with a Value-like object
- source_code = """
-def validator(xs: Dict[bytes, Dict[bytes, int]]) -> int:
- sum_values = 0
- for pid, tk_dict in xs.items():
- for tk_name, tk_amount in tk_dict.items():
- sum_values += tk_amount
- return sum_values
+ def test_different_return_types_anything(self):
+ source_code = """
+from hebi.prelude import *
+
+def validator(a: int) -> Anything:
+ if a > 0:
+ return b""
+ else:
+ return 0
"""
ast = compiler.parse(source_code)
- code = compiler.compile(ast)
- code = code.compile()
- f = code.term
- # UPLC lambdas may only take one argument at a time, so we evaluate by repeatedly applying
- for d in [
- uplc.PlutusMap(
- {
- uplc.PlutusByteString(k): uplc.PlutusMap(
- {
- uplc.PlutusByteString(k2): uplc.PlutusInteger(v2)
- for k2, v2 in v.items()
- }
- )
- for k, v in xs.items()
- }
- )
- ]:
- f = uplc.Apply(f, d)
- ret = uplc_eval(f).value
- self.assertEqual(
- ret,
- sum(v for pid, d in xs.items() for nam, v in d.items()),
- "for loop deconstruction did not behave as expected",
- )
+ code = compiler.compile(ast).compile()
+ res = uplc_eval(uplc.Apply(code, uplc.PlutusInteger(1)))
+ self.assertEqual(res, uplc.PlutusByteString(b""))
+ res = uplc_eval(uplc.Apply(code, uplc.PlutusInteger(-1)))
+ self.assertEqual(res, uplc.PlutusInteger(0))
@@ -2286,7 +2176,7 @@ Methods
]:
f = uplc.Apply(f, d)
ret = uplc_eval(f)
- self.assertEqual(ret, uplc.BuiltinUnit())
+ self.assertEqual(ret, uplc.PlutusConstr(0, []))
@@ -2513,7 +2403,7 @@ Methods
def test_no_parameter_annotation(self):
source_code = """
-from opshin.prelude import *
+from hebi.prelude import *
def validator(a) -> bytes:
b: bytes = a
@@ -2560,7 +2450,7 @@ Methods
def test_no_return_annotation(self):
source_code = """
-from opshin.prelude import *
+from hebi.prelude import *
def validator():
return b""
@@ -2571,6 +2461,28 @@ Methods
self.assertEqual(res, uplc.PlutusByteString(b""))
+
+def test_no_return_annotation_no_return(self)
+-
+
+
+
+Expand source code
+
+ def test_no_return_annotation_no_return(self):
+ source_code = """
+from hebi.prelude import *
+
+def validator(a):
+ pass
+"""
+ ast = compiler.parse(source_code)
+ code = compiler.compile(ast).compile()
+ res = uplc_eval(uplc.Apply(code, uplc.PlutusConstr(0, [])))
+ self.assertEqual(res, uplc.PlutusConstr(0, []))
+
+
@@ -2734,7 +2646,7 @@ Methods
def test_return_anything(self):
source_code = """
-from opshin.prelude import *
+from hebi.prelude import *
def validator() -> Anything:
return b""
@@ -3317,7 +3229,7 @@ test_complex_datum_correct_vals
test_datum_casttest_dict_datumtest_dict_items_values_deconstrtest_different_return_types_anythingtest_dual_use_compiletest_fib_rectest_gift_contract_failtest_no_parameter_annotation
test_no_reassigntest_no_return_annotationtest_no_return_annotation_no_returntest_opt_shared_vartest_overopt_removedeadvartest_parameterized_compileModule hebi.tests.test_stdlib
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
def validator(xs: Dict[int, bytes]) -> int:
- sum_keys = 0
- for x in xs.items():
- sum_keys += x[0]
+ sum_keys = sum([x[0] for x in xs.items()])
return sum_keys
"""
ast = compiler.parse(source_code)
@@ -203,14 +201,12 @@ Module hebi.tests.test_stdlib
ret = uplc_eval(f).value
self.assertEqual(ret, sum(xs.keys()), "dict.items returned wrong value")
- @given(xs=st.dictionaries(st.integers(), st.binary()))
+ @given(xs=st.dictionaries(st.binary(), st.integers()))
def test_dict_items_values_sum(self, xs):
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
-def validator(xs: Dict[int, bytes]) -> bytes:
- sum_values = b""
- for x in xs.items():
- sum_values += x[1]
+def validator(xs: Dict[bytes, int]) -> int:
+ sum_values = sum([x[1] for x in xs.items()])
return sum_values
"""
ast = compiler.parse(source_code)
@@ -220,12 +216,12 @@ Module hebi.tests.test_stdlib
# UPLC lambdas may only take one argument at a time, so we evaluate by repeatedly applying
for d in [
uplc.PlutusMap(
- {uplc.PlutusInteger(k): uplc.PlutusByteString(v) for k, v in xs.items()}
+ {uplc.PlutusByteString(k): uplc.PlutusInteger(v) for k, v in xs.items()}
)
]:
f = uplc.Apply(f, d)
ret = uplc_eval(f).value
- self.assertEqual(ret, b"".join(xs.values()), "dict.items returned wrong value")
+ self.assertEqual(ret, sum(xs.values()), "dict.items returned wrong value")
@given(xs=st.text())
def test_str_encode(self, xs):
@@ -330,7 +326,9 @@ Module hebi.tests.test_stdlib
for d in [uplc.BuiltinUnit()]:
f = uplc.Apply(f, d)
ret = uplc_eval(f)
- self.assertEqual(ret, uplc.BuiltinUnit(), "literal None returned wrong value")
+ self.assertEqual(
+ ret, uplc.PlutusConstr(0, []), "literal None returned wrong value"
+ )
@given(st.booleans())
def test_constant_bool(self, x: bool):
@@ -502,9 +500,7 @@ Classes
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
def validator(xs: Dict[int, bytes]) -> int:
- sum_keys = 0
- for x in xs.items():
- sum_keys += x[0]
+ sum_keys = sum([x[0] for x in xs.items()])
return sum_keys
"""
ast = compiler.parse(source_code)
@@ -521,14 +517,12 @@ Classes
ret = uplc_eval(f).value
self.assertEqual(ret, sum(xs.keys()), "dict.items returned wrong value")
- @given(xs=st.dictionaries(st.integers(), st.binary()))
+ @given(xs=st.dictionaries(st.binary(), st.integers()))
def test_dict_items_values_sum(self, xs):
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
-def validator(xs: Dict[int, bytes]) -> bytes:
- sum_values = b""
- for x in xs.items():
- sum_values += x[1]
+def validator(xs: Dict[bytes, int]) -> int:
+ sum_values = sum([x[1] for x in xs.items()])
return sum_values
"""
ast = compiler.parse(source_code)
@@ -538,12 +532,12 @@ Classes
# UPLC lambdas may only take one argument at a time, so we evaluate by repeatedly applying
for d in [
uplc.PlutusMap(
- {uplc.PlutusInteger(k): uplc.PlutusByteString(v) for k, v in xs.items()}
+ {uplc.PlutusByteString(k): uplc.PlutusInteger(v) for k, v in xs.items()}
)
]:
f = uplc.Apply(f, d)
ret = uplc_eval(f).value
- self.assertEqual(ret, b"".join(xs.values()), "dict.items returned wrong value")
+ self.assertEqual(ret, sum(xs.values()), "dict.items returned wrong value")
@given(xs=st.text())
def test_str_encode(self, xs):
@@ -648,7 +642,9 @@ Classes
for d in [uplc.BuiltinUnit()]:
f = uplc.Apply(f, d)
ret = uplc_eval(f)
- self.assertEqual(ret, uplc.BuiltinUnit(), "literal None returned wrong value")
+ self.assertEqual(
+ ret, uplc.PlutusConstr(0, []), "literal None returned wrong value"
+ )
@given(st.booleans())
def test_constant_bool(self, x: bool):
@@ -799,7 +795,9 @@ Methods
for d in [uplc.BuiltinUnit()]:
f = uplc.Apply(f, d)
ret = uplc_eval(f)
- self.assertEqual(ret, uplc.BuiltinUnit(), "literal None returned wrong value")
+ self.assertEqual(
+ ret, uplc.PlutusConstr(0, []), "literal None returned wrong value"
+ )
@@ -853,9 +851,7 @@ Methods
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
def validator(xs: Dict[int, bytes]) -> int:
- sum_keys = 0
- for x in xs.items():
- sum_keys += x[0]
+ sum_keys = sum([x[0] for x in xs.items()])
return sum_keys
"""
ast = compiler.parse(source_code)
@@ -882,14 +878,12 @@ Methods
Expand source code
- @given(xs=st.dictionaries(st.integers(), st.binary()))
+ @given(xs=st.dictionaries(st.binary(), st.integers()))
def test_dict_items_values_sum(self, xs):
# this tests that errors that are caused by assignments are actually triggered at the time of assigning
source_code = """
-def validator(xs: Dict[int, bytes]) -> bytes:
- sum_values = b""
- for x in xs.items():
- sum_values += x[1]
+def validator(xs: Dict[bytes, int]) -> int:
+ sum_values = sum([x[1] for x in xs.items()])
return sum_values
"""
ast = compiler.parse(source_code)
@@ -899,12 +893,12 @@ Methods
# UPLC lambdas may only take one argument at a time, so we evaluate by repeatedly applying
for d in [
uplc.PlutusMap(
- {uplc.PlutusInteger(k): uplc.PlutusByteString(v) for k, v in xs.items()}
+ {uplc.PlutusByteString(k): uplc.PlutusInteger(v) for k, v in xs.items()}
)
]:
f = uplc.Apply(f, d)
ret = uplc_eval(f).value
- self.assertEqual(ret, b"".join(xs.values()), "dict.items returned wrong value")
+ self.assertEqual(ret, sum(xs.values()), "dict.items returned wrong value")
diff --git a/docs/hebi/type_inference.html b/docs/hebi/type_inference.html
index 6b81272..284d693 100644
--- a/docs/hebi/type_inference.html
+++ b/docs/hebi/type_inference.html
@@ -72,7 +72,7 @@ Module hebi.type_inference
import ast
from .typed_ast import *
-from .util import PythonBuiltInTypes, CompilingNodeTransformer
+from .util import PythonBuiltInTypes, CompilingNodeTransformer, ReturnExtractor
# from frozendict import frozendict
@@ -112,21 +112,12 @@ Module hebi.type_inference
)
-class ReturnExtractor(NodeVisitor):
- """Utility to find all Return statements in an AST subtree"""
-
- def __init__(self):
- self.returns = []
-
- def visit_Return(self, node: Return) -> None:
- self.returns.append(node)
-
-
class AggressiveTypeInferencer(CompilingNodeTransformer):
step = "Static Type Inference"
# A stack of dictionaries for storing scoped knowledge of variable types
scopes = [INITIAL_SCOPE]
+ current_ret_type = []
# Obtain the type of a variable name in the current scope
def variable_type(self, name: str) -> Type:
@@ -420,11 +411,13 @@ Module hebi.type_inference
def visit_FunctionDef(self, node: FunctionDef) -> TypedFunctionDef:
tfd = copy(node)
assert not node.decorator_list, "Functions may not have decorators"
+ rettyp = InstanceType(self.type_from_annotation(tfd.returns))
self.enter_scope()
+ self.current_ret_type.append(rettyp)
tfd.args = self.visit(node.args)
functyp = FunctionType(
[t.typ for t in tfd.args.args],
- InstanceType(self.type_from_annotation(tfd.returns)),
+ rettyp,
)
tfd.typ = InstanceType(functyp)
# We need the function type inside for recursion
@@ -437,13 +430,14 @@ Module hebi.type_inference
# Check that return type and annotated return type match
if not rets:
assert (
- functyp.rettyp == NoneInstanceType
+ functyp.rettyp >= NoneInstanceType
), f"Function '{node.name}' has no return statement but is supposed to return not-None value"
else:
assert all(
functyp.rettyp >= r.typ for r in rets
), f"Function '{node.name}' annotated return type does not match actual return type"
self.exit_scope()
+ self.current_ret_type.pop(-1)
# We need the function type outside for usage
self.set_variable_type(node.name, tfd.typ)
return tfd
@@ -611,7 +605,9 @@ Module hebi.type_inference
def visit_Return(self, node: Return) -> TypedReturn:
tp = copy(node)
tp.value = self.visit(node.value)
- tp.typ = tp.value.typ
+ tp.typ = (
+ tp.value.typ if not self.current_ret_type else self.current_ret_type[-1]
+ )
return tp
def visit_Attribute(self, node: Attribute) -> TypedAttribute:
@@ -848,6 +844,7 @@ Classes
# A stack of dictionaries for storing scoped knowledge of variable types
scopes = [INITIAL_SCOPE]
+ current_ret_type = []
# Obtain the type of a variable name in the current scope
def variable_type(self, name: str) -> Type:
@@ -1141,11 +1138,13 @@ Classes
def visit_FunctionDef(self, node: FunctionDef) -> TypedFunctionDef:
tfd = copy(node)
assert not node.decorator_list, "Functions may not have decorators"
+ rettyp = InstanceType(self.type_from_annotation(tfd.returns))
self.enter_scope()
+ self.current_ret_type.append(rettyp)
tfd.args = self.visit(node.args)
functyp = FunctionType(
[t.typ for t in tfd.args.args],
- InstanceType(self.type_from_annotation(tfd.returns)),
+ rettyp,
)
tfd.typ = InstanceType(functyp)
# We need the function type inside for recursion
@@ -1158,13 +1157,14 @@ Classes
# Check that return type and annotated return type match
if not rets:
assert (
- functyp.rettyp == NoneInstanceType
+ functyp.rettyp >= NoneInstanceType
), f"Function '{node.name}' has no return statement but is supposed to return not-None value"
else:
assert all(
functyp.rettyp >= r.typ for r in rets
), f"Function '{node.name}' annotated return type does not match actual return type"
self.exit_scope()
+ self.current_ret_type.pop(-1)
# We need the function type outside for usage
self.set_variable_type(node.name, tfd.typ)
return tfd
@@ -1332,7 +1332,9 @@ Classes
def visit_Return(self, node: Return) -> TypedReturn:
tp = copy(node)
tp.value = self.visit(node.value)
- tp.typ = tp.value.typ
+ tp.typ = (
+ tp.value.typ if not self.current_ret_type else self.current_ret_type[-1]
+ )
return tp
def visit_Attribute(self, node: Attribute) -> TypedAttribute:
@@ -1430,6 +1432,10 @@ Ancestors
var current_ret_typevar scopesdef visit_FunctionDef(self, node: FunctionDef) -> TypedFunctionDef:
tfd = copy(node)
assert not node.decorator_list, "Functions may not have decorators"
+ rettyp = InstanceType(self.type_from_annotation(tfd.returns))
self.enter_scope()
+ self.current_ret_type.append(rettyp)
tfd.args = self.visit(node.args)
functyp = FunctionType(
[t.typ for t in tfd.args.args],
- InstanceType(self.type_from_annotation(tfd.returns)),
+ rettyp,
)
tfd.typ = InstanceType(functyp)
# We need the function type inside for recursion
@@ -1945,13 +1953,14 @@ Methods
# Check that return type and annotated return type match
if not rets:
assert (
- functyp.rettyp == NoneInstanceType
+ functyp.rettyp >= NoneInstanceType
), f"Function '{node.name}' has no return statement but is supposed to return not-None value"
else:
assert all(
functyp.rettyp >= r.typ for r in rets
), f"Function '{node.name}' annotated return type does not match actual return type"
self.exit_scope()
+ self.current_ret_type.pop(-1)
# We need the function type outside for usage
self.set_variable_type(node.name, tfd.typ)
return tfddef visit_Return(self, node: Return) -> TypedReturn:
tp = copy(node)
tp.value = self.visit(node.value)
- tp.typ = tp.value.typ
+ tp.typ = (
+ tp.value.typ if not self.current_ret_type else self.current_ret_type[-1]
+ )
return tp
-class ReturnExtractor
-Utility to find all Return statements in an AST subtree
class ReturnExtractor(NodeVisitor):
- """Utility to find all Return statements in an AST subtree"""
-
- def __init__(self):
- self.returns = []
-
- def visit_Return(self, node: Return) -> None:
- self.returns.append(node)
-def visit_Return(self, node: _ast.Return) ‑> None
-def visit_Return(self, node: Return) -> None:
- self.returns.append(node)AggressiveTypeInferencercurrent_ret_typeenter_scopeexit_scopegeneric_visitvisit_PassReturnExtractorvisit_Returnhebi.typed_asthebi.util
+class ReturnExtractor
+Utility to find all Return statements in an AST subtree
class ReturnExtractor(TypedNodeVisitor):
+ """Utility to find all Return statements in an AST subtree"""
+
+ def __init__(self):
+ self.returns = []
+
+ def visit_Return(self, node: Return) -> None:
+ self.returns.append(node)
+def visit(self, node)
+
+Inherited from:
+TypedNodeVisitor.visit
+
Visit a node.
+def visit_Return(self, node: _ast.Return) ‑> None
+def visit_Return(self, node: Return) -> None:
+ self.returns.append(node)
class ReversedImpl
Pyt
+ReturnExtractor
+
+visitvisit_Return
+
+
ReversedImpl
impl_from_args"]
license = "MIT"