Skip to content

Commit 2c39d27

Browse files
committed
Update lape + mORMot mm
1 parent 8b13b3d commit 2c39d27

File tree

4 files changed

+107
-69
lines changed

4 files changed

+107
-69
lines changed

Source/script/imports/simba.import_target.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ procedure ImportTarget(Script: TSimbaScript);
12431243
addGlobalFunc('function TTarget.KeyCodeFromChar(C: Char): EKeyCode', @_LapeTarget_KeyCodeFromChar);
12441244

12451245
// FINDER
1246-
addGlobalFunc('function TTarget.MatchColor(Color: TColor; ColorSpace: EColorSpace; Multipliers: TChannelMultipliers; Bounds: TBox= [-1,-1,-1,-1]): TSingleMatrix;', @_LapeTarget_MatchColor);
1246+
addGlobalFunc('function TTarget.MatchColor(Color: TColor; ColorSpace: EColorSpace; Multipliers: TChannelMultipliers; Bounds: TBox = [-1,-1,-1,-1]): TSingleMatrix;', @_LapeTarget_MatchColor);
12471247

12481248
addGlobalFunc('function TTarget.FindColor(Color: TColor; Tolerance: Single; Bounds: TBox = [-1,-1,-1,-1]): TPointArray; overload', @_LapeTarget_FindColor1);
12491249
addGlobalFunc('function TTarget.FindColor(Color: TColorTolerance; Bounds: TBox = [-1,-1,-1,-1]): TPointArray; overload', @_LapeTarget_FindColor3);

Source/script/simba.script_genericbase.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ procedure TLapeMethodBuilder.Build(DoReset: Boolean);
105105
OldState := getTempTokenizerState(FuncBody, '!' + FObjectType.ClassName + '::' + FuncName);
106106
Options := [lcoShortCircuit, lcoAlwaysInitialize, lcoLooseSyntax, lcoRangeCheck];
107107

108-
IncStackInfo();
108+
IncStackInfo([]);
109109
try
110110
if (FuncHeader is TLapeType_MethodOfType) then
111111
FStackInfo.addSelfVar(TLapeType_MethodOfType(FuncHeader).SelfParam, TLapeType_MethodOfType(FuncHeader).ObjectType);
@@ -120,7 +120,7 @@ procedure TLapeMethodBuilder.Build(DoReset: Boolean);
120120
CheckAfterCompile();
121121
addDelayedExpression(Result, True, True);
122122
finally
123-
DecStackInfo(True, False, (Result = nil));
123+
DecStackInfo([lsfFunction], Result = nil);
124124
end;
125125

126126
resetTokenizerState(OldState);

0 commit comments

Comments
 (0)