Browse Source

* Rename some identifiers to be more unique. Fixes issue #40915

Michaël Van Canneyt 11 months ago
parent
commit
c0d6efaada

+ 2 - 2
packages/wasm-utils/src/wasm.regexp.objects.pas

@@ -134,7 +134,7 @@ end;
 function TRegexpFlagsHelper.ToString: String;
 
 begin
-  Result:=FlagsToString(AsFlags);
+  Result:=RegexpFlagsToString(AsFlags);
 end;
 
 function TRegexpFlagsHelper.ToFlags: Longint;
@@ -174,7 +174,7 @@ end;
 
 constructor TWasmRegExp.Create(const aExpression, aFlags: String);
 begin
-  Create(aExpression,StringToFlags(aFlags,False));
+  Create(aExpression,StringToRegexpFlags(aFlags,False));
 end;
 
 constructor TWasmRegExp.Create(const aExpression: String; aFlags: Longint);

+ 4 - 4
packages/wasm-utils/src/wasm.regexp.shared.pas

@@ -59,8 +59,8 @@ Const
   regexpFN_GetIndexes = 'get_indexes';
   regexpFN_GetNamedGroupIndexes = 'get_named_group_indexes';
 
-Function StringToFlags(S : String; IgnoreUnknown : Boolean = True) : Longint;
-Function FlagsToString(S : Longint) : String;
+Function StringToRegexpFlags(const S : String; IgnoreUnknown : Boolean = True) : Longint;
+Function RegexpFlagsToString(S : Longint) : String;
 
 implementation
 
@@ -72,7 +72,7 @@ uses
 {$ENDIF}
 
 
-Function StringToFlags(S : String; IgnoreUnknown : Boolean = True) : Longint;
+Function StringToRegexpFlags(const S : String; IgnoreUnknown : Boolean = True) : Longint;
 
 var
   C : Char;
@@ -100,7 +100,7 @@ begin
    end;
 end;
 
-Function FlagsToString(S : Longint) : String;
+Function RegexpFlagsToString(S : Longint) : String;
 
 var
   C,I : Longint;

+ 0 - 1
packages/wasm-utils/src/wasm.websocket.shared.pas

@@ -28,7 +28,6 @@ uses
 Type
   TWasmWebsocketResult = longint;
   TWasmWebsocketID = longint;
-  TBuffer = longint;
   TWasmWebSocketMessageType = Longint;
   TWebsocketCallBackResult = Longint;