Changeset 255 for trunk/nom/src

Timestamp:

Mar 15, 2007, 9:42:22 PM (18 years ago)

Author:

cinc

Message:

Parameter checking for object pointer working.

Location:

trunk/nom/src

Files:

• nombuildclass.c (modified) (6 diffs)
• nombuildnomcls.c (modified) (1 diff)
• nombuildnomobj.c (modified) (1 diff)
• nomdebug.c (modified) (2 diffs)
• nomtkinit.c (modified) (4 diffs)

trunk/nom/src/nombuildclass.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -969 +969 @@
                                                   ulMajorVersion, ulMinorVersion);
         if(nomClass){
+          CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+
           DBG_NOMBUILDCLASS(TRUE, "%s: class is 0x%x\n", nomClass->mtab->nomClassName, nomClass);
 #if 0
@@ -977 +979 @@
           priv_checkForNomUnInitOverride( (NOMClassPriv*)nomClass->mtab->nomClsInfo,  ncpParent);
 #endif     
-          _nomInit((NOMObject*)nomClass, NULLHANDLE);
-          _nomClassReady(nomClass, NULLHANDLE);
+          /* Make sure the env is marked that we don't chek the object pointer. This would fail
+             because the class isn't registered yet. */
+          _nomInit((NOMObject*)nomClass, tempEnv);
+          _nomClassReady(nomClass, tempEnv);
         }
 
@@ -993 +997 @@
 
       if(nomClass){
-        _nomInit((NOMObject*)nomClass, NULLHANDLE);
-        _nomClassReady(nomClass, NULLHANDLE);
+        CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+        /* Make sure the env is marked that we don't chek the object pointer. This would fail
+           because the class isn't registered yet. */
+        _nomInit((NOMObject*)nomClass, tempEnv);
+        _nomClassReady(nomClass, tempEnv);
       }
       return nomClass;
@@ -1088 +1095 @@
 
   if(nomClass){
+    CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+
     /* Mark the class as using nomUnInit() if any parent did that. We just have to
        check the flag and the flag of the parent class. This information is important
@@ -1094 +1103 @@
     priv_checkForNomUnInitOverride( (NOMClassPriv*)nomClass->mtab->nomClsInfo,  ncpParent);
     
-    _nomInit(nomClass, NULLHANDLE);
-    _nomClassReady(nomClass, NULLHANDLE);
+    /* Make sure the env is marked that we don't chek the object pointer. This would fail
+       because the class isn't registered yet. */
+    _nomInit(nomClass, tempEnv);
+    _nomClassReady(nomClass, tempEnv);
   }
   return nomClass;

trunk/nom/src/nombuildnomcls.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *

trunk/nom/src/nombuildnomobj.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *

trunk/nom/src/nomdebug.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -55 +55 @@
 //#include "cwsomcls.h"
 extern NOMClassMgr* NOMClassMgrObject;
-
+extern gboolean fInitialized;
+
+NOMEXTERN void NOMLINK nomPrintObjectPointerErrorMsg(NOMObject*  nomObject, gchar *chrClsName, gchar* chrMethodName)
+{
+  if(!nomObject)
+    g_warning("The object used to call the method %s is not valid. A NULL pointer was given.", chrMethodName);
+  else{
+    if(!nomIsObj(nomObject))
+      g_warning("The object used to call the method %s is not a valid NOM object. ", chrMethodName);
+    else
+      g_warning("The object used to call the method %s is not valid for this method. The object must be some instance of class %s (or of a subclass) but is a %s.", chrMethodName, chrClsName, NOMObject_nomGetClassName(nomObject, NULLHANDLE));
+  }
+}
+
+/*
+  This function prints some more info about the object error. It's used for generic checks which
+  always return NULL which isn't always correct.
+ */
+static void nomPrintAdditionalErrorMsg(void)
+{
+  g_message("Note that NULL is returned for the call (if the method returns a value). This may not be correct. Use the NOMPARMCHECK() macro to specify default return values for methods.");
+}
+
+/* Function to check if  NOMObject is valid before calling a method on it. Note that we don't have to check
+   the instance class here using nomIsA*(). */
+NOMEXTERN gboolean NOMLINK nomCheckNOMObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev)
+{
+  /* Not initialized yet, so object check won't work. This means the three core NOM classes are not
+     yet created.*/
+  if(!fInitialized)
+    return TRUE;
+  
+  if(ev && (ev->fFlags & NOMENV_FLG_DONT_CHECK_OBJECT))
+    return TRUE;
+
+  //  g_message("In %s with %s %px nomClass: %px (%s)", __FUNCTION__, chrMethodName, nomSelf, nomClass, nomClass->mtab->nomClassName);
+  if(!nomIsObj(nomSelf))
+    {
+      nomPrintObjectPointerErrorMsg(nomSelf, nomClass->mtab->nomClassName, chrMethodName);
+      nomPrintAdditionalErrorMsg();
+      return FALSE;
+    }
+  return TRUE;
+}
+
+#include <string.h>
+/* Function to check if an object is valid before calling a method on it */
+NOMEXTERN gboolean NOMLINK nomCheckObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev)
+{
+  /* Not initialized yet, so object check won't work. This means the three core NOM classes are not
+     yet created.*/
+  if(!fInitialized)
+    return TRUE;
+
+  //if(strstr( chrMethodName, "nomIsObj"))
+  //return TRUE;
+
+  if(ev && (ev->fFlags & NOMENV_FLG_DONT_CHECK_OBJECT))
+    return TRUE;
+
+  //  g_message("In %s with %s %px nomClass: %px (%s)", __FUNCTION__, chrMethodName, nomSelf, nomClass, nomClass->mtab->nomClassName);
+  if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf, nomClass, NULLHANDLE))
+    {
+      nomPrintObjectPointerErrorMsg(nomSelf, nomClass->mtab->nomClassName, chrMethodName);
+      nomPrintAdditionalErrorMsg();
+      return FALSE;
+    }
+  return TRUE;
+}
+
+NOMEXTERN CORBA_Environment* NOMLINK nomCreateEnvNoObjectCheck(void)
+{
+  CORBA_Environment * tempEnv=(CORBA_Environment*)NOMMalloc(sizeof(CORBA_Environment));
+  if(tempEnv)
+    tempEnv->fFlags|=NOMENV_FLG_DONT_CHECK_OBJECT;
+  return tempEnv;
+}
+ 
 static void dumpClassFunc(GQuark gquark, gpointer data, gpointer user_data)
 {

trunk/nom/src/nomtkinit.c

@@ -61 +61 @@
 NOMClassMgr* NOMClassMgrObject=NULLHANDLE; /* Referenced from different files */
 
+gboolean fInitialized=FALSE;
+
 /********************************************************/
 /*   Toolkit functions, exported                        */
@@ -131 +133 @@
   NOMClassPriv* ncPriv;
   NOMClass* nomCls;
+  //  NOMClassMgr *NOMClassMgrObject_priv;
 #if 0
   NOMObject *nomObj;
@@ -162 +165 @@
 
 #ifdef DEBUG_NOMENVNEW
-  nomPrintf("%s: NOMClassMgrObject: %x \n", __FUNCTION__, NOMClassMgrObject);
+  nomPrintf("%s: NOMClassMgrObject: %x (%x)\n", __FUNCTION__, NOMClassMgrObject, pGlobalNomEnv->defaultMetaClass);
 #endif
 
@@ -196 +199 @@
   _nomTestFunc_NOMTest2(nomTst2Obj, NULLHANDLE);
 #endif
+  /* This must be done last! */
+  //  NOMClassMgrObject=NOMClassMgrObject_priv;
+
+  fInitialized=TRUE;
 
   return NOMClassMgrObject;