astreum 0.2.32__py3-none-any.whl → 0.2.33__py3-none-any.whl

astreum/_node.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional, Tuple, Union
 import uuid
 import threading
 
@@ -74,14 +74,14 @@ class Expr:
             return self.value
         
     class Error:
-        def __init__(self, message: str, origin: Optional['Expr'] = None):
-            self.message = message
+        def __init__(self, topic: str, origin: Optional['Expr'] = None):
+            self.topic = topic
             self.origin  = origin
 
         def __repr__(self):
             if self.origin is None:
-                return f'(error "{self.message}")'
-            return f'(error "{self.message}" in {self.origin})'
+                return f'({self.topic} err)'
+            return f'({self.origin} {self.topic} err)'
 
 class Env:
     def __init__(
@@ -347,8 +347,8 @@ class Node:
                         code.append(bytes([tok.value & 0xFF]))
                         return None
 
-                    if isinstance(tok, Expr.ListExpr):
-                        rv = self.high_eval(env_id, tok, meter=meter)
+                    if isinstance(tok, Expr.ListExpr):
+                        rv = self.high_eval(env_id, tok, meter=meter)
                         if isinstance(rv, Expr.Error):
                             return rv
                         rb = to_bytes(rv)
@@ -367,8 +367,8 @@ class Node:
                     if isinstance(err, Expr.Error):
                         return err
 
-                # Execute low-level code built from sk-body using the caller's meter
-                res = self.low_eval(code, meter=meter)
+                # Execute low-level code built from sk-body using the caller's meter
+                res = self.low_eval(code, meter=meter)
                 if isinstance(res, Expr.Error):
                     return res
                 return Expr.ListExpr([Expr.Byte(b) for b in res])
@@ -401,8 +401,8 @@ class Node:
                     return Expr.Error("arity mismatch", origin=expr)
 
                 arg_bytes: List[bytes] = []
-                for a in args_exprs:
-                    v = self.high_eval(env_id, a, meter=meter)
+                for a in args_exprs:
+                    v = self.high_eval(env_id, a, meter=meter)
                     if isinstance(v, Expr.Error):
                         return v
                     if not isinstance(v, Expr.Byte):
@@ -415,9 +415,78 @@ class Node:
                 for name_b, val_b in zip(params, arg_bytes):
                     self.env_set(child_env, name_b, Expr.Byte(val_b[0]))
 
-                # evaluate HL body, metered from the top
-                return self.high_eval(child_env, body_expr, meter=meter)
+                # evaluate HL body, metered from the top
+                return self.high_eval(child_env, body_expr, meter=meter)
 
         # ---------- default: resolve each element and return list ----------
-        resolved: List[Expr] = [self.high_eval(env_id, e, meter=meter) for e in expr.elements]
-        return Expr.ListExpr(resolved)
+        resolved: List[Expr] = [self.high_eval(env_id, e, meter=meter) for e in expr.elements]
+        return Expr.ListExpr(resolved)
+
+# ===============================
+# 3. Lightweight Parser for Expr (postfix, limited forms)
+# ===============================
+
+class ParseError(Exception):
+    pass
+
+def tokenize(source: str) -> List[str]:
+    """Tokenize a minimal Lispeum subset for this module.
+
+    Supports:
+    - Integers (e.g., -1, 0, 255) → Byte
+    - Symbols (e.g., add, nand, def, fn, sk, int.sub, $0)
+    - Lists using parentheses
+    """
+    tokens: List[str] = []
+    cur: List[str] = []
+    for ch in source:
+        if ch.isspace():
+            if cur:
+                tokens.append("".join(cur))
+                cur = []
+            continue
+        if ch in ("(", ")"):
+            if cur:
+                tokens.append("".join(cur))
+                cur = []
+            tokens.append(ch)
+            continue
+        cur.append(ch)
+    if cur:
+        tokens.append("".join(cur))
+    return tokens
+
+def _parse_one(tokens: List[str], pos: int = 0) -> Tuple[Expr, int]:
+    if pos >= len(tokens):
+        raise ParseError("unexpected end")
+    tok = tokens[pos]
+
+    if tok == '(':  # list
+        items: List[Expr] = []
+        i = pos + 1
+        while i < len(tokens):
+            if tokens[i] == ')':
+                # special-case error form at close: (origin topic err) or (topic err)
+                if len(items) >= 3 and isinstance(items[-1], Expr.Symbol) and items[-1].value == 'err' and isinstance(items[-2], Expr.Symbol):
+                    return Expr.Error(items[-2].value, origin=items[-3]), i + 1
+                if len(items) == 2 and isinstance(items[-1], Expr.Symbol) and items[-1].value == 'err' and isinstance(items[-2], Expr.Symbol):
+                    return Expr.Error(items[-2].value), i + 1
+                return Expr.ListExpr(items), i + 1
+            expr, i = _parse_one(tokens, i)
+            items.append(expr)
+        raise ParseError("expected ')'")
+
+    if tok == ')':
+        raise ParseError("unexpected ')'")
+
+    # try integer → Byte
+    try:
+        n = int(tok)
+        return Expr.Byte(n), pos + 1
+    except ValueError:
+        return Expr.Symbol(tok), pos + 1
+
+def parse(tokens: List[str]) -> Tuple[Expr, List[str]]:
+    """Parse tokens into an Expr and return (expr, remaining_tokens)."""
+    expr, next_pos = _parse_one(tokens, 0)
+    return expr, tokens[next_pos:]

{astreum-0.2.32.dist-info → astreum-0.2.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.32
+Version: 0.2.33
 Summary: Python library to interact with the Astreum blockchain and its Lispeum virtual machine.
 Author-email: "Roy R. O. Okello" <roy@stelar.xyz>
 Project-URL: Homepage, https://github.com/astreum/lib

{astreum-0.2.32.dist-info → astreum-0.2.33.dist-info}/RECORD

@@ -1,5 +1,5 @@
 astreum/__init__.py,sha256=y2Ok3EY_FstcmlVASr80lGR_0w-dH-SXDCCQFmL6uwA,28
-astreum/_node.py,sha256=ZkAdGkHxgEPL7u7vCS2x1z2EiSrRXPY5Dw8FrngSJvI,16407
+astreum/_node.py,sha256=cJSzj7N4unkOH5T_nDa7bKy_jBD-p0oJTDlAXjuFFYw,18773
 astreum/format.py,sha256=X4tG5GGPweNCE54bHYkLFiuLTbmpy5upO_s1Cef-MGA,2711
 astreum/node.py,sha256=SuVm1b0QWl1FpDUaLRH1fiFYnXCrPs6qYeUQlPDae8w,38358
 astreum/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,8 +27,8 @@ astreum/relay/setup.py,sha256=ynvGaJdlDtw_f5LLiow2Wo7IRzUjvgk8eSr1Sv4_zTg,2090
 astreum/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/storage/object.py,sha256=knFlvw_tpcC4twSu1DGNpHX31wlANN8E5dgEqIfU--Q,2041
 astreum/storage/setup.py,sha256=1-9ztEFI_BvRDvAA0lAn4mFya8iq65THTArlj--M3Hg,626
-astreum-0.2.32.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.32.dist-info/METADATA,sha256=GHnOvqz6Ol8DjEMFDZNGXuPaXFlhmpd_qzt4J43dSm4,6149
-astreum-0.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.32.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.32.dist-info/RECORD,,
+astreum-0.2.33.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.33.dist-info/METADATA,sha256=t-sfdHamxd73CFIfgiXrl5zph6CnZRtlwCRCqVrQGVA,6149
+astreum-0.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.33.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.33.dist-info/RECORD,,