we parsing

Lokathor · Oct 17, 2024 · 35f4811 · 35f4811
1 parent 1963251
commit 35f4811
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/samples/minimum3.yag b/samples/minimum3.yag
@@ -0,0 +1,5 @@
+fn main() {
+  return
+
+  return
+}
diff --git a/src/bin/yagbas.rs b/src/bin/yagbas.rs
@@ -74,6 +74,7 @@ fn build_process_file(filename: &String) {
     }
   };
   let tokens: Vec<(Token, FileSpan)> = file_info_id.iter_tokens().collect();
+  //eprintln!("Tokens: {tokens:?}");
   let (token_trees, tree_errors) = parse_tokens_to_token_trees(&tokens);
   for tree_error in &tree_errors {
     println!("== Tree Error: {tree_error:?}");
@@ -83,7 +84,7 @@ fn build_process_file(filename: &String) {
     println!("I> {item:?}");
   }
   for item_error in &item_errors {
-    println!("== Item Error: {item_errors:?}");
+    println!("== ItemError: {item_error:?}");
   }
   assert!(item_errors.is_empty());
   let mut code_chunks: HashMap<StrID, Vec<u8>> = HashMap::new();

diff --git a/src/item.rs b/src/item.rs
@@ -66,15 +66,17 @@ impl FnDecl {
     };
     let statements = Statement::parser()
       .map_with(|statement, ex| (statement, ex.span()))
-      .separated_by(line_sep)
+      .separated_by(line_sep)//.repeated().at_least(1))
       .allow_leading()
       .allow_trailing()
       .collect::<Vec<_>>()
       .nested_in(select_ref! {
         Braces(b) = ex => {
           b.spanned(ex.span())
         }
-      });
+      })
+      .labelled("fn_statements")
+      .as_context();
 
     kw_fn
       .ignore_then(fn_name)
@@ -134,7 +136,7 @@ impl Statement {
             inner_self
               .clone()
               .map_with(|statement, ex| (statement, ex.span()))
-              .separated_by(line_sep.repeated().at_least(1).ignored())
+              .separated_by(line_sep.repeated().at_least(1))
               .allow_leading()
               .allow_trailing()
               .collect::<Vec<_>>()