improved TValue conversion of string to other types

Author: sglienke

Source/Base/Spring.pas

@@ -6205,6 +6205,45 @@ procedure MakeDynArray(typeInfo: PTypeInfo; count: NativeInt; var result: TValue
   TValue.MakeWithoutCopy(@p, typeInfo, result);
 end;
 
+function SplitString(const s, delimiter: string): TStringDynArray;
+
+  function ScanChar(const s: string; var index: Integer): Boolean;
+  var
+    level: Integer;
+  begin
+    Result := False;
+    level := 0;
+    while index <= Length(s) do
+    begin
+      case s[index] of
+        '[': Inc(level);
+        ']': Dec(level);
+      else
+        if Copy(s, index, Length(delimiter)) = delimiter then
+          if level = 0 then
+            Exit(True);
+      end;
+      Inc(index);
+      Result := level = 0;
+    end;
+  end;
+
+var
+  startPos, index, len: Integer;
+begin
+  Result := nil;
+  startPos := 1;
+  index := 1;
+  while ScanChar(s, index) do
+  begin
+    len := Length(Result);
+    SetLength(Result, len + 1);
+    Result[len] := Copy(s, startPos, index - startPos);
+    Inc(index);
+    startPos := index;
+  end;
+end;
+
 function ConvStr2DynArray(const source: TValue; target: PTypeInfo;
   out value: TValue; const formatSettings: TFormatSettings): Boolean;
 var
@@ -6222,7 +6261,16 @@ function ConvStr2DynArray(const source: TValue; target: PTypeInfo;
   elType := target.TypeData.DynArrElType^;
   for i := 0 to High(values) do
   begin
-    v1 := TValue.From(Trim(values[i]));
+    case elType.Kind of
+      tkString, tkLString, tkWString, tkUString: ;
+      tkChar, tkWChar:
+        if Length(values[i]) > 1 then
+          values[i] := Trim(values[i]);
+    else
+      values[i] := Trim(values[i]);
+    end;
+
+    v1 := TValue.From(values[i]);
     if not v1.TryConvert(elType, v2) then
       Exit(False);
     res.SetArrayElement(i, v2);
@@ -6255,7 +6303,16 @@ function ConvStr2Array(const source: TValue; target: PTypeInfo;
   TValue.Make(nil, target, res);
   for i := 0 to arrData.ElCount - 1 do
   begin
-    v1 := TValue.From(Trim(values[i]));
+    case elType.Kind of
+      tkString, tkLString, tkWString, tkUString: ;
+      tkChar, tkWChar:
+        if Length(values[i]) > 1 then
+          values[i] := Trim(values[i]);
+    else
+      values[i] := Trim(values[i]);
+    end;
+
+    v1 := TValue.From(values[i]);
     if not v1.TryConvert(elType, v2) then
       Exit(False);
     res.SetArrayElement(i, v2);

Tests/Source/Spring.Testing.pas

@@ -199,6 +199,8 @@ procedure TRttiMethodHelper.ConvertValues(const values: TArray<TValue>;
       value := values[i]
     else
       value := TValue.Empty;
+    if value.IsString and not parameters[i].ParamType.IsString then
+      value := Trim(value.AsString);
     value.TryConvert(parameters[i].ParamType.Handle, arguments[i], ISO8601FormatSettings);
   end;
   retType := ReturnType;
@@ -234,8 +236,48 @@ function IsTestMethod(const method: TRttiMethod;
 {$REGION 'TTestingAttribute'}
 
 constructor TTestingAttribute.Create(const values: string; const delimiter: string);
+
+  function SplitString(const s, delimiter: string): TArray<string>;
+
+    function ScanChar(const s: string; var index: Integer): Boolean;
+    var
+      level: Integer;
+    begin
+      Result := False;
+      level := 0;
+      while index <= Length(s) do
+      begin
+        case s[index] of
+          '[': Inc(level);
+          ']': Dec(level);
+        else
+          if Copy(s, index, Length(delimiter)) = delimiter then
+            if level = 0 then
+              Exit(True);
+        end;
+        Inc(index);
+        Result := level = 0;
+      end;
+    end;
+
+  var
+    startPos, index, len: Integer;
+  begin
+    Result := nil;
+    startPos := 1;
+    index := 1;
+    while ScanChar(s, index) do
+    begin
+      len := Length(Result);
+      SetLength(Result, len + 1);
+      Result[len] := Copy(s, startPos, index - startPos);
+      Inc(index);
+      startPos := index;
+    end;
+  end;
+
 var
-  tempValues: TStringDynArray;
+  tempValues: TArray<string>;
   i: Integer;
 begin
   inherited Create;