Forráskód Böngészése

Move GetToken function to testu unit

git-svn-id: trunk@38684 -
pierre 7 éve
szülő
commit
450f62efcc
2 módosított fájl, 18 hozzáadás és 18 törlés
  1. 0 18
      tests/utils/dotest.pp
  2. 18 0
      tests/utils/testu.pp

+ 0 - 18
tests/utils/dotest.pp

@@ -231,24 +231,6 @@ begin
    ForceExtension:=Copy(Hstr,1,j-1);
 end;
 
-type
-  TCharSet = set of char;
-
-function GetToken(var s: string; Delims: TCharSet = [' ']):string;
-var
-  i : longint;
-  p: PChar;
-begin
-  p:=PChar(s);
-  i:=0;
-  while (p^ <> #0) and not (p^ in Delims) do begin
-    Inc(p);
-    Inc(i);
-  end;
-  GetToken:=Copy(s,1,i);
-  Delete(s,1,i+1);
-end;
-
 procedure mkdirtree(const s:string);
 var
   SErr, hs : string;

+ 18 - 0
tests/utils/testu.pp

@@ -12,6 +12,8 @@ uses
   ---------------------------------------------------------------------}
 
 type
+  TCharSet = set of char;
+
   TVerboseLevel=(V_Abort,V_Error,V_Warning,V_Normal,V_Debug,V_SQL);
 
   TConfig = record
@@ -79,9 +81,25 @@ Function SplitFileExt(const s:string):string;
 Function FileExists (Const F : String) : Boolean;
 Function PathExists (Const F : String) : Boolean;
 Function IsAbsolute (Const F : String) : boolean;
+function GetToken(var s: string; Delims: TCharSet = [' ']):string;
 
 Implementation
 
+function GetToken(var s: string; Delims: TCharSet = [' ']):string;
+var
+  i : longint;
+  p: PChar;
+begin
+  p:=PChar(s);
+  i:=0;
+  while (p^ <> #0) and not (p^ in Delims) do begin
+    Inc(p);
+    Inc(i);
+  end;
+  GetToken:=Copy(s,1,i);
+  Delete(s,1,i+1);
+end;
+
 function SplitPath(const s:string):string;
 var
   i : longint;