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

Timestamp:

Dec 3, 2006, 9:15:50 PM (19 years ago)

Author:

cinc

Message:

Put class declaration at the top of header files so it's known to included files. This is necessary for classes in IDL files referencing classes in other IDL files which reference the class in the first IDL file.

File:

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

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

@@ -14 +14 @@
 static void ch_output_skel_protos(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci);
 static void ch_output_voyager(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci);
+static void ch_VoyagerOutputClassDeclaration(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci);
 
 void
@@ -36 +37 @@
   fprintf(ci->fh, "#endif /* __cplusplus */\n\n");
 
+  /* Forward declare our class */
+  ch_VoyagerOutputClassDeclaration(tree, rinfo, ci);
   /* Do all the typedefs, etc. */
   fprintf(ci->fh, "\n/** typedefs **/\n");
@@ -218 +221 @@
         case IDLN_FORWARD_DCL:
         case IDLN_INTERFACE:
-                ch_output_interface (tree, rinfo, ci);
+      /* ch_output_interface (tree, rinfo, ci); */
                 break;
         case IDLN_TYPE_STRUCT:
@@ -295 +298 @@
         }
 }
+
+/*
+  This function declares the class struct and the pointer on the class.
+ */
+static void
+ch_VoyagerOutputClassDeclaration(IDL_tree tree,
+                                 OIDL_Run_Info *rinfo,
+                                 OIDL_C_Info   *ci)
+{
+        if (!tree)
+                return;
+
+        switch (IDL_NODE_TYPE (tree)) {
+        case IDLN_EXCEPT_DCL:
+                break;
+        case IDLN_FORWARD_DCL:
+        case IDLN_INTERFACE:
+                ch_output_interface (tree, rinfo, ci);
+                break;
+        case IDLN_TYPE_STRUCT:
+                break;
+        case IDLN_TYPE_ENUM:
+                break;
+        case IDLN_TYPE_DCL:
+                break;
+        case IDLN_TYPE_UNION:
+                break;
+        case IDLN_CODEFRAG:
+                break;
+        case IDLN_SRCFILE:
+                break;
+        case IDLN_CONST_DCL:
+                break;
+        case IDLN_NATIVE:
+                break;
+        default:
+                break;
+        }
+
+        switch (IDL_NODE_TYPE (tree)) {
+        case IDLN_MODULE:
+                break;
+        case IDLN_LIST: {
+                IDL_tree sub;
+
+                for (sub = tree; sub; sub = IDL_LIST (sub).next) {
+                        ch_VoyagerOutputClassDeclaration (IDL_LIST (sub).data, rinfo, ci);
+                }
+                }
+                break;
+        case IDLN_INTERFACE:
+                break;
+        default:
+                break;
+        }
+}
+
 
 static void