Changeset 249

Timestamp:

Mar 11, 2007, 12:49:25 AM (18 years ago)

Author:

cinc

Message:

Provide parameter info for methods for runtime type information.

Location:

trunk/ORBit2-2.14.0/src/idl-compiler

Files:

• orbit-idl-c-backend.h (modified) (1 diff)
• orbit-idl-c-skelimpl.c (modified) (16 diffs)
• orbit-idl-c-utils.c (modified) (1 diff)

trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-backend.h

@@ -77 +77 @@
 gulong orbit_cbe_get_typespec_size(IDL_tree tree);
 
+void orbit_cbe_voyager_write_param_typespec(FILE *of, IDL_tree tree);
 #endif

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

@@ -22 +22 @@
 
 /* Used to count the static methods of a class. This is kind of a hack.
-   I would loce to put it into CBESkelImplInfo but his struct is copied
+   I would love to put it into CBESkelImplInfo but his struct is copied
    everywhere and given as a copy to subprocedures. */ 
 static gulong ulNumStaticMethods[10]; 
@@ -292 +292 @@
 */ 
 static void
-VoyagerWriteOverridenMethodDeclaration(FILE       *of,
-                                     IDL_tree    op,
+VoyagerWriteOverridenMethodDeclaration(FILE       *of, IDL_tree    op,
                                      const char *nom_prefix,
                                      gboolean    for_epv)
@@ -365 +364 @@
 }
 
+/*
+  This function outputs the parameter type of methods without the 'const'
+  qualifier.
+ */
+static void VoyagerOutputParamTypes(CBESkelImplInfo *ski)
+{
+  if(IDLN_PARAM_DCL!=IDL_NODE_TYPE(ski->tree))
+    return;
+
+  orbit_cbe_voyager_write_param_typespec(ski->of, ski->tree);
+  
+}
 
 static void
@@ -385 +396 @@
         case IDLN_INTERFACE:
                 cbe_ski_do_interface(ski);
-#if 0
-        if(whichPass==ski->pass)
-          ulCurInterface++;
-        else{
-          whichPass=ski->pass;
-          ulCurInterface=0;
-        }
-#endif
         //        printf("%d: pass --->%d %d %d\n", __LINE__, ski->pass, whichPass, ulCurInterface);
                 break;
@@ -818 +821 @@
                 /* 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;
-                VoyagerWriteOverridenMethodDeclaration(ski->of,
-                                                       op,
-                                                       "",
-                                                       FALSE);
+                VoyagerWriteOverridenMethodDeclaration(ski->of, op, "", FALSE);
 
                 for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
@@ -888 +884 @@
                   ioi.realif = tmptree;
                   ioi.chrOverridenMethodName=gstr->str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerOutputIntroducingClass, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec,
+                                            (GFunc)VoyagerOutputIntroducingClass, &ioi);
                 }
                 fprintf(ski->of, ":%s\";\n",gstr->str); /* Output the method name */
@@ -904 +901 @@
                   ioi.realif = tmptree;
                   ioi.chrOverridenMethodName=gstr->str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerWriteParamsForParentCall, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec,
+                                            (GFunc)VoyagerWriteParamsForParentCall, &ioi);
                 }
                 fprintf(ski->of, "ev)");
@@ -916 +914 @@
                   ioi.realif = tmptree;
                   ioi.chrOverridenMethodName=gstr->str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerOutputParentMethodSpec, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec,
+                                            (GFunc)VoyagerOutputParentMethodSpec, &ioi);
                 }
                 fprintf(ski->of, ") \\\n    %s_parent_resolved)", id);
@@ -929 +928 @@
                   ioi.realif = tmptree;
                   ioi.chrOverridenMethodName=gstr->str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerOutputIntroducingClass, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec,
+                                            (GFunc)VoyagerOutputIntroducingClass, &ioi);
                 }
                 fprintf(ski->of, "*)nomSelf, ");
@@ -939 +939 @@
                   ioi.realif = tmptree;
                   ioi.chrOverridenMethodName=gstr->str;
-                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerWriteParamsForParentCall, &ioi);
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec,
+                                            (GFunc)VoyagerWriteParamsForParentCall, &ioi);
                 }
                 fprintf(ski->of, "ev)");
@@ -952 +953 @@
                       id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str);
             }
+
+            /* Output the parameter info */
+            if(!bOverriden)
+              {
+                int a=0;
+                IDL_tree tmptree;
+
+                tmptree = IDL_get_parent_node(ski->tree, IDLN_INTERFACE, NULL);
+
+                fprintf(ski->of, "static nomParmInfo nomParm_%s = {\n", id);
+
+                /* Output number of parameters */
+                for(curitem = IDL_OP_DCL(ski->tree).parameter_dcls;
+                    curitem; curitem = IDL_LIST(curitem).next) {
+                  a++; /* Count parameters */
+                }
+                fprintf(ski->of, "  %d,  /* Number of parameters */\n", a);
+
+                /* Output return type */
+                fprintf(ski->of, "  /* Return type (%s: %s line %d)*/\n  \"", __FILE__, __FUNCTION__, __LINE__);
+                orbit_cbe_write_param_typespec(ski->of, ski->tree);
+                fprintf(ski->of, "\",\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;
+                  
+                  fprintf(ski->of, "  \"");
+                  if(IDLN_PARAM_DCL==IDL_NODE_TYPE(subski.tree))
+                    VoyagerOutputParamTypes(&subski);
+                  fprintf(ski->of, "\",\n");
+                }
+                fprintf(ski->of, "}};\n");
+              }
+
             if(ptr!=NULL)
                 *ptr='_';
@@ -984 +1021 @@
                 id2 = IDL_ns_ident_to_qstring(IDL_IDENT_TO_NS(IDL_INTERFACE(curitem).ident), "_", 0);
 
-        /* Check for our specailly marked NOM-only methods. Don't output them, they are handled
+        /* Check for our specially marked NOM-only methods. Don't output them, they are handled
            specially. */
           if(!strstr(id, NOM_INSTANCEVAR_STRING) &&
@@ -994 +1031 @@
             fprintf(ski->of, "  &nomFullIdString_%s_%s,  /* char *chrMethodDescriptor */\n",
                     id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str);
-            fprintf(ski->of, "  (nomMethodProc*)  impl_%s_%s\n", id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str);
+            fprintf(ski->of, "  (nomMethodProc*)  impl_%s_%s,\n", id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str);
+            fprintf(ski->of, "  &nomParm_%s_%s\n", id2, IDL_IDENT(IDL_OP_DCL(ski->tree).ident).str);
             fprintf(ski->of, "},\n");
 
@@ -1084 +1122 @@
 
 
-        /* Check for our specailly marked NOM-only methods. Don't output them, they are handled
+        /* Check for our specially marked NOM-only methods. Don't output them, they are handled
            specially. */
         if(!strstr(IDL_IDENT(ident).str, NOM_INSTANCEVAR_STRING) &&
@@ -1234 +1272 @@
 }
 
+/*
+  CW: When doing a pass we first end here for each interface. By calling
+  cbe_ski_do_list() all nodes are traversed and the subfunctions are called
+  accordingly.
+
+ */
 static void
 cbe_ski_do_interface(CBESkelImplInfo *ski)
@@ -1262 +1306 @@
                 IDL_tree_traverse_parents(ski->tree, (GFunc)&cbe_ski_do_inherited_methods, ski);
         
-
         break;
       }

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

@@ -407 +407 @@
 }
 
+/*
+  This is almost the same like orbit_cbe_write_param_typespec_str(). We only omit the
+  'const' qualifier because we only need the parameter type.
+ */
+static char *
+orbit_cbe_voyager_write_param_typespec_str(IDL_tree ts, IDL_ParamRole role)
+{
+        int      i, n;
+        gboolean isSlice;
+        char    *name;
+        GString *str = g_string_sized_new (23);
+        IDL_tree typedef_spec;
+        char *typedef_name;
+
+        n = oidl_param_info (ts, role, &isSlice);
+        name = orbit_cbe_get_typespec_str (ts);
+
+        if ( role == DATA_IN ) {
+                /* We want to check if this is a typedef for CORBA_string so we can do special handling 
+                 * in that case. 
+                 */
+                typedef_spec = orbit_cbe_get_typespec (ts);
+                typedef_name = orbit_cbe_get_typespec_str (typedef_spec);
+
+                g_string_printf (str, "%s", 
+                                 !strcmp (typedef_name, "CORBA_string") ?
+                                 "CORBA_char *" : name);
+
+                g_free (typedef_name);
+        } else
+                g_string_printf (str, "%s", name);
+
+        g_free (name);
+
+        if ( isSlice )
+                g_string_append (str, "_slice");
+
+        for (i = 0; i < n; i++)
+                g_string_append_c (str, '*');
+
+        return g_string_free (str, FALSE);
+}
+
+/*
+  This helper just writes the typespec of a parameter to a method without any
+  'const' qualifier.
+ */
+void
+orbit_cbe_voyager_write_param_typespec(FILE *of, IDL_tree tree) {
+    IDL_tree            ts = NULL /* Quiet gcc */;
+    IDL_ParamRole       role = 0 /* Quiet gcc */;
+    char *str;
+
+    switch ( IDL_NODE_TYPE(tree) ) {
+    case IDLN_PARAM_DCL: /* one of the parameters */
+        ts = IDL_PARAM_DCL(tree).param_type_spec;
+        role = oidl_attr_to_paramrole(IDL_PARAM_DCL(tree).attr);
+        break;
+    default:
+        g_assert_not_reached();
+    }
+
+    str = orbit_cbe_voyager_write_param_typespec_str (ts, role);
+    fprintf (of, str);
+    g_free (str);
+}
+
 static void
 orbit_cbe_write_param_typespec_raw (FILE *of, IDL_tree ts, IDL_ParamRole role)