merge r14133 from cpstrnew branch by paul except ptconst.pas which has a difficult merge conflict (code moved to another unit which is not at the branch during the revision):

make AnsiStr concatenation and copy work

git-svn-id: trunk@19094 -

compiler/symdef.pas

@@ -1447,6 +1447,7 @@ implementation
       begin
          inherited create(stringdef);
          stringtype:=st_ansistring;
+         encoding:=65535;
          len:=-1;
          savesize:=sizeof(pint);
       end;
@@ -1466,6 +1467,7 @@ implementation
       begin
          inherited create(stringdef);
          stringtype:=st_widestring;
+         encoding:=CP_UTF16;
          len:=-1;
          savesize:=sizeof(pint);
       end;

rtl/inc/astrings.inc

@@ -208,11 +208,30 @@ end;
 
 {$else STR_CONCAT_PROCS}
 
-procedure fpc_AnsiStr_Concat (var DestS:ansistring;const S1,S2 : AnsiString); compilerproc;
+procedure fpc_AnsiStr_Concat (var DestS:RawByteString;const S1,S2 : RawByteString); compilerproc;
 Var
   Size,Location : SizeInt;
   same : boolean;
+  S1CP, S2CP, DestCP: TSystemCodePage;
+  U: UnicodeString;
 begin
+  { if codepages are differ then concat using unicodestring }
+  S1CP:=StringCodePage(S1);
+  if S1CP=$ffff then
+    S1CP:=DefaultSystemCodePage;
+  S2CP:=StringCodePage(S2);
+  if S2CP=$ffff then
+    S2CP:=DefaultSystemCodePage;
+  DestCP:=StringCodePage(DestS);
+  if DestCP=$ffff then
+    DestCP:=DefaultSystemCodePage;
+  if (S1CP<>DestCP) or (S2CP<>DestCP) then
+    begin
+      U:=UnicodeString(S1)+UnicodeString(S2);
+      DestS:='';
+      widestringmanager.Unicode2AnsiMoveProc(PUnicodeChar(Pointer(U)),DestS,DestCP,Length(U));
+      exit;
+    end;
   { only assign if s1 or s2 is empty }
   if (S1='') then
     begin
@@ -681,6 +700,7 @@ begin
   SNew:=NewAnsiString (L);
   Move (Pointer(S)^,SNew^,L+1);
   PAnsiRec(SNew-AnsiFirstOff)^.len:=L;
+  PAnsiRec(SNew-AnsiFirstOff)^.CodePage:=PAnsiRec(Pointer(S)-AnsiFirstOff)^.CodePage;
   fpc_ansistr_decr_ref (Pointer(S));  { Thread safe }
   pointer(S):=SNew;
   pointer(result):=SNew;
@@ -746,7 +766,7 @@ begin
      move(S[1],(pointer(S)+ofs)^,strlength+1)
 end;
 
-Function Fpc_Ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc;
+Function Fpc_Ansistr_Copy (Const S : RawByteString; Index,Size : SizeInt) : AnsiString;compilerproc;
 var
   ResultAddress : Pointer;
 begin
@@ -767,8 +787,9 @@ begin
      if ResultAddress<>Nil then
       begin
         Move (Pointer(Pointer(S)+index)^,ResultAddress^,Size);
-        PAnsiRec(ResultAddress-AnsiFirstOff)^.Len:=Size;
         PByte(ResultAddress+Size)^:=0;
+        PAnsiRec(ResultAddress-AnsiFirstOff)^.Len:=Size;
+        PAnsiRec(ResultAddress-AnsiFirstOff)^.CodePage:=PAnsiRec(Pointer(S)-AnsiFirstOff)^.CodePage;
       end;
    end;
    fpc_ansistr_decr_ref(Pointer(fpc_ansistr_copy));

rtl/inc/compproc.inc

@@ -249,7 +249,7 @@ Procedure fpc_ansistr_decr_ref (Var S : Pointer); compilerproc;
 Procedure fpc_ansistr_incr_ref (S : Pointer); compilerproc;
 Procedure fpc_AnsiStr_Assign (Var DestS : Pointer;S2 : Pointer); compilerproc;
 {$ifdef STR_CONCAT_PROCS}
-Procedure fpc_AnsiStr_Concat (Var DestS : Ansistring;const S1,S2 : AnsiString); compilerproc;
+Procedure fpc_AnsiStr_Concat (Var DestS : RawByteString;const S1,S2 : RawByteString); compilerproc;
 Procedure fpc_AnsiStr_Concat_multi (Var DestS : Ansistring;const sarr:array of Ansistring); compilerproc;
 {$else STR_CONCAT_PROCS}
 function fpc_AnsiStr_Concat (const S1,S2 : AnsiString): AnsiString; compilerproc;
@@ -288,7 +288,7 @@ Procedure fpc_AnsiStr_CheckRange(p : Pointer; index : SizeInt); compilerproc;
 {$endif VER2_4}
 
 Procedure fpc_AnsiStr_SetLength (Var S : RawByteString; l : SizeInt); compilerproc;
-Function  fpc_ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc;
+Function  fpc_ansistr_Copy (Const S : RawByteString; Index,Size : SizeInt) : AnsiString;compilerproc;
 {$ifdef EXTRAANSISHORT}
 Function fpc_AnsiStr_ShortStr_Compare (Var S1 : Pointer; Var S2 : ShortString): SizeInt; compilerproc;
 {$endif EXTRAANSISHORT}

tests/test/tcpstr6.pp

@@ -1,3 +1,4 @@
+{$CODEPAGE cp1251}
 // file encoding is cp1251
 type
   Cp866String = string<866>;