Changeset 114 for trunk/ORBit2-2.14.0/src

Timestamp:

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

Author:

cinc

Message:

Makros for calling overriden methods were broken. Parameters were missing

Location:

trunk/ORBit2-2.14.0/src/idl-compiler

Files:

• orbit-idl-c-headers.c (modified) (3 diffs)
• orbit-idl-c-skelimpl.c (modified) (5 diffs)

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

@@ -39 +39 @@
   fprintf(ci->fh, "\n/** typedefs **/\n");
   ch_output_types(tree, rinfo, ci);
-  
+
+#ifdef USE_LIBIDL_CODE  
   if ( ci->do_skel_defs ) {
         /* Do all the POA structures, etc. */
         fprintf(ci->fh, "\n/** POA structures **/\n");
-#ifdef USE_LIBIDL_CODE
         ch_output_poa(tree, rinfo, ci);
-#else
-        fprintf(ci->fh, "  /* POA structures not used in Voyager */\n");
-#endif
-
         fprintf(ci->fh, "\n/** skel prototypes **/\n");
-#ifdef USE_LIBIDL_CODE
         ch_output_skel_protos(tree, rinfo, ci);
-#else
-        fprintf(ci->fh, "  /* skel prototypes not used in Voyager */\n");
-#endif
-  }
+  }
+#endif
+
   fprintf(ci->fh, "\n/** stub prototypes **/\n");
   fprintf(ci->fh, "  /* (%s, %s line %d) */\n", __FILE__, __FUNCTION__, __LINE__);
@@ -107 +101 @@
       id = orbit_cbe_get_typespec_str(tree);
 
-      fprintf(ci->fh, "\n/** Voyager **/\n");
+      fprintf(ci->fh, "\n/** Voyager  (%s: %s line %d) **/\n", __FILE__, __FUNCTION__, __LINE__);
 
       /* C specific class structure */
@@ -125 +119 @@
       fprintf(ci->fh, "\n/*\n * New macro for %s\n */\n", id);
       fprintf(ci->fh, "#define %sNew() \\\n", id);
-      /* Changed for typesafety */
+      /* Changed for typesafetyness */
       fprintf(ci->fh, "        ((%s*)_nomNew((_%s ? _%s : %sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n",
               id, id, id, id, id ,id);

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

@@ -189 +189 @@
 
 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;
+    }
+  }
+}
+
+#if 0
+static
 void VoyagerWriteParamsForParentCall (FILE       *of,
-                                IDL_tree    op)
+                                      IDL_tree    op)
 {
   IDL_tree  sub;
@@ -200 +236 @@
   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, "/**/ %s, ", IDL_IDENT (IDL_PARAM_DCL (parm).simple_declarator).str);
   }
   fprintf (of, " ev)");
 }
+#endif
 
 static void
@@ -697 +734 @@
               fprintf(ski->of, " NOMLINK impl_%s_%s(%s *nomSelf,\n",
                       id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str, id2);
-            // fprintf(ski->of, " NOMLINK %s(%s *nomSelf,\n", IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str, id2);
-#endif
-            
-            op = ski->tree;
-            for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
-                curitem; curitem = IDL_LIST(curitem).next) {
-              subski.tree = IDL_LIST(curitem).data;
-              orbit_cbe_ski_process_piece(&subski);
-            }
+#endif
+            /* Output the params */
+            if(bOverriden)
+              {
+                fprintf(ski->of, "/* Params should end here ... */\n");
+                op = ski->tree;
+                for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
+                    curitem; curitem = IDL_LIST(curitem).next) {
+                  subski.tree = IDL_LIST(curitem).data;
+                  orbit_cbe_ski_process_piece(&subski);
+                }
+              }
+            else
+              {
+                op = ski->tree;
+                for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
+                    curitem; curitem = IDL_LIST(curitem).next) {
+                  subski.tree = IDL_LIST(curitem).data;
+                  orbit_cbe_ski_process_piece(&subski);
+                }
+              }
             
             if(IDL_OP_DCL(op).context_expr)
@@ -747 +796 @@
                   IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerOutputIntroducingClass, &ioi);
                 }
-                fprintf(ski->of, ":%s\";\n",gstr->str);
+                fprintf(ski->of, ":%s\";\n",gstr->str); /* Output the method name */
 
                 fprintf(ski->of, "/* %s, %s line %d */\n", __FILE__, __FUNCTION__, __LINE__);
                 fprintf(ski->of, "static nomMethodProc* %s_parent_resolved;\n", id);
                 fprintf(ski->of, "#define %s_parent", id);
+
                 /* output params for macro */
-                VoyagerWriteParamsForParentCall (ski->of, ski->tree );
+                fprintf(ski->of, "(nomSelf, ");
+                if(IDL_INTERFACE(tmptree).inheritance_spec) {
+                  InheritedOutputInfo ioi;
+
+                  ioi.of = ski->of;
+                  ioi.realif = tmptree;
+                  ioi.chrOverridenMethodName=gstr->str;
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerWriteParamsForParentCall, &ioi);
+                }
+                fprintf(ski->of, "ev)");
                 fprintf(ski->of, " \\\n    (((");
 
@@ -767 +826 @@
                 fprintf(ski->of, ") \\\n    %s_parent_resolved)", id);
                 /* output params for macro */
-                VoyagerWriteParamsForParentCall (ski->of, ski->tree );
+                // VoyagerWriteParamsForParentCall (ski->of, ski->tree );
+                fprintf(ski->of, "(nomSelf, ");
+                if(IDL_INTERFACE(tmptree).inheritance_spec) {
+                  InheritedOutputInfo ioi;
+                  
+                  ioi.of = ski->of;
+                  ioi.realif = tmptree;
+                  ioi.chrOverridenMethodName=gstr->str;
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerWriteParamsForParentCall, &ioi);
+                }
+                fprintf(ski->of, "ev)");
                 fprintf(ski->of, ")\n");
 #if 0