+ add new methods AsUnicodeString and AsAnsiString which are internally used by AsString depending on the type of String

git-svn-id: trunk@37092 -

packages/rtl-objpas/src/inc/rtti.pp

@@ -93,7 +93,9 @@ type
     generic class function From<T>(constref aValue: T): TValue; static; inline;
 {$endif}
     function IsArray: boolean; inline;
-    function AsString: string;
+    function AsString: string; inline;
+    function AsUnicodeString: UnicodeString;
+    function AsAnsiString: AnsiString;
     function AsExtended: Extended;
     function IsClass: boolean; inline;
     function AsClass: TClass;
@@ -834,15 +836,46 @@ begin
 end;
 
 function TValue.AsString: string;
+begin
+  if System.GetTypeKind(String) = tkUString then
+    Result := String(AsUnicodeString)
+  else
+    Result := String(AsAnsiString);
+end;
+
+function TValue.AsUnicodeString: UnicodeString;
+begin
+  if (Kind in [tkSString, tkAString, tkUString, tkWString]) and not Assigned(FData.FValueData) then
+    Result := ''
+  else
+    case Kind of
+      tkSString:
+        Result := UnicodeString(PShortString(FData.FValueData.GetReferenceToRawData)^);
+      tkAString:
+        Result := UnicodeString(PAnsiString(FData.FValueData.GetReferenceToRawData)^);
+      tkWString:
+        Result := UnicodeString(PWideString(FData.FValueData.GetReferenceToRawData)^);
+      tkUString:
+        Result := UnicodeString(PUnicodeString(FData.FValueData.GetReferenceToRawData)^);
+    else
+      raise EInvalidCast.Create(SErrInvalidTypecast);
+    end;
+end;
+
+function TValue.AsAnsiString: AnsiString;
 begin
   if (Kind in [tkSString, tkAString, tkUString, tkWString]) and not Assigned(FData.FValueData) then
     Result := ''
   else
     case Kind of
       tkSString:
-        Result := PShortString(FData.FValueData.GetReferenceToRawData)^;
+        Result := AnsiString(PShortString(FData.FValueData.GetReferenceToRawData)^);
       tkAString:
-        Result := PAnsiString(FData.FValueData.GetReferenceToRawData)^;
+        Result := AnsiString(PAnsiString(FData.FValueData.GetReferenceToRawData)^);
+      tkWString:
+        Result := AnsiString(PWideString(FData.FValueData.GetReferenceToRawData)^);
+      tkUString:
+        Result := AnsiString(PUnicodeString(FData.FValueData.GetReferenceToRawData)^);
     else
       raise EInvalidCast.Create(SErrInvalidTypecast);
     end;