Changeset 353

Timestamp:

Jun 7, 2008, 10:41:05 AM (17 years ago)

Author:

cinc

Message:

Started implementing method query methods. Renamed nomGetClass() to nomQueryClass().

Location:

trunk

Files:

• nom/Makefile.kmk (modified) (2 diffs)
• nom/class_c/nomobj.c (modified) (6 diffs)
• nom/class_c/nomstring.c (modified) (1 diff)
• nom/exports.def (modified) (2 diffs)
• nom/idl/nomobj.idl (modified) (2 diffs)
• nom/idl/nomtestresult.idl (modified) (2 diffs)
• tests/Makefile.kmk (modified) (1 diff)

trunk/nom/Makefile.kmk

@@ -30 +30 @@
         idl/nomtestcase.idl \
         idl/nomtestresult.idl \
+        idl/nommethod.idl \
         \
         src/nomtkinit.c \
@@ -46 +47 @@
         class_c/nomarray.c \
         class_c/nomtestcase.c \
-        class_c/nomtestresult.c
+        class_c/nomtestresult.c \
+        class_c/nommethod.c
 libnomobjtk_SOURCES.os2 = \
         $(PATH_TARGET)/nobjtk-os2.def

trunk/nom/class_c/nomobj.c

@@ -54 +54 @@
 #include "nomobj.ih"
 
+#include "nomstring.h"
+#include "nommethod.h"
 #include "gc.h"
 
@@ -124 +126 @@
 
 /**
-    \brief This function implements the method nomGetClass() of class NOMObject.
+    \brief This function implements the method nomQueryClass() of class NOMObject.
     It returns a pointer to the class object of this object.
 
@@ -131 +133 @@
     \retval PNOMClass A pointer to the class object for this object. This can never be NULL.
  */
-NOM_Scope PNOMClass NOMLINK impl_NOMObject_nomGetClass(NOMObject* nomSelf, CORBA_Environment *ev)
+NOM_Scope PNOMClass NOMLINK impl_NOMObject_nomQueryClass(NOMObject* nomSelf, CORBA_Environment *ev)
 {
 /* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
@@ -158 +160 @@
      It is possible that we are called by a subclass. So get the class object and let the
      class object create the correct class. */
-  nomCls=NOMObject_nomGetClass(nomSelf, NULL);
+  nomCls=NOMObject_nomQueryClass(nomSelf, NULL);
   return NOMClass_nomNew(nomCls, NULL);
 }
@@ -206 +208 @@
   }
  
-  if(nomClass==_nomGetClass(nomSelf, NULL))
+  if(nomClass==_nomQueryClass(nomSelf, NULL))
     return TRUE;
   
@@ -220 +222 @@
   return nomSelf->mtab->nomClassName;
 }
+
+
+NOMDLLEXPORT NOM_Scope void NOMLINK impl_NOMObject_nomGetMethodList(NOMObject* nomSelf,
+                                                                    const CORBA_boolean bIncludingParents,
+                                                                    CORBA_Environment *ev)
+{
+  NOMClassPriv* ncPriv;
+  
+  /* NOMObjectData* nomThis = NOMObjectGetData(nomSelf); */
+
+  g_message("In %s (%d): %s", __FUNCTION__, __LINE__, _nomGetClassName(_nomQueryClass(nomSelf, NULL), NULL));
+  
+  ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(_nomQueryClass(nomSelf, NULL), NULL);
+  
+  if(ncPriv){
+    gulong a, ulNumIntroducedMethods;
+
+    ulNumIntroducedMethods=ncPriv->sci->ulNumStaticMethods;
+    for(a=0;a< ulNumIntroducedMethods;a++)
+    {
+      NOMMethod* nMethod=NOMMethodNew();
+      NOMString* ns;
+      
+      _initData(nMethod, (gpointer) &ncPriv->sci->nomSMethods[a], NULL);
+      g_message("In %s (%d): %s %X", __FUNCTION__, __LINE__, *ncPriv->sci->nomSMethods[a].nomMethodId, nMethod /*chrMethodDescriptor*/);
+
+      g_message("  In %s (%d): %s\n", __FUNCTION__, __LINE__, _nomGetClassName(_getName(nMethod, NULL), NULL));
+      
+      
+      //g_message("    In %s (%d): %X NOMString: %x", __FUNCTION__, __LINE__, nMethod, _getName(nMethod, NULL));
+      
+      g_message("    In %s (%d): NOMMethod: %x %s 3\n", __FUNCTION__, __LINE__, nMethod, _queryString(_getName(nMethod, NULL), NULL));
+      
+    }
+    //nomPrintf("     %s %s \n", nomSelf->mtab->nomClassName, ncPriv->mtab->nomClassName);
+  }
+  
+  //nomPrintf("In %s: metaclass: %s, class: %s\n", __FUNCTION__, _nomGetClassName(_nomQueryClass(nomSelf, NULL), NULL),
+    //        _nomGetClassName(nomSelf, NULL));
+
+}
+

trunk/nom/class_c/nomstring.c

@@ -67 +67 @@
 {
   NOMStringData* nomThis = NOMStringGetData(nomSelf);
-  
+
   g_string_assign(_gString, chrString); /* This copies the input string */
   return nomSelf;

trunk/nom/exports.def

@@ -53 +53 @@
         _NOMArrayClassData    
         _NOMArrayCClassData  
-        NOMArray             NewClass 
+        NOMArrayNewClass 
 
         _NOMStringClassData    
         _NOMStringCClassData  
-        NOMString            NewClass 
+        NOMStringNewClass 
 
         _NOMTestCaseClassData      
@@ -66 +66 @@
         _NOMTestResultCClassData     
         NOMTestResultNewClass       
+
+        _NOMMethodClassData    
+        _NOMMethodCClassData  
+        NOMMethodNewClass 
 
 ;       _NOMTest2ClassData      

trunk/nom/idl/nomobj.idl

@@ -125 +125 @@
      \return Pointer to the class object
 
-     \sa impl_NOMObject_nomGetClass()
-   */
-  PNOMClass nomGetClass();
+     \sa impl_NOMObject_nomQueryClass()
+   */
+  PNOMClass nomQueryClass();
 
   /**
@@ -226 +226 @@
   boolean nomIsANoClsCheck(in PNOMClass nomClass);
 
+  void nomGetMethodList(in boolean bIncludingParents);
 };
 

trunk/nom/idl/nomtestresult.idl

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
-#ifndef NOMTESTCASE_IDL_INCLUDED
-#define NOMTESTCASE_IDL_INCLUDED
+#ifndef NOMTESTRESULT_IDL_INCLUDED
+#define NOMTESTRESULT_IDL_INCLUDED
 
 #include "nomobj.idl"
@@ -65 +65 @@
 };
 
-#endif  /* NOMTESTCASE_IDL_INCLUDED */
+#endif  /* NOMTESTRESULT_IDL_INCLUDED */
 
 

trunk/tests/Makefile.kmk

@@ -123 +123 @@
 
 
+#
+# Program for playing around.
+#
+PROGRAMS += nom-play
+nom-play_TEMPLATE = nombin
+nom-play_SOURCES = \
+        c/nom-play.c
+ifeq ($(BUILD_TARGET),win)
+ nom-play_LIBS = \
+        $(TARGET_libnomtest:.dll=.lib)
+else
+        nom-play_LIBS = \
+        $(TARGET_libnomtest)
+endif
+
 endif # NOM_WITH_TESTCASES