Changeset 251 for trunk/nom/class_c

Timestamp:

Mar 11, 2007, 2:22:39 PM (18 years ago)

Author:

cinc

Message:

Implemented some methods. Bug fixes and documentation.

Location:

trunk/nom/class_c

Files:

• nomclassmanager.c (modified) (2 diffs)
• nomcls.c (modified) (4 diffs)
• nomobj.c (modified) (7 diffs)

trunk/nom/class_c/nomclassmanager.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.
 *
@@ -35 +35 @@
  * And remember, phase 3 is near...
  */
+/** \file nomobj.idl 
+    
+    Implementation file for the NOM class NOMClassMgr.
+*/
+
 #ifndef NOM_NOMClassMgr_IMPLEMENTATION_FILE
 #define NOM_NOMClassMgr_IMPLEMENTATION_FILE

trunk/nom/class_c/nomcls.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
+/** \file noncls.c
+    
+    Implementation file for the NOMClass class.
+*/
 #ifndef NOM_NOMClass_IMPLEMENTATION_FILE
 #define NOM_NOMClass_IMPLEMENTATION_FILE
@@ -83 +87 @@
   ncp=(NOMClassPriv*)_ncpObject;
 
+  /* Allocate memory big enough to hold an object. This means the size is that of the
+     mtab pointer and all instance variables. */
   if((nObj=_nomAllocate(nomSelf, ncp->mtab->ulInstanceSize, NULLHANDLE))==NULLHANDLE)
     return NULLHANDLE;
@@ -149 +155 @@
 
 /**
-   Function which implements the nomGetName() method of NOMClass.
+   Function which implements the nomGetCreatedClassName() method of NOMClass.
 */
-NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomGetName(NOMClass* nomSelf, CORBA_Environment *ev)
-{
-  return nomSelf->mtab->nomClassName;
+NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomGetCreatedClassName(NOMClass* nomSelf, CORBA_Environment *ev)
+{
+  NOMClassPriv* ncp;
+
+  /* The private struct characterizing the objects this meta class can create. */
+  ncp=_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);
+
+  if(!ncp)
+    return ""; /* That can not happen but anyway... */
+
+  //  return nomSelf->mtab->nomClassName;
+  return ncp->mtab->nomClassName;
 }
 
@@ -212 +227 @@
 
       /* FIXME: no use of version information, yet. */
-      //nomPrintf("I'm here (%s): ", _nomGetName(nomSelf, NULLHANDLE));
-      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
+      
+      //The following was used before changing nomGetname()
+      //if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
+      //                        0, 0, NULLHANDLE))
+      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetClassName(nomSelf, NULLHANDLE),
                               0, 0, NULLHANDLE))
+
         {
           NOMClassPriv* ncPriv;

trunk/nom/class_c/nomobj.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.
 *
@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
+/** \file nomobj.idl 
+    
+    Implementation file for the NOM class NOMObject.
+*/
+
 #ifndef NOM_NOMObject_IMPLEMENTATION_FILE
 #define NOM_NOMObject_IMPLEMENTATION_FILE
@@ -49 +54 @@
 
 /**
-
     \brief This function implements the method nomInit() of class NOMObject.
  */
 NOM_Scope void  NOMLINK impl_NOMObject_nomInit(NOMObject *nomSelf, CORBA_Environment *ev)
 {  
-  //nomPrintf("    Entering %s (%x) with nomSelf: 0x%x. nomSelf is: %s.\n",
-  //        __FUNCTION__, impl_NOMObject_nomInit, nomSelf , nomSelf->mtab->nomClassName);
-}
-
-/**
-
+
+}
+
+/**
     \brief This function implements the method nomUnInit() of class NOMObject.
  */
@@ -71 +73 @@
 
 /**
-
     \brief This function implements the method nomGetSize() of class NOMObject.
  */
@@ -87 +88 @@
 
 /**
-
     \brief This function implements the method delete() of class NOMObject.
 
@@ -121 +121 @@
 
 /**
-
     \brief This function implements the method nomGetClass() of class NOMObject.
     It returns a pointer to the class object of this object.
@@ -162 +161 @@
 
 
+NOM_Scope CORBA_boolean NOMLINK impl_NOMObject_nomIsA(NOMObject* nomSelf, const PNOMClass nomClass, CORBA_Environment *ev)
+{
+  /* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
+  NOMClassPriv* ncp;
+  nomMethodTabs mtabs; /* List of mtabs */
+
+  if(!nomIsObj(nomClass)){
+    g_warning("%s: class object pointer nomClass does not point to an object.", __FUNCTION__);
+    return FALSE;
+  }
+
+  /* Check if we have the class in our list of classes */
+  ncp=(NOMClassPriv*)nomSelf->mtab->nomClsInfo;
+  mtabs=&ncp->mtabList;
+  while(mtabs)
+    {
+      if(nomClass==mtabs->mtab->nomClassObject)
+          return TRUE;
+
+      mtabs=mtabs->next;
+    }
+  return FALSE;
+}
+
+
+NOM_Scope CORBA_boolean NOMLINK impl_NOMObject_nomIsInstanceOf(NOMObject* nomSelf, const PNOMClass nomClass, CORBA_Environment *ev)
+{
+  /* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
+ 
+  if(!nomIsObj(nomClass)){
+    g_warning("%s: class object pointer nomClass does not point to an object.", __FUNCTION__);
+    return FALSE;
+  }
+ 
+  if(nomClass==_nomGetClass(nomSelf, NULLHANDLE))
+    return TRUE;
+  
+  return FALSE;
+}
+
+/**
+   Function which implements the nomGetClassName() method of NOMObject.
+*/
+NOM_Scope CORBA_string NOMLINK impl_NOMObject_nomGetClassName(NOMObject* nomSelf, CORBA_Environment *ev)
+{
+  /* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
+  return nomSelf->mtab->nomClassName;
+}