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

Timestamp:

Dec 1, 2006, 10:21:43 PM (19 years ago)

Author:

cinc

Message:

Remove warnings when calling inherited methods. Fixed a parameter bug for inherited methods.

File:

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

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

@@ -972 +972 @@
 }
 
+
 /*
   This function puts out something like the following in the *.h file:
 
-  #define WPFolder_wpEchoString() \
-          WPObject_wpEchoString()
+  #define WPFolder_wpEchoString(nomSelf, a, b, ...) \
+          WPObject_wpEchoString((WPObject*) nomSelf, a, b, ...)
 */
 static void
@@ -1002 +1003 @@
            overriden. */
         if(!strcmp(overridenMethodName, IDL_IDENT(IDL_OP_DCL(curop).ident).str)){
-          fprintf(ioi->of, "#define %s_%s() \\\n        %s_%s()\n",
-                  realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str,
-                  id, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          IDL_tree  sub;
+
+          //fprintf(ioi->of, "#define %s_%s() \\\n        %s_%s()\n",
+          //      realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str,
+          //      id, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          fprintf(ioi->of, "#define %s_%s(nomSelf, ",
+                  realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          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);
+          }
+          fprintf(ioi->of, "ev) \\\n");
+          fprintf(ioi->of, "        %s_%s((%s*) nomSelf, ",
+                  id, IDL_IDENT(IDL_OP_DCL(curop).ident).str, id);
+          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);
+          }
+          fprintf(ioi->of, "ev)\n");
         }
         break;
@@ -1135 +1152 @@
 }
 
-
 static void
 ch_output_stub_protos(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
@@ -1198 +1214 @@
               VoyagerOutputClassDataStructMember(ci->fh, cur, "");
               fprintf(ci->fh, ";\n");
-            }
-          else
-            {
-#if 0
-              /* FIXME:
-                 This is only a debug method to be thrown out... */
-              fprintf(ci->fh, "/* DEBUG: Overriden method ");
-              fprintf(ci->fh, "%s, %s, %s: %d */\n", IDL_IDENT (IDL_OP_DCL (cur).ident).str,
-                      __FILE__, __FUNCTION__, __LINE__);
-#endif
             }
           break;
@@ -1247 +1253 @@
       fprintf(ci->fh, "} %sClassData;\n\n", id);
       
-      /***** Print introduced method for possible postprocessing ***/
+
+      /******* Print introduced method for possible postprocessing *******/
       for(sub = IDL_INTERFACE(tree).body; sub; sub = IDL_LIST(sub).next) {
         IDL_tree cur;
@@ -1272 +1279 @@
       }/* for */
       fprintf(ci->fh, "\n");
-      /***** Print introduced method for possible postprocessing ***/
-
-      /***** Output overriden methods ***/
+      /******* Print introduced method for possible postprocessing *******/
+
+      /******* Output overriden methods *******/
       for(sub = IDL_INTERFACE(tree).body; sub; sub = IDL_LIST(sub).next) {
         IDL_tree cur;
@@ -1290 +1297 @@
                 /* There's an overriden method here */
                 *ptr='\0';
+                fprintf(ci->fh, "/* %s, %s line %d */\n", __FILE__, __FUNCTION__, __LINE__);
                 fprintf(ci->fh, "/* OVERRIDE_METHOD: ");
                 fprintf(ci->fh, "%s %s */\n", IDL_IDENT (IDL_OP_DCL (cur).ident).str, id );
@@ -1295 +1303 @@
                 fprintf(ci->fh, "#undef %s_%s\n", id, IDL_IDENT (IDL_OP_DCL (cur).ident).str);
                 fprintf(ci->fh, "#endif\n");
+
                 /* Try to find the interface introducing this method */
 
@@ -1303 +1312 @@
                   ioi.realif = tree;
                   ioi.chrOverridenMethodName=IDL_IDENT (IDL_OP_DCL (cur).ident).str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tree).inheritance_spec, (GFunc)VoyagerOutputOverridenMethod, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tree).inheritance_spec,
+                                            (GFunc)VoyagerOutputOverridenMethod, &ioi);
                 }
                 *ptr='_';
@@ -1314 +1324 @@
       }/* for */
       fprintf(ci->fh, "\n");
-      /***** Output overriden methods ***/
+      /******* Output overriden methods *******/
 
       /* */
@@ -1325 +1335 @@
 }
 
+/*
+  This function writes the params of methods. The typespec is not written.
+  This function is useful for putting parameters into macros.
+ */
+static void
+VoyagerOutputMethodParamsNoTypeSpec(FILE  *of, IDL_tree tree, const char *nom_prefix)
+{
+        IDL_tree curitem;
+
+    g_assert (IDL_NODE_TYPE(tree) == IDLN_OP_DCL);
+
+    /* add the parms */
+    for(curitem = IDL_OP_DCL(tree).parameter_dcls;
+        curitem; curitem = IDL_LIST(curitem).next) {
+      IDL_tree tr;
+
+      tr = IDL_LIST(curitem).data;      
+      /*  Write list of params */
+      if(IDL_NODE_TYPE(tr) == IDLN_PARAM_DCL)
+        {
+          fprintf(of, " %s,", IDL_IDENT(IDL_PARAM_DCL(tr).simple_declarator).str);
+        }
+    }
+    return ;
+}
+
 static void
 ch_output_inherited_protos(IDL_tree curif, InheritedOutputInfo *ioi)
@@ -1342 +1378 @@
     switch(IDL_NODE_TYPE(curop)) {
     case IDLN_OP_DCL:
-      /* Only output methods which are not overriden */
+      /* Only output methods which are not overriden. Overriden methods are also
+         put into the data but they're marked with __OVERRIDE__. */
       if(!strstr(IDL_IDENT (IDL_OP_DCL (curop).ident).str, "__OVERRIDE__"))
         {
           fprintf(ioi->of, "/* %s, %s line %d */\n", __FILE__, __FUNCTION__, __LINE__);
-          fprintf(ioi->of, "#define %s_%s %s_%s\n",
-                  realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str,
-                  id, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          //          fprintf(ioi->of, "#define %s_%s %s_%s\n",
+          //      realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str,
+          //      id, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          fprintf(ioi->of, "#define %s_%s(nomSelf,",realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          VoyagerOutputMethodParamsNoTypeSpec(ioi->of, curop, "");
+          fprintf(ioi->of, " ev) \\\n        %s_%s((%s*) nomSelf,",
+                  id, IDL_IDENT(IDL_OP_DCL(curop).ident).str, id);
+          VoyagerOutputMethodParamsNoTypeSpec(ioi->of, curop, "");
+          fprintf(ioi->of, " ev)\n");
         }
       break;