Explorar o código

Update ceval.c

blueloveTH hai 5 meses
pai
achega
6f7df0c3af
Modificáronse 1 ficheiros con 3 adicións e 4 borrados
  1. 3 4
      src/interpreter/ceval.c

+ 3 - 4
src/interpreter/ceval.c

@@ -11,7 +11,7 @@
 #include <assert.h>
 #include <assert.h>
 #include <time.h>
 #include <time.h>
 
 
-static bool stack_format_object(VM* self, c11_sv spec);
+static bool format_object(VM* self, py_Ref val, c11_sv spec);
 
 
 #define DISPATCH()                                                                                 \
 #define DISPATCH()                                                                                 \
     do {                                                                                           \
     do {                                                                                           \
@@ -1191,7 +1191,7 @@ __NEXT_STEP:
         //////////////////
         //////////////////
         case OP_FORMAT_STRING: {
         case OP_FORMAT_STRING: {
             py_Ref spec = c11__at(py_TValue, &frame->co->consts, byte.arg);
             py_Ref spec = c11__at(py_TValue, &frame->co->consts, byte.arg);
-            bool ok = stack_format_object(self, py_tosv(spec));
+            bool ok = format_object(self, TOP(), py_tosv(spec));
             if(!ok) goto __ERROR;
             if(!ok) goto __ERROR;
             DISPATCH();
             DISPATCH();
         }
         }
@@ -1298,10 +1298,9 @@ bool pk_stack_binaryop(VM* self, py_Name op, py_Name rop) {
                      rhs_t);
                      rhs_t);
 }
 }
 
 
-static bool stack_format_object(VM* self, c11_sv spec) {
+static bool format_object(VM* self, py_Ref val, c11_sv spec) {
     // format TOS via `spec` inplace
     // format TOS via `spec` inplace
     // spec: '!r:.2f', '.2f'
     // spec: '!r:.2f', '.2f'
-    py_StackRef val = TOP();
     if(spec.size == 0) return py_str(val);
     if(spec.size == 0) return py_str(val);
 
 
     if(spec.data[0] == '!') {
     if(spec.data[0] == '!') {