Changeset 115 for trunk/ORBit2-2.14.0/src

Timestamp:

Nov 26, 2006, 3:23:22 PM (19 years ago)

Author:

cinc

Message:

Fixed missing parameters in parent method calls of method templates

File:

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

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

@@ -59 +59 @@
 }
 
+static
+void VoyagerWriteParamsForParentCall(IDL_tree curif, InheritedOutputInfo *ioi)
+{
+  IDL_tree curitem;
+  char* overridenMethodName;
+
+  if(curif == ioi->realif)
+    return;
+
+  overridenMethodName=ioi->chrOverridenMethodName;
+
+  for(curitem = IDL_INTERFACE(curif).body; curitem; curitem = IDL_LIST(curitem).next) {
+    IDL_tree curop = IDL_LIST(curitem).data;
+
+    switch(IDL_NODE_TYPE(curop)) {
+    case IDLN_OP_DCL:
+      {
+        /* Check if the current method (introduced by some parent) is the one to be
+           overriden. */
+        if(!strcmp(overridenMethodName, IDL_IDENT(IDL_OP_DCL(curop).ident).str)){
+          IDL_tree  sub;
+
+          for (sub = IDL_OP_DCL (curop).parameter_dcls; sub; sub = IDL_LIST (sub).next) {
+            IDL_tree parm = IDL_LIST (sub).data;
+            fprintf (ioi->of, "%s, ", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
+          }
+        }
+        break;
+      }
+        default:
+          break;
+    }
+  }
+}
 
 void
@@ -70 +104 @@
   char * id2;
   char * ptr;
-  
+  IDL_tree tmptree;
+
   g_assert (IDL_NODE_TYPE(op) == IDLN_OP_DCL);
   
@@ -86 +121 @@
                          id, id2);
 
-    g_free(id2);
-
-
         fprintf (of, "(");
-
-    fprintf (of, "nomSelf, ", id);
-
-        g_free (id);
-
+    fprintf (of, "nomSelf, ");
+
+
+    tmptree = IDL_get_parent_node(op, IDLN_INTERFACE, NULL);
+
+    if(IDL_INTERFACE(tmptree).inheritance_spec) {
+      InheritedOutputInfo ioi;
+      
+      ioi.of = of;
+      ioi.realif = tmptree;
+      ioi.chrOverridenMethodName=id2;
+      IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerWriteParamsForParentCall, &ioi);
+    }
+
+#if 0
         for (sub = IDL_OP_DCL (op).parameter_dcls; sub; sub = IDL_LIST (sub).next) {
                 IDL_tree parm = IDL_LIST (sub).data;
@@ -101 +143 @@
                 fprintf (of, " %s, ", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
         }
-
+#endif
+    g_free(id2);
+        g_free (id);
         fprintf (of, " ev);\n");
 }
@@ -181 +225 @@
         fprintf (of, "}\n");
 #else
+    /* This is Voyager stuff... */
     if(strstr(opname, NOM_INSTANCEVAR_STRING)==NULL &&
        strstr(opname, NOM_OVERRIDE_STRING)==NULL)
@@ -230 +275 @@
 
         fprintf (of, "#endif\n");
-        //        fprintf(of, "/*  %s_%s_parent_resolved()*/\n",
-        //      realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
-
 #if 0
         /* Inherited */