wip

fe-lang · Jun 20, 2024 · 4ddf5b7 · 4ddf5b7
1 parent cec6a13
commit 4ddf5b7
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 101 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
     "crates/ir",
     "crates/codegen",
     "crates/object",
-    "crates/parser",
     "crates/parser2",
     "crates/filecheck",
     "crates/triple",

diff --git a/crates/codegen/src/critical_edge.rs b/crates/codegen/src/critical_edge.rs
@@ -150,7 +150,7 @@ mod tests {
 
         assert_eq!(
             dump_func(func),
-            "func public %test_func() -> void:
+            "func public %test_func() -> void {
     block0:
         br 1.i32 block3 block1;
 
@@ -163,6 +163,7 @@ mod tests {
     block3:
         jump block2;
 
+}
 "
         );
 
@@ -208,7 +209,7 @@ mod tests {
 
         assert_eq!(
             dump_func(func),
-            "func public %test_func() -> void:
+            "func public %test_func() -> void {
     block0:
         br 1.i8 block5 block1;
 
@@ -230,6 +231,7 @@ mod tests {
     block6:
         jump block3;
 
+}
 "
         );
 
@@ -269,7 +271,7 @@ mod tests {
 
         assert_eq!(
             dump_func(func),
-            "func public %test_func() -> void:
+            "func public %test_func() -> void {
     block0:
         jump block1;
 
@@ -284,6 +286,7 @@ mod tests {
     block3:
         jump block1;
 
+}
 "
         );
 
@@ -331,9 +334,9 @@ mod tests {
 
         assert_eq!(
             dump_func(func),
-            "func public %test_func() -> void:
+            "func public %test_func() -> void {
     block0:
-        br -1.i1 block5 block6;
+        br 1.i1 block5 block6;
 
     block1:
         br_table 0.i32 block2 (1.i32 block3) (2.i32 block7);
@@ -356,6 +359,7 @@ mod tests {
     block7:
         jump block4;
 
+}
 "
         );
 

diff --git a/crates/filecheck/Cargo.toml b/crates/filecheck/Cargo.toml
@@ -12,7 +12,6 @@ publish = false
 filecheck = "0.5.0" # { path = "/Users/sean/src/filecheck" }
 sonatina-ir = { path = "../ir" }
 sonatina-codegen = { path = "../codegen" }
-sonatina-parser = { path = "../parser" }
 sonatina-parser2 = { path = "../parser2" }
 termcolor = "1.1.2"
 walkdir = "2"
diff --git a/crates/filecheck/src/lib.rs b/crates/filecheck/src/lib.rs
@@ -13,8 +13,7 @@ use std::{
 
 use sonatina_ir::{ir_writer::FuncWriter, module::FuncRef, Function};
 
-use sonatina_parser::parser::ParsedModule;
-use sonatina_parser2::parse_module2;
+use sonatina_parser2::{parse_module, ParsedModule};
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 use walkdir::WalkDir;
 
@@ -53,7 +52,6 @@ impl FileCheckRunner {
                     if ent.file_type().is_file()
                         && ent.path().extension().map_or(false, |ext| ext == "sntn")
                     {
-                        dbg!(ent.path());
                         Some(ent)
                     } else {
                         None
@@ -121,15 +119,13 @@ pub struct FileChecker<'a> {
 
 impl<'a> FileChecker<'a> {
     fn new(transformer: &'a mut dyn FuncTransform, file_path: &'a Path) -> Self {
-        dbg!(file_path);
         Self {
             transformer,
             file_path,
         }
     }
 
     fn check(&mut self) -> Vec<FileCheckResult> {
-        eprintln!("{}", self.file_path.to_string_lossy());
         let mut parsed_module = match self.parse_file() {
             Ok(module) => module,
             Err(msg) => return vec![FileCheckResult::new(self.file_path.to_owned(), Err(msg))],
@@ -154,8 +150,6 @@ impl<'a> FileChecker<'a> {
         self.transformer.transform(func);
         let func_ir = FuncWriter::new(func).dump_string().unwrap();
 
-        eprintln!("{:?}", self.file_path);
-        eprintln!("{func_ir}");
         let checker = self.build_checker(comments);
 
         let result = match checker.explain(&func_ir, &()) {
@@ -172,7 +166,7 @@ impl<'a> FileChecker<'a> {
     fn parse_file(&self) -> Result<ParsedModule, String> {
         let input = fs::read_to_string(self.file_path).unwrap();
 
-        match parse_module2(&input) {
+        match parse_module(&input) {
             Ok(module) => Ok(module),
             Err(errs) => {
                 let mut v = vec![];

diff --git a/crates/filecheck/src/main.rs b/crates/filecheck/src/main.rs
@@ -4,23 +4,18 @@ use sonatina_filecheck::{
 };
 
 fn main() {
-    eprintln!("SccpTransform");
     let mut runner = FileCheckRunner::new(SccpTransform::default());
     runner.run();
 
-    eprintln!("AdceTransform");
     runner.attach_transformer(AdceTransform::default());
     runner.run();
 
-    eprintln!("InsnSimplifyTransform");
     runner.attach_transformer(InsnSimplifyTransform::default());
     runner.run();
 
-    eprintln!("GvnTransform");
     runner.attach_transformer(GvnTransform::default());
     runner.run();
 
-    eprintln!("LicmTransformer");
     runner.attach_transformer(LicmTransformer::default());
     runner.run();
 

diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -19,4 +19,4 @@ cranelift-entity = "0.104"
 sonatina-ir = { path = "../ir", version = "0.0.3-alpha" }
 
 [dev-dependencies]
-sonatina-parser = { path = "../parser", version = "0.0.3-alpha" }
+sonatina-parser2 = { path = "../parser2" }