chore: fix eof newline

Author: Wybxc

.github/workflows/main.yaml

@@ -72,4 +72,4 @@ jobs:
     steps:
       # Manually check the status of all dependencies. `if: failure()` does not work.
       - name: check if any dependency failed
-        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

README.md

@@ -14,8 +14,8 @@ This code is still highly experimental and not ready for production use.
 In the root directory of the project, run the following command:
 
 ```bash
-./y rustc example/example.rs
-./build/example
+./y rustc examples/basic_math.rs
+./build/basic_math
 ```
 
 The usage of `./y` can be viewed from `./y help`.

bootstrap/src/fmt.rs

@@ -23,7 +23,7 @@ impl Run for FmtCommand {
                 .args(["--manifest-path", "crates/Cargo.toml"])
                 .arg("--all"),
         );
-        for file in glob("example/**/*.rs").unwrap() {
+        for file in glob("examples/**/*.rs").unwrap() {
             self.perform(Command::new("rustfmt").args(["--edition", "2021"]).arg(file.unwrap()));
         }
         for file in glob("tests/**/*.rs").unwrap() {

bootstrap/src/test.rs

@@ -37,7 +37,7 @@ impl Run for TestCommand {
                 TestType::FileCheck => {
                     cprint!("File checking {}...", testcase.name);
                     testcase.build(manifest);
-                    filechecker.run(&testcase.source, &testcase.output);
+                    filechecker.run(&testcase.source, &testcase.output_file);
                 }
                 TestType::Compile => {
                     cprint!("Compiling {}...", testcase.name);
@@ -57,35 +57,31 @@ impl TestCommand {
     pub fn collect_testcases(&self, manifest: &Manifest) -> Vec<TestCase> {
         let mut result = vec![];
 
+        // Test auxiliary (should compile first)
+        for case in glob("tests/auxiliary/*.rs").unwrap() {
+            let case = case.unwrap();
+            let filename = case.file_stem().unwrap();
+            let name = format!("auxiliary/{}", filename.to_string_lossy());
+            let output_file = manifest.out_dir.join(filename);
+            result.push(TestCase { name, source: case, output_file, test: TestType::CompileLib })
+        }
+
         // Examples
-        for case in glob("example/*.rs").unwrap() {
+        for case in glob("examples/*.rs").unwrap() {
             let case = case.unwrap();
             let filename = case.file_stem().unwrap();
-            if filename == "mini_core" {
-                // First compile mini_core
-                result.insert(
-                    0,
-                    TestCase {
-                        name: "mini_core".into(),
-                        source: case.clone(),
-                        output: manifest.out_dir.join(Path::new(filename)),
-                        test: TestType::CompileLib,
-                    },
-                );
-                continue;
-            }
-            let name = format!("example/{}", filename.to_string_lossy());
-            let output = manifest.out_dir.join("example").join(filename);
-            result.push(TestCase { name, source: case, output, test: TestType::Compile })
+            let name = format!("examples/{}", filename.to_string_lossy());
+            let output_file = manifest.out_dir.join("examples").join(filename);
+            result.push(TestCase { name, source: case, output_file, test: TestType::Compile })
         }
 
         // Codegen tests
         for case in glob("tests/codegen/*.rs").unwrap() {
             let case = case.unwrap();
             let filename = case.file_stem().unwrap();
             let name = format!("codegen/{}", filename.to_string_lossy());
-            let output = manifest.out_dir.join("tests/codegen").join(filename);
-            result.push(TestCase { name, source: case, output, test: TestType::FileCheck })
+            let output_file = manifest.out_dir.join("tests/codegen").join(filename);
+            result.push(TestCase { name, source: case, output_file, test: TestType::FileCheck })
         }
 
         result
@@ -102,33 +98,35 @@ pub enum TestType {
 pub struct TestCase {
     pub name: String,
     pub source: PathBuf,
-    pub output: PathBuf,
+    pub output_file: PathBuf,
     pub test: TestType,
 }
 
 impl TestCase {
     pub fn build(&self, manifest: &Manifest) {
-        std::fs::create_dir_all(self.output.parent().unwrap()).unwrap();
+        let output_dir = self.output_file.parent().unwrap();
+        std::fs::create_dir_all(output_dir).unwrap();
         let mut command = manifest.rustc();
         command
             .args(["--crate-type", "bin"])
             .arg("-O")
             .arg(&self.source)
             .arg("-o")
-            .arg(&self.output);
+            .arg(&self.output_file);
         log::debug!("running {:?}", command);
         command.status().unwrap();
     }
 
     pub fn build_lib(&self, manifest: &Manifest) {
-        std::fs::create_dir_all(self.output.parent().unwrap()).unwrap();
+        let output_dir = self.output_file.parent().unwrap();
+        std::fs::create_dir_all(output_dir).unwrap();
         let mut command = manifest.rustc();
         command
             .args(["--crate-type", "lib"])
             .arg("-O")
             .arg(&self.source)
             .arg("--out-dir")
-            .arg(self.output.parent().unwrap());
+            .arg(self.output_file.parent().unwrap());
         log::debug!("running {:?}", command);
         command.status().unwrap();
     }

example/example.rs renamed to examples/basic_math.rs

@@ -1,3 +1,5 @@
+//! Test that the generated code has the filename and function name in it
+
 // CHECK: filename
 
 #![feature(no_core)]

example/mini_core.rs renamed to tests/auxiliary/mini_core.rs

@@ -1,11 +1,18 @@
+//! Test that the generated code has the right number of parameters
+
 #![feature(no_core)]
 #![no_core]
 #![no_main]
 
 extern crate mini_core;
 
+// CHECK-LABEL: foo
+// CHECK-LABEL: main
+
 // expect three int params
-// CHECK: {{((int32_t .*,?\s?){3})}}
+// CHECK-LABEL: foo
+// CHECK: (int32_t {{[a-zA-Z_][a-zA-Z0-9_]*}}, int32_t {{[a-zA-Z_][a-zA-Z0-9_]*}}, int32_t {{[a-zA-Z_][a-zA-Z0-9_]*}})
+// CHECK: return 0;
 #[no_mangle]
 pub fn foo(_x: i32, _y: i32, _z: i32) -> i32 {
     0

tests/codegen/filename.rs

@@ -1,10 +1,11 @@
+//! Test that we can return a value from a function
 #![feature(no_core)]
 #![no_core]
 #![no_main]
 
 extern crate mini_core;
 
-// expect three int params
+// CHECK-LABEL: main
 // CHECK: 42
 #[no_mangle]
 pub fn main() -> i32 {