瀏覽代碼

fix: small bugs after refactoring and update light-build to build

Claire xyz 3 月之前
父節點
當前提交
3fbfe807c6
共有 4 個文件被更改,包括 12 次插入12 次删除
  1. 1 1
      crates/assembler/src/parser.rs
  2. 1 1
      src/commands/build.rs
  3. 5 5
      tests/test_memo.rs
  4. 5 5
      tests/utils.rs

+ 1 - 1
crates/assembler/src/parser.rs

@@ -140,7 +140,7 @@ impl Parse for ExternDecl {
 
 impl Parse for ROData {
     fn parse(tokens: &[Token]) -> Result<(Self, &[Token]), CompileError> {
-        let Token::Directive(_, span) = &tokens[0] else { bug!("ROData not a valid directive") };
+        let Token::Label(_, span) = &tokens[0] else { bug!("ROData not a valid directive") };
         if tokens.len() < 3 {
             return Err(CompileError::InvalidRodataDecl { span: span.clone(), custom_label: Some(EXPECTS_MORE_OPERAND.to_string()) });
         }

+ 1 - 1
src/commands/build.rs

@@ -65,7 +65,7 @@ pub fn build() -> Result<()> {
             if let Some(subdir) = path.file_name().and_then(|name| name.to_str()) {
                 let asm_file = format!("{}/{}/{}.s", src, subdir, subdir);
                 if Path::new(&asm_file).exists() {
-                    println!("⚡️ Light building \"{}\"", subdir);
+                    println!("⚡️ Building \"{}\"", subdir);
                     let start = Instant::now();
                     compile_assembly(&asm_file, deploy)?;
                     let duration = start.elapsed();

+ 5 - 5
tests/test_memo.rs

@@ -1,6 +1,6 @@
 mod utils;
 
-use utils::{TestEnv, init_project, verify_project_structure, run_light_build, verify_so_files, run_tests, update_assembly_file};
+use utils::{TestEnv, init_project, verify_project_structure, verify_so_files, run_tests, update_assembly_file, run_build};
 
 #[test]
 fn test_memo_project_e2e() {
@@ -12,8 +12,8 @@ fn test_memo_project_e2e() {
     // Step 2: Verify project structure
     verify_project_structure(&env, "memo");
     
-    // Step 3: Run light-build
-    run_light_build(&env);
+    // Step 3: Run build
+    run_build(&env);
     
     // Step 4: Verify .so files were created
     verify_so_files(&env);
@@ -50,8 +50,8 @@ entrypoint:
   exit"#;
     update_assembly_file(&env, "memo2", new_memo_content);
     
-    // Step 4: Run light-build
-    run_light_build(&env);
+    // Step 4: Run build
+    run_build(&env);
     
     // Step 5: Verify .so files were created
     verify_so_files(&env);

+ 5 - 5
tests/utils.rs

@@ -114,15 +114,15 @@ pub fn verify_project_structure(env: &TestEnv, project_name: &str) {
     assert!(project_dir.join("Cargo.toml").exists(), "Cargo.toml should exist");
 }
 
-/// Run light-build on the project
-pub fn run_light_build(env: &TestEnv) {
-    println!("Step 3: Running light-build...");
+/// Run build on the project
+pub fn run_build(env: &TestEnv) {
+    println!("Step 3: Running build...");
     
     run_command(
         Command::new(&env.sbpf_bin)
             .current_dir(&env.project_dir)
-            .arg("light-build"),
-        "target/debug/sbpf light-build"
+            .arg("build"),
+        "target/debug/sbpf build"
     );
 }