Remove opOperatorPow opcode, ^ is now making implicit call to pow() instead

Kagamma · Kagamma · commit 115473003e57 · 2025-10-02T14:11:40.000Z
diff --git a/ScriptEngine.pas b/ScriptEngine.pas
@@ -122,7 +122,6 @@ interface
     opOperatorMul,
     opOperatorDiv,
     opOperatorMod,
-    opOperatorPow,
     opOperatorNegative,
     opOperatorLesser,
     opOperatorLesserOrEqual,
@@ -764,7 +763,6 @@   TSECacheMap = class(TSECacheMapAncestor)
     1, // opOperatorMul,
     1, // opOperatorDiv,
     1, // opOperatorMod,
-    1, // opOperatorPow,
     1, // opOperatorNegative,
     1, // opOperatorLesser,
     1, // opOperatorLesserOrEqual,
@@ -5603,7 +5601,6 @@ procedure TSEVM.Exec;
   labelOperatorMul,
   labelOperatorDiv,
   labelOperatorMod,
-  labelOperatorPow,
   labelOperatorNegative,
   labelOperatorLesser,
   labelOperatorLesserOrEqual,
@@ -5677,7 +5674,6 @@ procedure TSEVM.Exec;
     @labelOperatorMul,
     @labelOperatorDiv,
     @labelOperatorMod,
-    @labelOperatorPow,
     @labelOperatorNegative,
     @labelOperatorLesser,
     @labelOperatorLesserOrEqual,
@@ -6442,15 +6438,6 @@ procedure TSEVM.Exec;
           Self.BinaryPtr := BinaryPtrLocal;
           Exit;
         end;
-      {$ifndef SE_COMPUTED_GOTO}opOperatorPow:{$endif}
-        begin
-        labelOperatorPow:
-          B := Pop;
-          A := Pop;
-          Push(Power(A^.VarNumber, B^.VarNumber));
-          Inc(CodePtrLocal);
-          DispatchGoto;
-        end;
       {$ifndef SE_COMPUTED_GOTO}opHlt:{$endif}
         begin
         labelHlt:
@@ -8839,14 +8826,23 @@ procedure TEvilC.Parse;
     procedure Pow;
     var
       Token: TSEToken;
+      FuncInfo: PSEFuncNativeInfo;
+      FuncIndex: Integer;
     begin
       SignedFactor;
       while True do
       begin
         Token := PeekAtNextToken;
         case Token.Kind of
           tkPow:
-            BinaryOp(opOperatorPow, @SignedFactor);
+            begin
+              // BinaryOp(opOperatorPow, @SignedFactor);
+              NextToken;
+              PeekAtNextTokenExpected([tkBracketOpen, tkSquareBracketOpen, tkDot, tkNumber, tkString, tkNegative, tkIdent]);
+              SignedFactor;
+              FuncInfo := FindFuncNative('pow', FuncIndex);
+              Emit([Pointer(opCallNative), Pointer(FuncIndex), Pointer(2), Pointer(0)])
+            end;
           else
             Exit;
         end;
