Changeset 100 for trunk/ORBit2-2.14.0

Timestamp:

Nov 25, 2006, 4:26:47 PM (19 years ago)

Author:

cinc

Message:

Made method calls typesafe with respect to the object parameter.

Location:

trunk/ORBit2-2.14.0/src/idl-compiler

Files:

• orbit-idl-c-headers.c (modified) (2 diffs)
• orbit-idl-c-skelimpl.c (modified) (1 diff)

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

@@ -125 +125 @@
       fprintf(ci->fh, "\n/*\n * New macro for %s\n */\n", id);
       fprintf(ci->fh, "#define %sNew() \\\n", id);
-      fprintf(ci->fh, "        (_nomNew((_%s ? _%s : %sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n",
-              id, id, id, id ,id);
+      /* Changed for typesafety */
+      fprintf(ci->fh, "        ((%s*)_nomNew((_%s ? _%s : %sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n",
+              id, id, id, id, id ,id);
+      //  fprintf(ci->fh, "        (_nomNew((_%s ? _%s : %sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n",
+      //      id, id, id, id ,id);
 
       fprintf(ci->fh, "\n");
@@ -324 +327 @@
 #else
     fprintf(ci->fh, "#ifndef %s\n", fullname);
-    fprintf(ci->fh, "#define %s NOMObject\n", fullname);
+    /* For being more typesave when calling methods */
+    fprintf(ci->fh, "typedef struct %s_struct {\n", fullname);
+    fprintf(ci->fh, "  struct nomMethodTabStruct  *mtab;\n");
+    fprintf(ci->fh, "  integer4 body[1];\n");
+    fprintf(ci->fh, "} %sObj;\n", fullname);
+
+    fprintf(ci->fh, "#define %s %sObj\n", fullname, fullname);
     fprintf(ci->fh, "#endif\n");
 #endif

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

@@ -1117 +1117 @@
           g_free(chrTemp);
         }
-        fprintf(ski->of, "%s* NOMLINK %sNewClass(gulong ulMajor, gulong ulMinor)\n{\n", id, id);
-        fprintf(ski->of, "  %s* result;\n\n", id);
+        fprintf(ski->of, "NOMClass* NOMLINK %sNewClass(gulong ulMajor, gulong ulMinor)\n{\n", id);
+        fprintf(ski->of, "  NOMClass* result;\n\n");
+        //fprintf(ski->of, "%s* NOMLINK %sNewClass(gulong ulMajor, gulong ulMinor)\n{\n", id, id);
+        // fprintf(ski->of, "  %s* result;\n\n", id);
 
         /* Make sure meta class is created if specified by the user */