Bläddra i källkod

compiler: remove CP_xxx constants since they are present in the system unit now

git-svn-id: trunk@19358 -
paul 14 år sedan
förälder
incheckning
ee2e0a0c1d
4 ändrade filer med 7 tillägg och 11 borttagningar
  1. 4 4
      compiler/defcmp.pas
  2. 0 4
      compiler/globals.pas
  3. 2 2
      compiler/htypechk.pas
  4. 1 1
      compiler/ncnv.pas

+ 4 - 4
compiler/defcmp.pas

@@ -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=globals.CP_NONE) then
+                           (tstringdef(def_to).encoding=System.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=globals.CP_UTF8) then 
+                           if (tstringdef(def_to).encoding=System.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=globals.CP_NONE) or
-                  (tstringdef(currpara2.vardef).encoding=globals.CP_NONE)
+                 ((tstringdef(currpara1.vardef).encoding=System.CP_NONE) or
+                  (tstringdef(currpara2.vardef).encoding=System.CP_NONE)
                  ) then
                 eq:=te_convert_l1;
               if eq<lowesteq then

+ 0 - 4
compiler/globals.pas

@@ -103,10 +103,6 @@ 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 }

+ 2 - 2
compiler/htypechk.pas

@@ -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=globals.CP_NONE) or
-                     (tstringdef(currpt.left.resultdef).encoding=globals.CP_NONE)
+                    ((tstringdef(currpara.vardef).encoding=System.CP_NONE) or
+                     (tstringdef(currpt.left.resultdef).encoding=System.CP_NONE)
                     ) then
                    eq:=te_convert_l1
                  else

+ 1 - 1
compiler/ncnv.pas

@@ -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<>CP_NONE)
+             (tstringdef(resultdef).encoding<>System.CP_NONE)
             )
            ) and
            ((tstringdef(left.resultdef).stringtype in [st_unicodestring,st_widestring]) and