pikastech 3 лет назад
Родитель
Сommit
00775cc299
3 измененных файлов с 9 добавлено и 9 удалено
  1. 7 7
      src/PikaObj.c
  2. 1 1
      src/PikaVM.c
  3. 1 1
      test/VM-test.cpp

+ 7 - 7
src/PikaObj.c

@@ -979,23 +979,23 @@ void args_setSysOut(Args* args, char* str) {
 }
 
 void method_returnBytes(Args* args, uint8_t* val) {
-    args_setBytes(args, "return", val, PIKA_BYTES_DEFAULT_SIZE);
+    args_setBytes(args, "@rt", val, PIKA_BYTES_DEFAULT_SIZE);
 }
 
 void method_returnStr(Args* args, char* val) {
-    args_setStr(args, "return", val);
+    args_setStr(args, "@rt", val);
 }
 
 void method_returnInt(Args* args, int64_t val) {
-    args_setInt(args, "return", val);
+    args_setInt(args, "@rt", val);
 }
 
 void method_returnFloat(Args* args, pika_float val) {
-    args_setFloat(args, "return", val);
+    args_setFloat(args, "@rt", val);
 }
 
 void method_returnPtr(Args* args, void* val) {
-    args_setPtr(args, "return", val);
+    args_setPtr(args, "@rt", val);
 }
 
 void method_returnObj(Args* args, void* val) {
@@ -1009,11 +1009,11 @@ void method_returnObj(Args* args, void* val) {
     } else {
         type = ARG_TYPE_OBJECT_NEW;
     }
-    args_setPtrWithType(args, "return", type, val);
+    args_setPtrWithType(args, "@rt", type, val);
 }
 
 void method_returnArg(Args* args, Arg* arg) {
-    arg = arg_setName(arg, "return");
+    arg = arg_setName(arg, "@rt");
     args_setArg(args, arg);
 }
 

+ 1 - 1
src/PikaVM.c

@@ -643,7 +643,7 @@ static Arg* VM_instruction_handler_GER(PikaObj* self,
 }
 
 Arg* _get_return_arg(PikaObj* locals) {
-    Arg* res = args_getArg(locals->list, (char*)"return");
+    Arg* res = args_getArg(locals->list, (char*)"@rt");
     args_removeArg_notDeinitArg(locals->list, res);
     return res;
 }

+ 1 - 1
test/VM-test.cpp

@@ -274,7 +274,7 @@ TEST(VM, RET_instruct) {
         "B0\n";
     PikaObj* self = New_TinyObj(NULL);
     VMParameters* globals = pikaVM_runAsm(self, pikaAsm);
-    Arg* return_arg = args_getArg(globals->list, "return");
+    Arg* return_arg = args_getArg(globals->list, "@rt");
     int num = arg_getInt(return_arg);
     EXPECT_EQ(num, 13);
     obj_deinit(self);