koatl 0.1.28__tar.gz → 0.1.29__tar.gz

{koatl-0.1.28 → koatl-0.1.29}/Cargo.lock

@@ -99,7 +99,7 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "koatl"
-version = "0.1.28"
+version = "0.1.29"
 dependencies = [
  "ariadne",
  "koatl-core",

{koatl-0.1.28 → koatl-0.1.29}/PKG-INFO

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

{koatl-0.1.28 → koatl-0.1.29}/koatl/Cargo.toml

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

{koatl-0.1.28 → koatl-0.1.29/koatl}/python/koatl/prelude/functional/algebra.tl

@@ -16,6 +16,7 @@ export Monad = class(Trait):
     apply = (self, f) => self.bind(x => f.map(fn => fn(x)))
 
 
+# TODO: enforce binding only once?
 export MonadOnce = class(Monad, Trait):
     """
     Abstract base class for single-use monads.

{koatl-0.1.28 → koatl-0.1.29/koatl}/python/koatl/prelude/functional/list.tl

@@ -6,9 +6,9 @@ import ..iterable.Iterable
 export List = class(Monad):
     bind_once = (self, f) =>
         raise NotImplementedError(
-            "Binding List in a do-block doesn't work in Koatl " +
-                "due to generator limitations. " +
-                "Wrap in Ok to use the regular Result monad."
+            "List may not be bound using @ "
+                "due to generator limitations. "
+                "Wrap in Ok to use the Result monad."
         )
 
     bind = (self, f) => List(self.flat_map(f))

{koatl-0.1.28 → koatl-0.1.29}/koatl-core/parser/src/parser.rs

@@ -795,9 +795,8 @@ where
     ))
     .boxed();
 
-    let literal = select! {
+    let other_literal = select! {
         Token::Num(s) => Literal::Num(Cow::Borrowed(s)),
-        Token::Str(s) => Literal::Str(Cow::Owned(s)),
         Token::Bool(s) => Literal::Bool(s),
         Token::None => Literal::None
     }
@@ -805,6 +804,20 @@ where
     .labelled("literal")
     .boxed();
 
+    let literal_str = select! {
+        Token::Str(s) => s
+    }
+    .repeated()
+    .at_least(1)
+    .collect::<Vec<_>>()
+    .map_with(|x, e| Literal::Str(Cow::Owned(x.join(""))).spanned(e.span()))
+    .labelled("string-literal")
+    .boxed();
+
+    let literal = choice((literal_str, other_literal))
+        .labelled("literal")
+        .boxed();
+
     let literal_expr = literal
         .clone()
         .map(Expr::Literal)

{koatl-0.1.28/koatl → koatl-0.1.29}/python/koatl/prelude/functional/algebra.tl

@@ -16,6 +16,7 @@ export Monad = class(Trait):
     apply = (self, f) => self.bind(x => f.map(fn => fn(x)))
 
 
+# TODO: enforce binding only once?
 export MonadOnce = class(Monad, Trait):
     """
     Abstract base class for single-use monads.

{koatl-0.1.28/koatl → koatl-0.1.29}/python/koatl/prelude/functional/list.tl

@@ -6,9 +6,9 @@ import ..iterable.Iterable
 export List = class(Monad):
     bind_once = (self, f) =>
         raise NotImplementedError(
-            "Binding List in a do-block doesn't work in Koatl " +
-                "due to generator limitations. " +
-                "Wrap in Ok to use the regular Result monad."
+            "List may not be bound using @ "
+                "due to generator limitations. "
+                "Wrap in Ok to use the Result monad."
         )
 
     bind = (self, f) => List(self.flat_map(f))