* o2s -> ord2str, s2o -> str2ord

git-svn-id: branches/fpc_2_3@6572 -

compiler/ncgld.pas

@@ -1062,10 +1062,10 @@ implementation
         case rttidatatype of
           rdt_normal:
             location.reference.symbol:=RTTIWriter.get_rtti_label(rttidef,rttitype);
-          rdt_o2s:
-            location.reference.symbol:=RTTIWriter.get_rtti_label_o2s(rttidef,rttitype);
-          rdt_s2o:
-            location.reference.symbol:=RTTIWriter.get_rtti_label_s2o(rttidef,rttitype);
+          rdt_ord2str:
+            location.reference.symbol:=RTTIWriter.get_rtti_label_ord2str(rttidef,rttitype);
+          rdt_str2ord:
+            location.reference.symbol:=RTTIWriter.get_rtti_label_str2ord(rttidef,rttitype);
         end;
       end;
 

compiler/ncgrtti.pas

@@ -51,8 +51,8 @@ interface
       public
         procedure write_rtti(def:tdef;rt:trttitype);
         function  get_rtti_label(def:tdef;rt:trttitype):tasmsymbol;
-        function  get_rtti_label_o2s(def:tdef;rt:trttitype):tasmsymbol;
-        function  get_rtti_label_s2o(def:tdef;rt:trttitype):tasmsymbol;
+        function  get_rtti_label_ord2str(def:tdef;rt:trttitype):tasmsymbol;
+        function  get_rtti_label_str2ord(def:tdef;rt:trttitype):tasmsymbol;
       end;
 
     var
@@ -1114,12 +1114,12 @@ implementation
         result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt));
       end;
 
-    function TRTTIWriter.get_rtti_label_o2s(def:tdef;rt:trttitype):tasmsymbol;
+    function TRTTIWriter.get_rtti_label_ord2str(def:tdef;rt:trttitype):tasmsymbol;
       begin
         result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_o2s');
       end;
 
-    function TRTTIWriter.get_rtti_label_s2o(def:tdef;rt:trttitype):tasmsymbol;
+    function TRTTIWriter.get_rtti_label_str2ord(def:tdef;rt:trttitype):tasmsymbol;
       begin
         result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_s2o');
       end;

compiler/ninl.pas

@@ -260,7 +260,7 @@ implementation
             {Insert a reference to the typinfo.}
             newparas.right:=Ccallparanode.create(
               Caddrnode.create_internal(
-                Crttinode.create(Tenumdef(source.left.resultdef),fullrtti,rdt_o2s)
+                Crttinode.create(Tenumdef(source.left.resultdef),fullrtti,rdt_ord2str)
               ),
               newparas.right);
             {Insert a type conversion from the enumeration to longint.}
@@ -588,7 +588,7 @@ implementation
                       {Insert a reference to the typinfo.}
                       indexpara:=Ccallparanode.create(
                         Caddrnode.create_internal(
-                         Crttinode.create(Tenumdef(para.left.resultdef),fullrtti,rdt_o2s)
+                         Crttinode.create(Tenumdef(para.left.resultdef),fullrtti,rdt_ord2str)
                         ),
                         indexpara);
                       {Insert a type conversion to to convert the enum to longint.}
@@ -603,7 +603,7 @@ implementation
                     begin
                       {Insert a reference to the string2ord index.}
                       indexpara:=Ccallparanode.create(Caddrnode.create_internal(
-                        Crttinode.create(Tenumdef(para.left.resultdef),fullrtti,rdt_s2o)
+                        Crttinode.create(Tenumdef(para.left.resultdef),fullrtti,rdt_str2ord)
                       ),nil);
                       {Insert a type conversion to to convert the enum to longint.}
                       para.left:=Ctypeconvnode.create_internal(para.left,s32inttype);
@@ -1137,7 +1137,7 @@ implementation
             begin
               suffix:='enum_';
               sizepara:=Ccallparanode.create(Caddrnode.create_internal(
-                Crttinode.create(Tenumdef(destpara.resultdef),fullrtti,rdt_s2o)
+                Crttinode.create(Tenumdef(destpara.resultdef),fullrtti,rdt_str2ord)
               ),nil);
             end;
         end;

compiler/nld.pas

@@ -33,7 +33,7 @@ interface
        symconst,symbase,symtype,symsym,symdef;
 
     type
-       Trttidatatype=(rdt_normal,rdt_o2s,rdt_s2o);
+       Trttidatatype=(rdt_normal,rdt_ord2str,rdt_str2ord);
 
        tloadnode = class(tunarynode)
        protected