refactoring

Author: fabiosvm

CMakeLists.txt

@@ -12,9 +12,9 @@ project(hook
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-set(BINARY_DIR ${CMAKE_BINARY_DIR}/../bin)
-set(LIBRARY_DIR ${CMAKE_BINARY_DIR}/../lib)
-set(PACKAGE_DIR ${CMAKE_BINARY_DIR}/../package)
+set(BINARY_DIR "${CMAKE_BINARY_DIR}/../bin")
+set(LIBRARY_DIR "${CMAKE_BINARY_DIR}/../lib")
+set(PACKAGE_DIR "${CMAKE_BINARY_DIR}/../package")
 
 include_directories(/usr/local/include)
 include_directories(include)

cli/CMakeLists.txt

@@ -12,7 +12,8 @@ if(NOT MSVC)
 endif()
 
 add_executable(${PROJECT_NAME} 
-  main.c)
+  "main.c"
+)
 
 target_link_directories(${PROJECT_NAME} PRIVATE ${LIBRARY_DIR})
 

cli/main.c

@@ -1,7 +1,12 @@
 //
-// The Hook Programming Language
 // main.c
 //
+// Copyright 2021 The Hook Programming Language Authors.
+//
+// This file is part of the Hook project.
+// For detailed license information, please refer to the LICENSE file
+// located in the root directory of this project.
+//
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -236,28 +241,28 @@ static inline void dump_bytecode_to_file(HkFunction *fn, const char *filename)
 
 static inline int run_bytecode(HkClosure *cl, ParsedArgs *parsedArgs)
 {
-  HkState state;
-  hk_state_init(&state, parsedArgs->stackSize);
-  hk_state_push_closure(&state, cl);
-  hk_state_push_array(&state, args_array(parsedArgs));
-  hk_state_call(&state, 1);
+  HkVM vm;
+  hk_vm_init(&vm, parsedArgs->stackSize);
+  hk_vm_push_closure(&vm, cl);
+  hk_vm_push_array(&vm, args_array(parsedArgs));
+  hk_vm_call(&vm, 1);
   int exitCode = EXIT_FAILURE;
-  if (hk_state_is_ok(&state))
+  if (hk_vm_is_ok(&vm))
   {
-    HkValue result = state.stackSlots[state.stackTop];
+    HkValue result = vm.stackSlots[vm.stackTop];
     exitCode = hk_is_int(result) ? (int) hk_as_number(result) : EXIT_SUCCESS;
-    hk_state_pop(&state);
+    hk_vm_pop(&vm);
     goto end;
   }
-  if (hk_state_is_exit(&state))
+  if (hk_vm_is_exit(&vm))
   {
-    HkValue result = state.stackSlots[state.stackTop];
+    HkValue result = vm.stackSlots[vm.stackTop];
     hk_assert(hk_is_int(result), "exit code must be an integer");
     exitCode = (int) hk_as_number(result);
-    hk_state_pop(&state);
+    hk_vm_pop(&vm);
   }
 end:
-  hk_state_deinit(&state);
+  hk_vm_deinit(&vm);
   return exitCode;
 }
 

core/CMakeLists.txt

@@ -12,59 +12,73 @@ if(NOT MSVC)
 endif()
 
 add_library(math_mod SHARED
-  math.c)
+  "math.c"
+)
 
 add_library(os_mod SHARED
-  os.c)
+  "os.c"
+)
 
 add_library(io_mod SHARED
-  io.c)
+  "io.c"
+)
 
 add_library(numbers_mod SHARED
-  numbers.c)
+  "numbers.c"
+)
 
 add_library(strings_mod SHARED
-  strings.c)
+  "strings.c"
+)
 
 add_library(arrays_mod SHARED
-  arrays.c)
+  "arrays.c"
+)
 
 add_library(utf8_mod SHARED
-  utf8.c)
+  "utf8.c"
+)
 
 add_library(hashing_mod SHARED
-  hashing.c
-  deps/crc32.c
-  deps/crc64.c
-  deps/md5.c
-  deps/ripemd160.c
-  deps/sha1.c
-  deps/sha2.c
-  deps/sha3.c)
+  "hashing.c"
+  "deps/crc32.c"
+  "deps/crc64.c"
+  "deps/md5.c"
+  "deps/ripemd160.c"
+  "deps/sha1.c"
+  "deps/sha2.c"
+  "deps/sha3.c"
+)
 
 add_library(encoding_mod SHARED
-  encoding.c
-  deps/ascii85.c
-  deps/base32.c
-  deps/base58.c
-  deps/base64.c)
+  "encoding.c"
+  "deps/ascii85.c"
+  "deps/base32.c"
+  "deps/base58.c"
+  "deps/base64.c"
+)
 
 add_library(socket_mod SHARED
-  socket.c)
+  "socket.c"
+)
 
 add_library(json_mod SHARED
-  json.c
-  deps/cJSON.c)
+  "json.c"
+  "deps/cJSON.c"
+)
 
 add_library(lists_mod SHARED
-  lists.c)
+  "lists.c"
+)
 
 add_library(ini_mod SHARED
-  ini.c
-  deps/ini.c)
+  "ini.c"
+  "deps/ini.c"
+)
 
 add_library(selectors_mod SHARED
-  selectors.c)
+  "selectors.c"
+)
 
 target_link_libraries(math_mod      ${STATIC_LIB_TARGET})
 target_link_libraries(os_mod        ${STATIC_LIB_TARGET})