Use awk to rewrite compile.lua

nervosnetwork · Sep 11, 2024 · db805ce · db805ce
1 parent 7ca37f9
commit db805ce
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/tests/benchmark/Makefile b/tests/benchmark/Makefile
@@ -14,7 +14,7 @@ define debug
 endef
 
 define compile-run
-	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/$(1) --bin $(BIN_PATH) -- -c | lua $(ROOT_DIR)/../../tools/compile.lua | xxd -r -p > $(ROOT_DIR)/../../build/$(1).bc
+	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/$(1) --bin $(BIN_PATH) -- -c | awk -f $(ROOT_DIR)/../../tools/compile.awk | xxd -r -p > $(ROOT_DIR)/../../build/$(1).bc
 	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/../../build/$(1).bc --bin $(BIN_PATH) -- -r | tee $(ROOT_DIR)/benchmark.txt
 endef
 

diff --git a/tests/ckb_js_tests/Makefile b/tests/ckb_js_tests/Makefile
@@ -27,8 +27,8 @@ build/testdata_fs_modules.bin: test_data/fs_module/main.js test_data/fs_module/f
 
 fs_bytecode:
 	mkdir -p ../../build/bytecode
-	$(CKB_DEBUGGER) --read-file test_data/fs_module/main.js --bin $(BIN_PATH) -- -c | lua $(ROOT_DIR)/../../tools/compile.lua | xxd -r -p > ../../build/bytecode/main.bc
-	$(CKB_DEBUGGER) --read-file test_data/fs_module/fib_module.js --bin $(BIN_PATH) -- -c | lua $(ROOT_DIR)/../../tools/compile.lua | xxd -r -p > ../../build/bytecode/fib_module.bc
+	$(CKB_DEBUGGER) --read-file test_data/fs_module/main.js --bin $(BIN_PATH) -- -c | awk -f $(ROOT_DIR)/../../tools/compile.awk | xxd -r -p > ../../build/bytecode/main.bc
+	$(CKB_DEBUGGER) --read-file test_data/fs_module/fib_module.js --bin $(BIN_PATH) -- -c | awk -f $(ROOT_DIR)/../../tools/compile.awk | xxd -r -p > ../../build/bytecode/fib_module.bc
 	cd ../../build/bytecode && lua ../../tools/fs.lua pack ../../build/testdata_fs_modules_bc.bin main.bc fib_module.bc
 	$(CKB_DEBUGGER) --max-cycles $(MAX_CYCLES) --read-file ../../build/testdata_fs_modules_bc.bin --bin $(BIN_PATH) -- -f -r 2>&1 | fgrep 'Run result: 0'
 

diff --git a/tests/examples/Makefile b/tests/examples/Makefile
@@ -14,7 +14,7 @@ define debug
 endef
 
 define compile-run
-	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/$(1) --bin $(BIN_PATH) -- -c | lua $(ROOT_DIR)/../../tools/compile.lua | xxd -r -p > $(ROOT_DIR)/../../build/$(1).bc
+	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/$(1) --bin $(BIN_PATH) -- -c | awk -f $(ROOT_DIR)/../../tools/compile.awk | xxd -r -p > $(ROOT_DIR)/../../build/$(1).bc
 	$(CKB-DEBUGGER) --read-file $(ROOT_DIR)/../../build/$(1).bc --bin $(BIN_PATH) -- -r | fgrep 'Run result: 0'
 endef
 

diff --git a/tools/compile.awk b/tools/compile.awk
@@ -0,0 +1,14 @@
+#!/usr/bin/awk -f
+
+{
+    # Check if the line starts with "Script log: "
+    if ($0 ~ /^Script log: /) {
+        # Remove "Script log: " from the line
+        line_data = gensub(/^Script log: /, "", "g")
+
+        # If the remaining line is not empty, print it
+        if (line_data != "") {
+            print line_data
+        }
+    }
+}
diff --git a/tools/compile.lua b/tools/compile.lua