Update lape

Author: ollydev

Source/script/simba.script.pas

@@ -19,7 +19,6 @@ interface
   PSimbaScript = ^TSimbaScript;
   TSimbaScript = class(TObject)
   protected
-    FState: TInitBool;
     FUserTerminated: Boolean;
     FTargetWindow: TWindowHandle;
     FHints: Boolean;
@@ -28,6 +27,7 @@   TSimbaScript = class(TObject)
     FScriptFileName: String;
 
     FCompiler: TSimbaScript_Compiler;
+    FCodeRunner: TLapeCodeRunner;
     FCompileTime: Double;
     FRunningTime: Double;
 
@@ -155,12 +155,14 @@ function TSimbaScript.DoCompilerHandleDirective(Sender: TLapeCompiler; Directive
 
 function TSimbaScript.GetState: ESimbaScriptState;
 begin
-  case FState of
-    bTrue:  Result := ESimbaScriptState.STATE_RUNNING;
-    bFalse: Result := ESimbaScriptState.STATE_STOP;
-    else
-      Result := ESimbaScriptState.STATE_PAUSED;
-  end;
+  if (FCodeRunner = nil) then
+    Result := ESimbaScriptState.STATE_NONE
+  else if FCodeRunner.isRunning then
+    Result := ESimbaScriptState.STATE_RUNNING
+  else if FCodeRunner.isStopped then
+    Result := ESimbaScriptState.STATE_STOP
+  else if FCodeRunner.isPaused then
+    Result := ESimbaScriptState.STATE_PAUSED;
 end;
 
 procedure TSimbaScript.SetTargetWindow(Value: String);
@@ -213,15 +215,16 @@ function TSimbaScript.Run: Boolean;
 
   FRunningTime := HighResolutionTime();
   try
-    RunCode(FCompiler.Emitter, FState);
+    FCodeRunner := TLapeCodeRunner.Create(FCompiler.Emitter);
+    FCodeRunner.Run();
   finally
     FRunningTime := HighResolutionTime() - FRunningTime;
 
     FPlugins.CallOnStop();
 
     if FUserTerminated then
-      FCompiler.CallProc('_CallOnUserTerminate', True);
-    FCompiler.CallProc('_CallOnTerminate', True);
+      FCompiler.CallProc('_CallOnUserTerminate');
+    FCompiler.CallProc('_CallOnTerminate');
   end;
 
   Result := True;
@@ -231,8 +234,6 @@ constructor TSimbaScript.Create(Communication: TSimbaScriptCommunication);
 begin
   inherited Create();
 
-  FState := bTrue;
-
   FSimbaCommunication := Communication;
   FScript := FSimbaCommunication.GetScript(FScriptFileName);
 end;
@@ -241,8 +242,6 @@ constructor TSimbaScript.Create(FileName: String; Communication: TSimbaScriptCom
 begin
   inherited Create();
 
-  FState := bTrue;
-
   FSimbaCommunication := Communication;
 
   FScriptFileName := FileName;
@@ -268,33 +267,36 @@ destructor TSimbaScript.Destroy;
   end;
   if (FSimbaCommunication <> nil) then
     FreeAndNil(FSimbaCommunication);
+  if (FCodeRunner <> nil) then
+    FreeAndNil(FCodeRunner);
 
   inherited Destroy();
 end;
 
 procedure TSimbaScript.SetState(Value: ESimbaScriptState);
 begin
+  if (FCodeRunner = nil) then
+    Exit;
+
   case Value of
     ESimbaScriptState.STATE_RUNNING:
       begin
         FPlugins.CallOnResume();
-        FCompiler.CallProc('_CallOnResume', True);
-
-        FState := bTrue;
+        FCompiler.CallProc('_CallOnResume');
+        FCodeRunner.Resume();
       end;
 
     ESimbaScriptState.STATE_PAUSED:
       begin
-        FState := bUnknown;
-
+        FCodeRunner.Pause();
         FPlugins.CallOnPause();
-        FCompiler.CallProc('_CallOnPause', True);
+        FCompiler.CallProc('_CallOnPause');
       end;
 
     ESimbaScriptState.STATE_STOP:
       begin
         FUserTerminated := True;
-        FState := bFalse;
+        FCodeRunner.Stop();
       end;
   end;
 

Source/script/simba.script_compiler.pas

@@ -49,7 +49,7 @@   TSimbaScript_Compiler = class(TLapeCompiler)
     procedure Import; virtual;
     function Compile: Boolean; override;
 
-    procedure CallProc(ProcName: String; UseFFI: Boolean);
+    procedure CallProc(ProcName: String);
     property ImportingSection: String read GetImportingSection write FImportingSection;
   end;
 
@@ -159,7 +159,7 @@ function TSimbaScript_Compiler.Compile: Boolean;
   Result := inherited Compile();
 end;
 
-procedure TSimbaScript_Compiler.CallProc(ProcName: String; UseFFI: Boolean);
+procedure TSimbaScript_Compiler.CallProc(ProcName: String);
 var
   Method: TLapeGlobalVar;
 begin
@@ -168,16 +168,12 @@ procedure TSimbaScript_Compiler.CallProc(ProcName: String; UseFFI: Boolean);
      (TLapeType_Method(Method.VarType).Res <> nil) or (TLapeType_Method(Method.VarType).Params.Count <> 0) then
     SimbaException('CallProc: Invalid procedure "%s"', [ProcName]);
 
-  if UseFFI then
-  begin
-    with LapeExportWrapper(Method) do
-    try
-      TProcedure(Func)();
-    finally
-      Free();
-    end;
-  end else
-    RunCode(FEmitter, [], PCodePos(Method.Ptr)^);
+  with TLapeCodeRunner.Create(Emitter) do
+  try
+    Run([], PCodePos(Method.Ptr)^);
+  finally
+    Free();
+  end;
 end;
 
 function TSimbaScript_Compiler.GetImportingSection: String;
@@ -294,23 +290,23 @@ procedure TSimbaScript_Compiler.InitBaseString;
 
   addGlobalFunc('function CompareStr(s1, s2: string): Int32;', @_LapeCompareStr);
   addGlobalFunc('function CompareText(s1, s2: string): Int32;', @_LapeCompareText);
-  addGlobalFunc('function SameText(s1, s2: string): EvalBool;', @_LapeSameText);
+  addGlobalFunc('function SameText(s1, s2: string): Boolean;', @_LapeSameText);
 
   // Uses current user locale
   addGlobalFunc('function AnsiUpperCase(s: string): string;', @_LapeAnsiUpperCase);
   addGlobalFunc('function AnsiLowerCase(s: string): string;', @_LapeAnsiLowerCase);
   addGlobalFunc('function AnsiCompareStr(s1, s2: string): Int32;', @_LapeAnsiCompareStr);
   addGlobalFunc('function AnsiCompareText(s1, s2: string): Int32;', @_LapeAnsiCompareText);
-  addGlobalFunc('function AnsiSameText(s1,s2: string): EvalBool;', @_LapeAnsiSameText);
-  addGlobalFunc('function AnsiSameStr(s1,s2: string): EvalBool;', @_LapeAnsiSameStr);
+  addGlobalFunc('function AnsiSameText(s1,s2: string): Boolean;', @_LapeAnsiSameText);
+  addGlobalFunc('function AnsiSameStr(s1,s2: string): Boolean;', @_LapeAnsiSameStr);
 
   // Uses current user locale
   addGlobalFunc('function WideUpperCase(s: WideString): WideString;', @_LapeWideUpperCase);
   addGlobalFunc('function WideLowerCase(s: WideString): WideString;', @_LapeWideLowerCase);
   addGlobalFunc('function WideCompareStr(s1, s2: WideString): Int32;', @_LapeWideCompareStr);
   addGlobalFunc('function WideCompareText(s1, s2: WideString): Int32;', @_LapeWideCompareText);
-  addGlobalFunc('function WideSameText(s1,s2: WideString): EvalBool;', @_LapeWideSameText);
-  addGlobalFunc('function WideSameStr(s1,s2: WideString): EvalBool;', @_LapeWideSameStr);
+  addGlobalFunc('function WideSameText(s1,s2: WideString): Boolean;', @_LapeWideSameText);
+  addGlobalFunc('function WideSameStr(s1,s2: WideString): Boolean;', @_LapeWideSameStr);
   addGlobalFunc('function WideFormat(Fmt: WideString; Args: array of Variant): WideString;', @_LapeWideFormat);
 
   addGlobalFunc('function Pos(Substr, Source: AnsiString): SizeInt; overload;', @_LapePosA);
@@ -342,10 +338,10 @@ procedure TSimbaScript_Compiler.InitBaseString;
   addGlobalFunc('function StrToFloat(s: string; Def: Double): Double; overload;', @_LapeStrToFloatDef);
   addGlobalFunc('function StrToCurr(s: string): Currency; overload;', @_LapeStrToCurr);
   addGlobalFunc('function StrToCurr(s: string; Def: Currency): Currency; overload;', @_LapeStrToCurrDef);
-  addGlobalFunc('function StrToBool(s: string): EvalBool; overload;', @_LapeStrToBool);
-  addGlobalFunc('function StrToBool(s: string; Default: EvalBool): EvalBool; overload;', @_LapeStrToBoolDef);
+  addGlobalFunc('function StrToBool(s: string): Boolean; overload;', @_LapeStrToBool);
+  addGlobalFunc('function StrToBool(s: string; Default: Boolean): Boolean; overload;', @_LapeStrToBoolDef);
 
-  addGlobalFunc('function BoolToStr(B: EvalBool; TrueS: string = ''True''; FalseS: string = ''False''): string;', @_LapeBoolToStr);
+  addGlobalFunc('function BoolToStr(B: Boolean; TrueS: string = ''True''; FalseS: string = ''False''): string;', @_LapeBoolToStr);
   addGlobalFunc('function FloatToStr(f: Double): string;', @_LapeToString_Double);
   addGlobalFunc('function CurrToStr(Value: Currency): string;', @_LapeToString_Currency);