Changeset 118 for trunk/ORBit2-2.14.0/src/idl-compiler

Timestamp:

Nov 26, 2006, 7:07:59 PM (19 years ago)

Author:

cinc

Message:

Corrected return typespec for overriden methods in *.ih files.

File:

• trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-skelimpl.c (modified) (10 diffs)

trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-skelimpl.c

@@ -55 +55 @@
   char* chrOverridenMethodName;
 } InheritedOutputInfo;
+
+typedef struct {
+  FILE *of;
+  IDL_tree realif;
+  char* chrOverridenMethodName;
+  char* chrClassName;
+} InheritedOutputInfo2;
 
 static const char *passnames[] = {
@@ -223 +230 @@
 }
 
-#if 0
-static
-void VoyagerWriteParamsForParentCall (FILE       *of,
-                                      IDL_tree    op)
-{
-  IDL_tree  sub;
-  
-  g_assert (IDL_NODE_TYPE(op) == IDLN_OP_DCL);
-  
-  fprintf (of, "(nomSelf, ");
-   
-  for (sub = IDL_OP_DCL (op).parameter_dcls; sub; sub = IDL_LIST (sub).next) {
-    IDL_tree parm = IDL_LIST (sub).data;
-    fprintf (of, "/**/ %s, ", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
-  }
-  fprintf (of, " ev)");
-}
-#endif
-
-
 /*
   This function is called for each parent to check if the current parent introduced the
@@ -249 +236 @@
  */
 static
-void VoyagerDoWriteParamsForOverridenMethod(IDL_tree curif, InheritedOutputInfo *ioi)
+void VoyagerDoWriteOverridenMethodDeclaration(IDL_tree curif, InheritedOutputInfo2 *ioi)
 {
   IDL_tree curitem;
@@ -271 +258 @@
           
           g_assert (IDL_NODE_TYPE(curop) == IDLN_OP_DCL);
+
+          /* return typespec */
+          orbit_cbe_write_param_typespec (ioi->of, curop);
+          
+          /* The methodname */
+          fprintf (ioi->of, " %s%s_%s", "NOMLINK impl_",
+                   ioi->chrClassName, overridenMethodName);
+          
+          fprintf (ioi->of, "(%s* nomSelf, ", ioi->chrClassName);
           
           /* Write the params including the typespec */          
@@ -278 +274 @@
             orbit_cbe_write_param_typespec (ioi->of, parm);
             
-            fprintf (ioi->of, " %s,\n", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
+            fprintf (ioi->of, " %s, ", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
           }
         }
@@ -295 +291 @@
 */ 
 static void
-VoyagerWriteParamsForOverridenMethod(FILE       *of,
-                                          IDL_tree    op,
-                                          const char *nom_prefix,
-                                          gboolean    for_epv)
-{
+VoyagerWriteOverridenMethodDeclaration(FILE       *of,
+                                     IDL_tree    op,
+                                     const char *nom_prefix,
+                                     gboolean    for_epv)
+{
+  char     *id;
   char * id2;
   char * ptr;
@@ -305 +302 @@
 
   g_assert (IDL_NODE_TYPE(op) == IDLN_OP_DCL);
+
+  id = IDL_ns_ident_to_qstring (
+                                IDL_IDENT_TO_NS (IDL_INTERFACE (
+                                IDL_get_parent_node (op, IDLN_INTERFACE, NULL)).ident), "_", 0);
 
   id2=g_strdup(IDL_IDENT (IDL_OP_DCL (op).ident).str);
@@ -313 +314 @@
   
   if(IDL_INTERFACE(tmptree).inheritance_spec) {
-    InheritedOutputInfo ioi;
+    InheritedOutputInfo2 ioi;
     
     ioi.of = of;
     ioi.realif = tmptree;
     ioi.chrOverridenMethodName=id2;
-    IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerDoWriteParamsForOverridenMethod, &ioi);
+    ioi.chrClassName=id; /* The current class name. In the called function the parent is searched introducing the method.
+                            When this parent is found, the current class info isn't easy to get again but it's needed. */
+
+    IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerDoWriteOverridenMethodDeclaration, &ioi);
   }
   g_free(id2);
+  g_free(id);
 }
 
@@ -802 +807 @@
 #if USE_LIBIDL_CODE    
             fprintf(ski->of, "static ");
-#else
-            fprintf(ski->of, "NOM_Scope ");
+            fprintf(ski->of, " impl_%s(impl_POA_%s *servant,\n", id, id2);
 #endif
-            orbit_cbe_write_param_typespec(ski->of, ski->tree);
-#if USE_LIBIDL_CODE    
-            fprintf(ski->of, " impl_%s(impl_POA_%s *servant,\n", id, id2);
-#else
-            if(bOverriden)
-              fprintf(ski->of, " NOMLINK impl_%s_%s(%s *nomSelf,\n",
-                      id2, gstr->str, id2);
-            else
-              fprintf(ski->of, " NOMLINK impl_%s_%s(%s *nomSelf,\n",
-                      id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str, id2);
-#endif
+
             /* Output the params */
             if(bOverriden)
               {
-                fprintf(ski->of, "/* Params should end here ... */\n");
+                /* Overriden method */
+                fprintf(ski->of, "NOM_Scope ");
+#if 0
+                fprintf(ski->of, " NOMLINK impl_%s_%s(%s *nomSelf,\n",
+                        id2, gstr->str, id2);
+#endif
                 op = ski->tree;
-                VoyagerWriteParamsForOverridenMethod(ski->of,
-                                                     op,
-                                                     "",
-                                                     FALSE);
+                VoyagerWriteOverridenMethodDeclaration(ski->of,
+                                                       op,
+                                                       "",
+                                                       FALSE);
 
                 for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
@@ -834 +833 @@
             else
               {
+                fprintf(ski->of, "NOM_Scope ");
+
+                orbit_cbe_write_param_typespec(ski->of, ski->tree);
+                fprintf(ski->of, " NOMLINK impl_%s_%s(%s *nomSelf,\n",
+                        id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str, id2);
+
                 op = ski->tree;
                 for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;