lang: rewrite parser

crates/lang/src/main.rs

@@ -1,12 +1,9 @@
+use clap::Parser;
 use std::{fs, path::PathBuf};
 
-use clap::Parser;
-use lang::{
-    err_reporting::ErrorCollector,
-    parser::ast::lossless::{
-        lex,
-        parser::{self, parse},
-    },
+use lang::parser::{
+    parser::{self, grammar, input, output::Output},
+    syntax_kind,
 };
 
 #[derive(Parser)]
@@ -19,8 +16,17 @@ fn main() {
     let args = Args::parse();
     let n = args.file.clone();
     let f = fs::read_to_string(n.clone()).expect("failed to read file");
-    println!("toks: {:?}", lex::lex(&f));
-    println!("parse res: {:?}", parse(&f));
+
+    let toks = dbg!(syntax_kind::lex(&f));
+    let input = input::Input::new(&toks);
+    let mut parser = parser::Parser::new(input);
+
+    grammar::source_file(&mut parser);
+
+    let p_out = dbg!(parser.finish());
+    let o = Output::from_parser_output(toks, p_out);
+
+    println!("Out: {:?}", o);
 
     // let parse_res = parser::parse(&f);
     // println!("parse: {:?}", parse_res);