buckets fix

hiddenpeopleclub · Oct 2, 2023 · 0ed80be · 0ed80be
1 parent 9004e52
commit 0ed80be
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/palabritas/src/palabritas.pest b/palabritas/src/palabritas.pest
@@ -51,6 +51,6 @@ Block = {
 
 Database = { SOI ~ (NewLine | Block | Section )* ~ EOI }
 
-COMMENT = _{ "//" ~ (!(NewLine | EOI) ~ ANY)* ~ (NewLine | EOI) }
+COMMENT = _{ " "* ~"//" ~ (!(NewLine | EOI) ~ ANY)* ~ (NewLine | EOI) }
 NewLine = _{ EmptyLine | NEWLINE }
 EmptyLine = _{" "* ~ NEWLINE }
diff --git a/runtime/src/runtime.rs b/runtime/src/runtime.rs
@@ -959,17 +959,28 @@ impl Runtime {
 
     let parent_settings = parent.get_settings();
     let mut previous_block_found = false;
-    for sibling in &parent_settings.children {
-      if previous_block_found {
-        if let cuentitos_common::Block::Choice { id: _, settings: _ } =
-          self.get_cuentitos_block(*sibling)?
-        {
-          continue;
-        }
-        return self.push_stack_until_text(*sibling);
+
+    let skip_siblings = matches!(
+      parent,
+      cuentitos_common::Block::Bucket {
+        name: _,
+        settings: _,
       }
-      if *sibling == previous_id {
-        previous_block_found = true;
+    );
+
+    if !skip_siblings {
+      for sibling in &parent_settings.children {
+        if previous_block_found {
+          if let cuentitos_common::Block::Choice { id: _, settings: _ } =
+            self.get_cuentitos_block(*sibling)?
+          {
+            continue;
+          }
+          return self.push_stack_until_text(*sibling);
+        }
+        if *sibling == previous_id {
+          previous_block_found = true;
+        }
       }
     }
 
@@ -1006,7 +1017,7 @@ impl Runtime {
     settings: &cuentitos_common::BlockSettings,
   ) -> Result<Option<BlockId>, RuntimeError> {
     let total_frequency = self.get_total_frequency(settings)?;
-    
+
     if total_frequency == 0 {
       return Ok(None);
     }