Fixed some bugs about va_arg function.

Author: ax-6

CMakeLists.txt

@@ -6,6 +6,9 @@ cmake_minimum_required(VERSION 3.10)
 project(AQ C CXX)
 enable_testing()
 
+set(CMAKE_CXX_COMPILER "g++")
+set(CMAKE_C_COMPILER "gcc")
+
 include_directories(${PROJECT_SOURCE_DIR})
 
 set(COMPILER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/prototype/compiler.cc)

prototype/compiler.cc

@@ -8375,6 +8375,8 @@ void BytecodeGenerator::HandleFuncDecl(FuncDeclNode* func_decl) {
                             nullptr, return_value_reference_index));
   args_index.push_back(return_value_reference_index);
 
+std::size_t va_array_index = 0;
+
   for (std::size_t i = 0; i < args.size(); i++) {
     if (args[i]->GetType() == StmtNode::StmtType::kVarDecl) {
       args_index.push_back(
@@ -8387,7 +8389,8 @@ void BytecodeGenerator::HandleFuncDecl(FuncDeclNode* func_decl) {
                     "args is not VarDeclNode or ArrayDeclNode.");
     }
     if(i==args.size()-1&& func_decl->GetStat()->GetVaFlag()){
-      args_index.push_back(global_memory_.Add(1));
+      va_array_index = global_memory_.Add(1);
+      args_index.push_back(va_array_index);
     }
   }
 
@@ -8416,7 +8419,7 @@ void BytecodeGenerator::HandleFuncDecl(FuncDeclNode* func_decl) {
     if(i == func_decl->GetStat()->GetArgs().size()-1&& func_decl->GetStat()->GetVaFlag()){
       var_decl_map_.emplace(current_scope_.back() + "#args",
                             std::pair<VarDeclNode*, std::size_t>(
-                                NULL, global_memory_.Add(1)));
+                                NULL, va_array_index));
     }
   }
 
@@ -8542,6 +8545,8 @@ void BytecodeGenerator::HandleClassFuncDecl(FuncDeclNode* func_decl) {
                             nullptr, return_value_reference_index));
   args_index.push_back(return_value_reference_index);
 
+std::size_t va_array_index = 0;
+
   for (std::size_t i = 0; i < args.size(); i++) {
     if (args[i]->GetType() == StmtNode::StmtType::kVarDecl) {
       args_index.push_back(
@@ -8554,7 +8559,8 @@ void BytecodeGenerator::HandleClassFuncDecl(FuncDeclNode* func_decl) {
                     "args is not VarDeclNode or ArrayDeclNode.");
     }
     if(i == args.size()-1&& func_decl->GetStat()->GetVaFlag()){
-      args_index.push_back(global_memory_.Add(1));
+      va_array_index = global_memory_.Add(1);
+      args_index.push_back(va_array_index);
     }
   }
 
@@ -8584,7 +8590,7 @@ void BytecodeGenerator::HandleClassFuncDecl(FuncDeclNode* func_decl) {
       var_decl_map_.emplace(
           current_scope_.back() + "#args",
           std::pair<VarDeclNode*, std::size_t>(
-              NULL, global_memory_.Add(1)));
+              NULL, va_array_index));
     }
   }
 
@@ -8703,6 +8709,8 @@ void BytecodeGenerator::HandleClassConstructor(FuncDeclNode* func_decl) {
                             nullptr, return_value_reference_index));*/
   args_index.push_back(return_value_index);
 
+std::size_t va_array_index = 0;
+
   for (std::size_t i = 0; i < args.size(); i++) {
     if (args[i]->GetType() == StmtNode::StmtType::kVarDecl) {
       args_index.push_back(
@@ -8715,7 +8723,8 @@ void BytecodeGenerator::HandleClassConstructor(FuncDeclNode* func_decl) {
                     "args is not VarDeclNode or ArrayDeclNode.");
     }
     if(i==args.size()-1&& func_decl->GetStat()->GetVaFlag()){
-      args_index.push_back(global_memory_.Add(1));
+      va_array_index = global_memory_.Add(1);
+      args_index.push_back(va_array_index);
     }
   }
 
@@ -8745,7 +8754,7 @@ void BytecodeGenerator::HandleClassConstructor(FuncDeclNode* func_decl) {
       var_decl_map_.emplace(
           current_scope_.back() + "#args",
           std::pair<VarDeclNode*, std::size_t>(
-              NULL, global_memory_.Add(1)));
+              NULL, va_array_index));
     }
   }
 

prototype/hello-world.aq

@@ -1,5 +1,5 @@
 int print(auto str);
-class TEST_CLASS{
+/*class TEST_CLASS{
   void TEST_CLASS(){
     print("TEST_CLASS Created.\n");
   }
@@ -13,26 +13,32 @@ class TEST_CLASS{
 };
 void test_func(int abc){
   print("Int");
+}*/
+void test_func(char abc,...){
+  print(args[0]);
+  print("Char VA");
 }
-void test_func(char abc){
-  print("Char");
-}
-void test_func(TEST_CLASS abc){
+/*void test_func(TEST_CLASS abc){
   print("TEST_CLASS");
   abc.data_=999;
 }
+
+void test_func(char abc){
+  // print(args[0]);
+  print("Char INT NOT VA");
+}*/
 
 auto main(){
-  TEST_CLASS class_arr[10];
-  class_arr[11].data_=100;
+  //TEST_CLASS class_arr[10];
+  //class_arr[11].data_=100;
 
-  auto result = print("Hello World!\n");
-  print("1");
-  auto tc = class_arr[8];
-  tc.data_ = 666;
-  print(tc.data_);
-  print(1);
-  test_func(tc);
-  print( class_arr[8].data_);
-  return result;
+  //auto result = print("Hello World!\n");
+  test_func('1',"ABC");
+  //auto tc = class_arr[8];
+  //tc.data_ = 666;
+  //print(tc.data_);
+  //print(1);
+  //test_func(tc);
+  //print( class_arr[8].data_);
+  //return result;
 }