paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 12:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

compiler: revert r19358. As stated by Florian, compiler should be able to compile with the latest RTL.

Browse Source 
git-svn-id: trunk@19360 -
This commit is contained in:
paul 2011-10-04 10:12:49 +00:00
parent 9e74315d18
commit e0fecf5332
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/defcmp.pas
View File

@ -355,7 +355,7 @@ implementation
(tstringdef(def_from).stringtype=st_ansistring) then
begin
if (tstringdef(def_from).encoding=tstringdef(def_to).encoding) or
(tstringdef(def_to).encoding=System.CP_NONE) then
(tstringdef(def_to).encoding=globals.CP_NONE) then
begin
//doconv := tc_string_2_string;
eq:=te_equal;
@ -363,7 +363,7 @@ implementation
else
begin
doconv := tc_string_2_string;
if (tstringdef(def_to).encoding=System.CP_UTF8) then
if (tstringdef(def_to).encoding=globals.CP_UTF8) then
eq:=te_convert_l1
else
eq:=te_convert_l2;
@ -1810,8 +1810,8 @@ implementation
is_ansistring(currpara1.vardef) and
is_ansistring(currpara2.vardef) and
(tstringdef(currpara1.vardef).encoding<>tstringdef(currpara2.vardef).encoding) and
((tstringdef(currpara1.vardef).encoding=System.CP_NONE) or
(tstringdef(currpara2.vardef).encoding=System.CP_NONE)
((tstringdef(currpara1.vardef).encoding=globals.CP_NONE) or
(tstringdef(currpara2.vardef).encoding=globals.CP_NONE)
) then
eq:=te_convert_l1;
if eq<lowesteq then

4
compiler/globals.pas
View File

@ -103,6 +103,10 @@ interface
MathPiExtended : textendedrec = (bytes : (64,0,201,15,218,162,33,104,194,53));
{$endif FPC_LITTLE_ENDIAN}
{$endif}
CP_UTF8 = 65001;
CP_UTF16 = 1200;
CP_NONE = 65535;
type
{ this is written to ppus during token recording for generics so it must be packed }

4
compiler/htypechk.pas
View File

@ -2418,8 +2418,8 @@ implementation
is_ansistring(currpara.vardef) and
is_ansistring(currpt.left.resultdef) and
(tstringdef(currpara.vardef).encoding<>tstringdef(currpt.left.resultdef).encoding) and
((tstringdef(currpara.vardef).encoding=System.CP_NONE) or
(tstringdef(currpt.left.resultdef).encoding=System.CP_NONE)
((tstringdef(currpara.vardef).encoding=globals.CP_NONE) or
(tstringdef(currpt.left.resultdef).encoding=globals.CP_NONE)
) then
eq:=te_convert_l1
else

2
compiler/ncnv.pas
View File

@ -1135,7 +1135,7 @@ implementation
if (left.nodetype=stringconstn) and
((tstringdef(resultdef).stringtype=st_shortstring) or
((tstringdef(resultdef).stringtype=st_ansistring) and
(tstringdef(resultdef).encoding<>System.CP_NONE)
(tstringdef(resultdef).encoding<>CP_NONE)
)
) and
((tstringdef(left.resultdef).stringtype in [st_unicodestring,st_widestring]) and