📝 rename files

CMakeLists.txt

@@ -18,25 +18,25 @@ set(CMAKE_BUILD_TYPE "Release")
 set(NASAL_OBJECT_SOURCE_FILE
     ${CMAKE_SOURCE_DIR}/src/ast_dumper.cpp
     ${CMAKE_SOURCE_DIR}/src/ast_visitor.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_ast.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_ast.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_builtin.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_builtin.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_codegen.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_codegen.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_dbg.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_dbg.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_err.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_err.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_gc.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_gc.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_import.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_import.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_lexer.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_lexer.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_misc.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_misc.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_opcode.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_opcode.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_parse.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_parse.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_vm.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_vm.cpp
     ${CMAKE_SOURCE_DIR}/src/optimizer.cpp
     ${CMAKE_SOURCE_DIR}/src/symbol_finder.cpp)
 add_library(nasal-object STATIC ${NASAL_OBJECT_SOURCE_FILE})
 target_include_directories(nasal-object PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 # build nasal
-add_executable(nasal ${CMAKE_SOURCE_DIR}/src/nasal_new_main.cpp)
+add_executable(nasal ${CMAKE_SOURCE_DIR}/src/main.cpp)
 target_link_libraries(nasal nasal-object)
 if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
     target_link_libraries(nasal dl)
@@ -55,8 +55,8 @@ endif()
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/module)
 
 set(MODULE_USED_OBJECT_SOURCE_FILE
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_misc.cpp
+    ${CMAKE_SOURCE_DIR}/src/nasal_misc.cpp
-    ${CMAKE_SOURCE_DIR}/src/nasal_new_gc.cpp)
+    ${CMAKE_SOURCE_DIR}/src/nasal_gc.cpp)
 add_library(module-used-object STATIC ${MODULE_USED_OBJECT_SOURCE_FILE})
 
 add_library(fib SHARED ${CMAKE_SOURCE_DIR}/module/fib.cpp)

makefile

@@ -1,23 +1,23 @@
 STD=c++17
 
 NASAL_OBJECT=\
-	nasal_new_err.o\
+	nasal_err.o\
-	nasal_new_ast.o\
+	nasal_ast.o\
 	ast_visitor.o\
 	ast_dumper.o\
-	nasal_new_lexer.o\
+	nasal_lexer.o\
-	nasal_new_parse.o\
+	nasal_parse.o\
-	nasal_new_import.o\
+	nasal_import.o\
 	optimizer.o\
-	nasal_new_opcode.o\
+	nasal_opcode.o\
 	symbol_finder.o\
-	nasal_new_codegen.o\
+	nasal_codegen.o\
-	nasal_new_misc.o\
+	nasal_misc.o\
-	nasal_new_gc.o\
+	nasal_gc.o\
-	nasal_new_builtin.o\
+	nasal_builtin.o\
-	nasal_new_vm.o\
+	nasal_vm.o\
-	nasal_new_dbg.o\
+	nasal_dbg.o\
-	nasal_new_main.o
+	main.o
 
 # for test
 nasal: $(NASAL_OBJECT)
@@ -26,65 +26,62 @@ nasal: $(NASAL_OBJECT)
 nasal.exe: $(NASAL_OBJECT)
 	$(CXX) $(NASAL_OBJECT) -O3 -o nasal.exe
 
-nasal_new_main.o: src/nasal_new_main.cpp
+main.o: src/main.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_main.cpp -fno-exceptions -fPIC -o nasal_new_main.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/main.cpp -fno-exceptions -fPIC -o main.o -I .
 
-nasal_new_misc.o: src/nasal_new_header.h src/nasal_new_misc.cpp
+nasal_misc.o: src/nasal.h src/nasal_misc.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_misc.cpp -fno-exceptions -fPIC -o nasal_new_misc.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_misc.cpp -fno-exceptions -fPIC -o nasal_misc.o -I .
 
-nasal_new_err.o: src/nasal_new_err.h src/nasal_new_err.cpp
+nasal_err.o: src/nasal_err.h src/nasal_err.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_err.cpp -fno-exceptions -fPIC -o nasal_new_err.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_err.cpp -fno-exceptions -fPIC -o nasal_err.o -I .
 
-nasal_new_gc.o: src/nasal_new_gc.h src/nasal_new_gc.cpp
+nasal_gc.o: src/nasal_gc.h src/nasal_gc.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_gc.cpp -fno-exceptions -fPIC -o nasal_new_gc.o -I . 
+	$(CXX) -std=$(STD) -c -O3 src/nasal_gc.cpp -fno-exceptions -fPIC -o nasal_gc.o -I . 
 
-nasal_new_import.o: src/nasal_new_import.h src/nasal_new_import.cpp
+nasal_import.o: src/nasal_import.h src/nasal_import.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_import.cpp -fno-exceptions -fPIC -o nasal_new_import.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_import.cpp -fno-exceptions -fPIC -o nasal_import.o -I .
 
-nasal_new_lexer.o: src/nasal_new_lexer.h src/nasal_new_lexer.cpp
+nasal_lexer.o: src/nasal_lexer.h src/nasal_lexer.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_lexer.cpp -fno-exceptions -fPIC -o nasal_new_lexer.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_lexer.cpp -fno-exceptions -fPIC -o nasal_lexer.o -I .
 
-nasal_new_ast.o: src/nasal_new_ast.h src/nasal_new_ast.cpp
+nasal_ast.o: src/nasal_ast.h src/nasal_ast.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_ast.cpp -fno-exceptions -fPIC -o nasal_new_ast.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_ast.cpp -fno-exceptions -fPIC -o nasal_ast.o -I .
 
-nasal_new_builtin.o: src/nasal_new_builtin.h src/nasal_new_builtin.cpp
+nasal_builtin.o: src/nasal_builtin.h src/nasal_builtin.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_builtin.cpp -fno-exceptions -fPIC -o nasal_new_builtin.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_builtin.cpp -fno-exceptions -fPIC -o nasal_builtin.o -I .
 
-nasal_new_codegen.o: src/nasal_new_codegen.h src/nasal_new_codegen.cpp
+nasal_codegen.o: src/nasal_codegen.h src/nasal_codegen.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_codegen.cpp -fno-exceptions -fPIC -o nasal_new_codegen.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_codegen.cpp -fno-exceptions -fPIC -o nasal_codegen.o -I .
 
-nasal_new_opcode.o: src/nasal_new_opcode.h src/nasal_new_opcode.cpp
+nasal_opcode.o: src/nasal_opcode.h src/nasal_opcode.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_opcode.cpp -fno-exceptions -fPIC -o nasal_new_opcode.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_opcode.cpp -fno-exceptions -fPIC -o nasal_opcode.o -I .
 
-nasal_new_parse.o: src/nasal_new_parse.h src/nasal_new_parse.cpp src/nasal_new_ast.h
+nasal_parse.o: src/nasal_parse.h src/nasal_parse.cpp src/nasal_ast.h
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_parse.cpp -fno-exceptions -fPIC -o nasal_new_parse.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_parse.cpp -fno-exceptions -fPIC -o nasal_parse.o -I .
 
-optimizer.o: src/optimizer.h src/optimizer.cpp src/nasal_new_ast.h
+optimizer.o: src/optimizer.h src/optimizer.cpp src/nasal_ast.h
 	$(CXX) -std=$(STD) -c -O3 src/optimizer.cpp -fno-exceptions -fPIC -o optimizer.o -I .
 
-symbol_finder.o: src/symbol_finder.h src/symbol_finder.cpp src/nasal_new_ast.h
+symbol_finder.o: src/symbol_finder.h src/symbol_finder.cpp src/nasal_ast.h
 	$(CXX) -std=$(STD) -c -O3 src/symbol_finder.cpp -fno-exceptions -fPIC -o symbol_finder.o -I .
 
-ast_visitor.o: src/nasal_new_ast.h src/ast_visitor.h src/ast_visitor.cpp
+ast_visitor.o: src/nasal_ast.h src/ast_visitor.h src/ast_visitor.cpp
 	$(CXX) -std=$(STD) -c -O3 src/ast_visitor.cpp -fno-exceptions -fPIC -o ast_visitor.o -I .
 
-ast_dumper.o: src/nasal_new_ast.h src/ast_visitor.h src/ast_dumper.h src/ast_dumper.cpp
+ast_dumper.o: src/nasal_ast.h src/ast_visitor.h src/ast_dumper.h src/ast_dumper.cpp
 	$(CXX) -std=$(STD) -c -O3 src/ast_dumper.cpp -fno-exceptions -fPIC -o ast_dumper.o -I .
 
-nasal_new_vm.o: src/nasal_new_vm.h src/nasal_new_vm.cpp
+nasal_vm.o: src/nasal_vm.h src/nasal_vm.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_vm.cpp -fno-exceptions -fPIC -o nasal_new_vm.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_vm.cpp -fno-exceptions -fPIC -o nasal_vm.o -I .
 
-nasal_new_dbg.o: src/nasal_new_dbg.h src/nasal_new_dbg.cpp
+nasal_dbg.o: src/nasal_dbg.h src/nasal_dbg.cpp
-	$(CXX) -std=$(STD) -c -O3 src/nasal_new_dbg.cpp -fno-exceptions -fPIC -o nasal_new_dbg.o -I .
+	$(CXX) -std=$(STD) -c -O3 src/nasal_dbg.cpp -fno-exceptions -fPIC -o nasal_dbg.o -I .
-
-.PHONY: nasal_new_clean
-nasal_new_clean:
-	rm $(NASAL_OBJECT)
 
 .PHONY: clean
 clean:
 	@ echo "[clean] nasal" && if [ -e nasal ]; then rm nasal; fi
 	@ echo "[clean] nasal.exe" && if [ -e nasal.exe ]; then rm nasal.exe; fi
+	@ rm $(NASAL_OBJECT)
 
 .PHONY: test
 test:nasal

module/fib.cpp

@@ -1,7 +1,7 @@
 // module for test
 
 #include <iostream>
-#include "../src/nasal_new_header.h"
+#include "../src/nasal.h"
 
 namespace nasal_fib_module {
 

module/keyboard.cpp

@@ -1,4 +1,4 @@
-#include "../src/nasal_new_header.h"
+#include "../src/nasal.h"
 #include <iostream>
 
 #ifndef _MSC_VER

module/makefile

@@ -3,8 +3,8 @@
 dynamic_libs_so = libfib.so libkey.so libnasock.so libmat.so
 dynamic_libs_dll = libfib.dll libkey.dll libnasock.dll libmat.dll
 
-used_header = ../src/nasal_new_header.h ../src/nasal_new_gc.h
+used_header = ../src/nasal.h ../src/nasal_gc.h
-used_object = ../nasal_new_misc.o ../nasal_new_gc.o
+used_object = ../nasal_misc.o ../nasal_gc.o
 
 STD=c++17
 

module/matrix.cpp

@@ -1,4 +1,4 @@
-#include "../src/nasal_new_header.h"
+#include "../src/nasal.h"
 #include <cmath>
 
 var nas_vec2(var* args, usize size, gc* ngc) {

module/nasocket.cpp

@@ -1,4 +1,4 @@
-#include "../src/nasal_new_header.h"
+#include "../src/nasal.h"
 
 #ifndef _MSC_VER
 #include <unistd.h>

src/ast_visitor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
 
 class ast_visitor {
 public:

src/main.cpp

@@ -1,16 +1,16 @@
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_err.h"
+#include "nasal_err.h"
-#include "nasal_new_lexer.h"
+#include "nasal_lexer.h"
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
-#include "nasal_new_parse.h"
+#include "nasal_parse.h"
-#include "nasal_new_import.h"
+#include "nasal_import.h"
 #include "ast_visitor.h"
 #include "ast_dumper.h"
 #include "symbol_finder.h"
 #include "optimizer.h"
-#include "nasal_new_codegen.h"
+#include "nasal_codegen.h"
-#include "nasal_new_vm.h"
+#include "nasal_vm.h"
-#include "nasal_new_dbg.h"
+#include "nasal_dbg.h"
 
 #include <unordered_map>
 #include <thread>

src/nasal.h

@@ -50,4 +50,4 @@ i32 utf8_hdchk(const char);
 std::string chrhex(const char);
 std::string rawstr(const std::string&, const usize maxlen=0);
 
-#include "nasal_new_gc.h"
+#include "nasal_gc.h"

src/nasal_ast.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
 #include "ast_visitor.h"
 
 void expr::accept(ast_visitor* visitor) {

src/nasal_ast.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_err.h"
+#include "nasal_err.h"
 
 #include <vector>
 #include <unordered_map>

src/nasal_builtin.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_builtin.h"
+#include "nasal_builtin.h"
 
 var builtin_print(var* local, gc& ngc) {
     for(auto& i:local[1].vec().elems) {

src/nasal_builtin.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_gc.h"
+#include "nasal_gc.h"
 
 #ifndef _MSC_VER
 #include <unistd.h>

src/nasal_codegen.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_codegen.h"
+#include "nasal_codegen.h"
 
 void codegen::check_id_exist(identifier* node) {
     const auto& name = node->get_name();

src/nasal_codegen.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "nasal_new_err.h"
+#include "nasal_err.h"
-#include "nasal_new_builtin.h"
+#include "nasal_builtin.h"
-#include "nasal_new_opcode.h"
+#include "nasal_opcode.h"
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
 #include "ast_visitor.h"
 #include "symbol_finder.h"
-#include "nasal_new_parse.h"
+#include "nasal_parse.h"
-#include "nasal_new_import.h"
+#include "nasal_import.h"
 
 #include <iomanip>
 #include <list>

src/nasal_dbg.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_dbg.h"
+#include "nasal_dbg.h"
 
 std::vector<std::string> dbg::parse(const std::string& cmd) {
     std::vector<std::string> res;

src/nasal_dbg.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "nasal_new_import.h"
+#include "nasal_import.h"
-#include "nasal_new_err.h"
+#include "nasal_err.h"
-#include "nasal_new_opcode.h"
+#include "nasal_opcode.h"
-#include "nasal_new_vm.h"
+#include "nasal_vm.h"
 
 #include <cstring>
 #include <algorithm>

src/nasal_err.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_err.h"
+#include "nasal_err.h"
 #ifdef _WIN32
 #include <windows.h> // use SetConsoleTextAttribute
 struct for_reset {

src/nasal_err.h

@@ -6,7 +6,7 @@
 #include <cstring>
 #include <vector>
 
-#include "nasal_new_header.h"
+#include "nasal.h"
 
 struct span {
     u32 begin_line;

src/nasal_gc.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_gc.h"
+#include "nasal_gc.h"
 
 void filehandle_destructor(void* ptr) {
     if ((FILE*)ptr==stdin) {

src/nasal_gc.h

@@ -30,7 +30,7 @@
 #include <cstring>
 #include <sstream>
 
-#include "nasal_new_header.h"
+#include "nasal.h"
 
 enum vm_type:u8 {
     /* none-gc object */

src/nasal_import.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_import.h"
+#include "nasal_import.h"
 
 linker::linker(error& e): show_path(false), lib_loaded(false), err(e) {
     char sep=is_windows()? ';':':';

src/nasal_import.h

@@ -12,10 +12,10 @@
 #define F_OK 0
 #endif
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
-#include "nasal_new_lexer.h"
+#include "nasal_lexer.h"
-#include "nasal_new_parse.h"
+#include "nasal_parse.h"
 
 class linker{
 private:

src/nasal_lexer.cpp

@@ -4,7 +4,7 @@
 #pragma warning (disable:4102)
 #endif
 
-#include "nasal_new_lexer.h"
+#include "nasal_lexer.h"
 
 bool lexer::skip(char c) {
     return c==' '||c=='\n'||c=='\t'||c=='\r'||c==0;

src/nasal_lexer.h

@@ -12,8 +12,8 @@
 #include <unordered_map>
 #include <sys/stat.h>
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_err.h"
+#include "nasal_err.h"
 
 #ifdef _MSC_VER
 #define S_ISREG(m) (((m)&0xF000)==0x8000)

src/nasal_misc.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_header.h"
+#include "nasal.h"
 
 bool is_windows() {
 #if defined(_WIN32) || defined(_WIN64)

src/nasal_opcode.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_opcode.h"
+#include "nasal_opcode.h"
 
 const char* opname[]={
     "exit  ","intg  ","intl  ","loadg ",

src/nasal_opcode.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_builtin.h"
+#include "nasal_builtin.h"
 
 #include <iostream>
 

src/nasal_parse.cpp

@@ -1,5 +1,5 @@
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
-#include "nasal_new_parse.h"
+#include "nasal_parse.h"
 
 const error& parse::compile(const lexer& lexer) {
     toks=lexer.result().data();

src/nasal_parse.h

@@ -2,10 +2,10 @@
 
 #include <unordered_map>
 
-#include "nasal_new_header.h"
+#include "nasal.h"
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
-#include "nasal_new_lexer.h"
+#include "nasal_lexer.h"
-#include "nasal_new_err.h"
+#include "nasal_err.h"
 
 class parse {
 

src/nasal_vm.cpp

@@ -1,4 +1,4 @@
-#include "nasal_new_vm.h"
+#include "nasal_vm.h"
 
 void vm::init(
     const std::vector<std::string>& strs,

src/nasal_vm.h

@@ -3,9 +3,9 @@
 #include <iomanip>
 #include <stack>
 
-#include "nasal_new_import.h"
+#include "nasal_import.h"
-#include "nasal_new_gc.h"
+#include "nasal_gc.h"
-#include "nasal_new_codegen.h"
+#include "nasal_codegen.h"
 
 #ifdef _MSC_VER
 #pragma warning (disable:4244)

src/optimizer.h

@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
 #include "ast_visitor.h"
 
 class optimizer:public ast_visitor {

src/symbol_finder.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nasal_new_ast.h"
+#include "nasal_ast.h"
 #include "ast_visitor.h"
 
 #include <cstring>