koatl 0.1.42__tar.gz → 0.2.3__tar.gz

koatl-0.2.3/Cargo.lock

@@ -0,0 +1,218 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "ariadne"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f5e3dca4e09a6f340a61a0e9c7b61e030c69fc27bf29d73218f7e5e3b7638f"
+dependencies = [
+ "unicode-width",
+ "yansi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indoc"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+
+[[package]]
+name = "koatl"
+version = "0.2.3"
+dependencies = [
+ "ariadne",
+ "koatl-core",
+ "once_cell",
+ "pyo3",
+]
+
+[[package]]
+name = "koatl-core"
+version = "0.1.0"
+dependencies = [
+ "ariadne",
+ "koatl-parser",
+ "once_cell",
+ "slotmap",
+]
+
+[[package]]
+name = "koatl-parser"
+version = "0.1.0"
+
+[[package]]
+name = "libc"
+version = "0.2.174"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+dependencies = [
+ "indoc",
+ "libc",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "slotmap"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unindent"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"

koatl-0.2.3/Cargo.toml

@@ -0,0 +1,3 @@
+[workspace]
+members = ["koatl-parser", "koatl-core", "koatl"]
+resolver = "3"

{koatl-0.1.42 → koatl-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koatl
-Version: 0.1.42
+Version: 0.2.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{koatl-0.1.42 → koatl-0.2.3}/koatl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "koatl"
-version = "0.1.42"
+version = "0.2.3"
 edition = "2021"
 
 [lib]

{koatl-0.1.42 → koatl-0.2.3/koatl}/python/koatl/cli.py

@@ -9,9 +9,23 @@ def transpile_from_source(source, mode="script", script_path="<string>"):
 
 def run_from_source(source, mode="script", script_path="<string>"):
     from koatl import transpile
+    import ast
 
     transpiled_code = transpile(source, mode=mode, filename=str(script_path))
-    code_obj = compile(transpiled_code, script_path, "exec")
+
+    try:
+        code_obj = compile(transpiled_code, script_path, "exec")
+    except Exception as e:
+
+        class Visitor(ast.NodeVisitor):
+            def generic_visit(self, node):
+                if hasattr(node, "lineno"):
+                    if node.lineno > node.end_lineno:
+                        print(f"Error: {node.lineno} > {node.end_lineno} for {node}")
+                super().generic_visit(node)
+
+        Visitor().visit(transpiled_code)
+        raise
 
     script_globals = {"__name__": "__main__"}
 

{koatl-0.1.42 → koatl-0.2.3/koatl}/python/koatl/std/alg/async.tl

@@ -31,7 +31,7 @@ export Async = class(MonadOnce):
                 self = gen.send(yield from self.__await__())
                 if not hasattr(self, "__await__"):
                     raise ValueError(f"Expected the binder to return an Awaitable, but got {type(self).__name__}")
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             return value
 
     pure = staticmethod& x => Async.from_generator_fn& () =>

{koatl-0.1.42 → koatl-0.2.3/koatl}/python/koatl/std/alg/do.tl

@@ -7,10 +7,10 @@ export do = f => wraps(f)& (*args, **kwargs) =>
     let m
     try:
         m = gen.send(None)
-    except StopIteration() as e:
+    except StopIteration() as e =>
         raise ValueError(
             "Returning before `@` is not allowed. "
-                "Use `return @MonadType.pure(value)` instead."
+                + "Use `return @MonadType.pure(value)` instead."
         )
 
     try:
@@ -18,17 +18,17 @@ export do = f => wraps(f)& (*args, **kwargs) =>
         # is it possible to derive bind_gen directly from bind_once?
 
         return m.bind_gen(gen)
-    except AttributeError():
+    except AttributeError() =>
         None
 
     let recurse = v =>
         try:
             m = gen.send(v)
             return m.bind_once(recurse)
-        except StopIteration() as e:
+        except StopIteration() as e =>
             return m.pure(e.value)
 
     try:
         return m.bind_once(recurse)
-    except AttributeError():
+    except AttributeError() =>
         raise ValueError("@ can only be used with an object that has `bind_once`.")

{koatl-0.1.42 → koatl-0.2.3}/koatl/python/koatl/std/alg/env.tl

@@ -26,7 +26,7 @@ export Env = class(MonadOnce):
 
     bind_once = (self, f) => Env& ctx =>
         let v = f(self.f(ctx))
-        if v matches not Env():
+        if v not matches Env():
             raise ValueError(f"Expected the binder to return an Env, but got {type(v)}")
 
         v.f(ctx)
@@ -35,9 +35,9 @@ export Env = class(MonadOnce):
         try:
             while True:
                 self = gen.send(self.f(ctx))
-                if self matches not Env():
+                if self not matches Env():
                     raise ValueError(f"Expected the binder to return an Env, but got {type(self)}")
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             return value
 
     NoKey = object()

{koatl-0.1.42 → koatl-0.2.3/koatl}/python/koatl/std/alg/memo.tl

@@ -24,7 +24,7 @@ export Memo = class(MonadOnce):
 
         __repr__ = self => f"Memo.Cache({self.cache})"
 
-        try_get = (self, name, deps) => try self.cache[name][deps] except KeyError()
+        try_get = (self, name, deps) => check self.cache[name][deps] except KeyError()
 
         update = (self, name, deps, value) =>
             self.cache[name][deps] = value
@@ -88,7 +88,7 @@ export Memo = class(MonadOnce):
     bind_once = (self, f) => Memo(ctx =>
         let value = f(self.f(ctx))
 
-        if value matches not Memo():
+        if value not matches Memo():
             raise ValueError(f"Expected the binder to return a Memo, but got {type(value)}")
 
         return value.f(ctx)
@@ -100,10 +100,9 @@ export Memo = class(MonadOnce):
                 let inner = self.f(ctx)
                 self = gen.send(inner)
 
-                if self matches not Memo():
+                if self not matches Memo():
                     raise ValueError(f"Expected the binder to return a Memo, but got {type(value)}")
-
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             return value
     )
 
@@ -164,7 +163,7 @@ export AsyncMemo = class(MonadOnce):
     bind_once = (self, f) => AsyncMemo(ctx =>
         let value = f(@self.f(ctx))
 
-        if value matches not AsyncMemo():
+        if value not matches AsyncMemo():
             raise ValueError(f"Expected the binder to return a Memo, but got {type(value)}")
 
         return value.f(ctx)
@@ -176,9 +175,9 @@ export AsyncMemo = class(MonadOnce):
                 let inner = @self.f(ctx)
                 self = gen.send(inner)
 
-                if self matches not AsyncMemo():
+                if self not matches AsyncMemo():
                     raise ValueError(f"Expected the binder to return a Memo, but got {type(value)}")
 
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             return value
     )

{koatl-0.1.42 → koatl-0.2.3}/koatl/python/koatl/std/alg/result.tl

@@ -5,7 +5,7 @@ infer_ok = x =>
     x match:
         None => False
         BaseException() => False
-        default True
+        _ => True
 
 op_coal = (x, f) =>
     if x matches Result():
@@ -42,7 +42,7 @@ export Result = class(MonadOnce):
         """
         try:
             return Ok(f())
-        except BaseException() as e:
+        except BaseException() as e =>
             return Err(e)
 
     bind_once = (self, f) =>
@@ -50,7 +50,7 @@ export Result = class(MonadOnce):
             return self
 
         let value = f(self.value)
-        if value matches not Result():
+        if value not matches Result():
             raise ValueError(f"Expected the binder to return a Result, but got {type(value)}")
         value
 
@@ -61,9 +61,9 @@ export Result = class(MonadOnce):
                     return self
 
                 self = gen.send(self.value)
-                if self matches not Result():
+                if self not matches Result():
                     raise ValueError(f"Expected the binder to return a Result, but got {type(self)}")
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             return Result(value)
 
     pure = staticmethod& x => Ok(x)

{koatl-0.1.42 → koatl-0.2.3}/koatl/python/koatl/std/data/list.tl

@@ -5,14 +5,14 @@ import koatl.std.alg.Monad
 export List = class(Monad):
     __new__ = (cls, *args, **kwargs) => raise ValueError(
         "List cannot be instantiated directly. "
-            "Use [] or list()."
+            + "Use [] or list()."
     )
 
     bind_once = (self, f) =>
         raise NotImplementedError(
             "List may not be bound using @ "
-                "due to generator limitations. "
-                "Wrap in Ok to use the Result monad."
+                + "due to generator limitations. "
+                + "Wrap in Ok to use the Result monad."
         )
 
     bind = (self, f) => List(self.flat_map(f))

{koatl-0.1.42 → koatl-0.2.3}/koatl/python/koatl/std/iter.tl

@@ -21,7 +21,7 @@ export Iterable = class(Traversable, Trait):
                 let value = next(it)
                 if not f(value):
                     return Iterable.chain([value], it)
-            except StopIteration():
+            except StopIteration() =>
                 return it
 
     take = (self, n) =>
@@ -30,7 +30,7 @@ export Iterable = class(Traversable, Trait):
             for _ in ..n:
                 try:
                     yield next(it)
-                except StopIteration(value=value):
+                except StopIteration(value=value) =>
                     return value
 
         impl.__name__ = f"take"
@@ -152,7 +152,7 @@ export Iterable = class(Traversable, Trait):
         return Err()
 
     first = self =>
-        (try next(self.iter)).map_err(_ => None)
+        (check next(self.iter)).map_err(_ => None)
 
     last = (self, f) =>
         let result = Err()
@@ -212,7 +212,7 @@ export Iterable = class(Traversable, Trait):
                 m = v
             else:
                 m = key(v)
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             raise ValueError("max of empty iterable")
 
 
@@ -239,7 +239,7 @@ export Iterable = class(Traversable, Trait):
                 m = v
             else:
                 m = key(v)
-        except StopIteration(value=value):
+        except StopIteration(value=value) =>
             raise ValueError("min of empty iterable")
 
         if key === None:
@@ -272,7 +272,7 @@ export Iterable = class(Traversable, Trait):
         let v
         try:
             v = next(it)
-        except StopIteration():
+        except StopIteration() =>
             return []
 
         let m = f(v)

{koatl-0.1.42 → koatl-0.2.3}/koatl/python/koatl/std/lazy_module.tl

@@ -25,7 +25,7 @@ export LazyModule = class:
 
             if hasattr(self._module, attr):
                 return getattr(self._module, attr)
-        except e:
+        except e =>
             raise ValueError(str(e))
 
         raise AttributeError(f"Module '{self._name}' has no attribute '{attr}'")

{koatl-0.1.42 → koatl-0.2.3}/koatl/src/emit_py.rs

@@ -1,4 +1,4 @@
-use koatl_core::{parser::ast::*, py::ast::*, util::LineColCache};
+use koatl_core::{py::ast::*, util::LineColCache, Span};
 
 use pyo3::{
     call::PyCallArgs,
@@ -512,21 +512,72 @@ trait PyLiteralExt<'src> {
 impl<'src> PyLiteralExt<'src> for PyLiteral<'src> {
     fn emit_py<'py>(&self, ctx: &PyCtx<'py, 'src>, span: &Span) -> PyTlResult<PyObject> {
         Ok(match self {
-            PyLiteral::Num(num) => {
+            PyLiteral::Int(num) => {
                 let num = num.replace('_', "");
-
                 match num.parse::<i128>() {
                     Ok(i) => ctx.ast_node("Constant", (i,), span)?,
-                    Err(_) => match num.parse::<f64>() {
-                        Ok(f) => ctx.ast_node("Constant", (f,), span)?,
-                        Err(_) => {
-                            return Err(PyTlErr {
-                                message: format!("Invalid number literal: {}", num),
-                                py_err: None,
-                                span: Some(*span),
-                            });
-                        }
-                    },
+                    Err(_) => {
+                        return Err(PyTlErr {
+                            message: format!("Invalid integer literal: {}", num),
+                            py_err: None,
+                            span: Some(*span),
+                        });
+                    }
+                }
+            }
+            PyLiteral::IntBin(num) => {
+                let num = num.replace('_', "");
+                // Keep the 0b prefix for Python compatibility
+                match i128::from_str_radix(&num[2..], 2) {
+                    Ok(i) => ctx.ast_node("Constant", (i,), span)?,
+                    Err(_) => {
+                        return Err(PyTlErr {
+                            message: format!("Invalid binary literal: {}", num),
+                            py_err: None,
+                            span: Some(*span),
+                        });
+                    }
+                }
+            }
+            PyLiteral::IntOct(num) => {
+                let num = num.replace('_', "");
+                // Keep the 0o prefix for Python compatibility
+                match i128::from_str_radix(&num[2..], 8) {
+                    Ok(i) => ctx.ast_node("Constant", (i,), span)?,
+                    Err(_) => {
+                        return Err(PyTlErr {
+                            message: format!("Invalid octal literal: {}", num),
+                            py_err: None,
+                            span: Some(*span),
+                        });
+                    }
+                }
+            }
+            PyLiteral::IntHex(num) => {
+                let num = num.replace('_', "");
+                // Keep the 0x prefix for Python compatibility
+                match i128::from_str_radix(&num[2..], 16) {
+                    Ok(i) => ctx.ast_node("Constant", (i,), span)?,
+                    Err(_) => {
+                        return Err(PyTlErr {
+                            message: format!("Invalid hexadecimal literal: {}", num),
+                            py_err: None,
+                            span: Some(*span),
+                        });
+                    }
+                }
+            }
+            PyLiteral::Float(num) => {
+                let num = num.replace('_', "");
+                match num.parse::<f64>() {
+                    Ok(f) => ctx.ast_node("Constant", (f,), span)?,
+                    Err(_) => {
+                        return Err(PyTlErr {
+                            message: format!("Invalid float literal: {}", num),
+                            py_err: None,
+                            span: Some(*span),
+                        });
+                    }
                 }
             }
             PyLiteral::Bool(b) => ctx.ast_node("Constant", (b,), span)?,