Changeset 283 for trunk

Timestamp:

Mar 31, 2007, 6:15:20 PM (18 years ago)

Author:

cinc

Message:

Fixed unitialized pointer crash. Use new IDL compiler.

Location:

trunk/foundation

Files:

• Makefile (modified) (2 diffs)
• class_c/nomfilepath.c (modified) (2 diffs)
• class_c/nomstring.c (modified) (2 diffs)
• idl/nomfilepath.idl (modified) (1 diff)
• idl/nomstring.idl (modified) (1 diff)

trunk/foundation/Makefile

@@ -23 +23 @@
                         -I $(NOMPATH)/class_h -I $(NOMPATH)/include \
                         -I $(GUITKPATH)/class_h -I $(GUITKPATH)/include
+
+# NOM IDL compiler
+NOMIDLINC       =       -I$(TKIDLDIR)
+NOMIDLCOMPILER  =       $(BINDIR)/nom-idl-compiler.exe 
 
 
@@ -58 +62 @@
 ###################################
 
-BASE_NOMCOMPILEH        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --header --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEIH       =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
+#BASE_NOMCOMPILEH       =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --header --output-dir=$(CLASSINC) $<
+#BASE_NOMCOMPILEIH      =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
 BASE_NOMCOMPILEC        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
+
+BASE_NOMCOMPILEH        =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-h -d $(CLASSINC) -
+BASE_NOMCOMPILEIH       =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-ih -d $(CLASSINC) -
+
 
 

trunk/foundation/class_c/nomfilepath.c

@@ -99 +99 @@
     return (NOMPath*)NOMPath_appendCString((NOMString*)nomSelf, G_DIR_SEPARATOR_S, ev);
 
+  /* This is not a copy */
+  chrTemp=NOMPath_queryCString(nomSelf, NULLHANDLE);
   /* Add a separator */
   if(G_DIR_SEPARATOR!=chrTemp[len-1])
@@ -184 +186 @@
   PNOMPath nomRetval=(PNOMPath) NOMPath_new(nomSelf, NULLHANDLE);
   gchar *chrTemp;
-
+  g_message("In %s", __FUNCTION__);
   chrTemp=NOMPath_queryCString(nomSelf, NULLHANDLE); /* Not a copy */
 

trunk/foundation/class_c/nomstring.c

@@ -47 +47 @@
 #include <string.h>
 #include <glib.h>
-
+#include "nomfoundation.h"
 #include "nomstring.ih"
 
@@ -120 +120 @@
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
 
+  //g_message("In %s %d %s", __FUNCTION__, _gString->len, _gString->str );
+
   return _gString->len;
 }

trunk/foundation/idl/nomfilepath.idl

@@ -46 +46 @@
 interface NOMPath : NOMString
 {
+#ifdef __NOM_IDL_COMPILER__
+  filestem=nomfilepath;
+#endif
   /**
      The current version of this class is 1.0

trunk/foundation/idl/nomstring.idl

@@ -51 +51 @@
 interface NOMString : NOMObject
 {
+#ifdef __NOM_IDL_COMPILER__
+  filestem=nomstring;
+#endif
+
   /**
      The current version of this class is 1.0