gnue/geas/lib/classdefs classdata.c classdata_d...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/06/27 11:46:57

Modified files:
        geas/lib/classdefs: classdata.c classdata_database.c gcdparser.c 

Log message:
        Correct problem with assert on enum and some typos.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/classdefs/classdata.c.diff?cvsroot=OldCVS&tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/classdefs/classdata_database.c.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/classdefs/gcdparser.c.diff?cvsroot=OldCVS&tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: gnue/geas/lib/classdefs/classdata.c
diff -u gnue/geas/lib/classdefs/classdata.c:1.62 
gnue/geas/lib/classdefs/classdata.c:1.63
--- gnue/geas/lib/classdefs/classdata.c:1.62    Fri Jun 22 14:39:01 2001
+++ gnue/geas/lib/classdefs/classdata.c Wed Jun 27 11:46:57 2001
@@ -22,7 +22,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
-   $Id: classdata.c,v 1.62 2001/06/22 21:39:01 ntiffin Exp $
+   $Id: classdata.c,v 1.63 2001/06/27 18:46:57 ntiffin Exp $
    
 */
 
@@ -1443,7 +1443,9 @@
   assert (field != NULL);
 #endif
   if (field->tmpdefault)
-    g_free (field->tmpdefault);
+    {
+      g_free (field->tmpdefault);
+    }
   field->tmpdefault = NULL;
   switch (field->datatype)
     {
@@ -1498,6 +1500,9 @@
           return (field->tmpdefault);
         }
       break;
+    case DT_bool:
+    case DT_boolean:
+      break;
     default:
       break;
     }
@@ -1820,16 +1825,17 @@
   if (!type_class)
     {
       printf
-        ("**** Error could not find TYPE: %s, in container %s\n",
+        ("**** Error could not find TYPE: %s, defined in container %s\n",
          f->datatypeclass, c->base.name);
+      printf ("     In filename: %s\n", ( (odl_container *)((odl_base 
*)f)->parent)->filename );
       return;
     }
   if (!type_class->istype)
     {
-      printf ("**** Error trying to process the field %s that is not a 
TYPE.\n", f->base.name);
+      printf ("**** Error trying to process field %s that is not a TYPE.\n", 
f->base.name);
       printf ("     In container: %s\n", ( ((odl_base *)f)->parent)->name );
       printf ("     In filename: %s\n", ( (odl_container *)((odl_base 
*)f)->parent)->filename );
-     return;
+      return;
     }
   /* it's a compound type - make new fields */
 #ifdef DEBUG
Index: gnue/geas/lib/classdefs/classdata_database.c
diff -u gnue/geas/lib/classdefs/classdata_database.c:1.18 
gnue/geas/lib/classdefs/classdata_database.c:1.19
--- gnue/geas/lib/classdefs/classdata_database.c:1.18   Wed Jun  6 14:12:33 2001
+++ gnue/geas/lib/classdefs/classdata_database.c        Wed Jun 27 11:46:57 2001
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  
-   $Id: classdata_database.c,v 1.18 2001/06/06 21:12:33 ntiffin Exp $
+   $Id: classdata_database.c,v 1.19 2001/06/27 18:46:57 ntiffin Exp $
 */
 
 /* generally speaking, do not include this, except in classdata.h */
@@ -429,7 +429,7 @@
 DBchange *
 find_named_change (GList * l, char *name)
 {
-  g_assert (l != NULL);
+  /* g_assert (l != NULL); */
   g_assert (name != NULL);
   while (l)
     {
Index: gnue/geas/lib/classdefs/gcdparser.c
diff -u gnue/geas/lib/classdefs/gcdparser.c:1.39 
gnue/geas/lib/classdefs/gcdparser.c:1.40
--- gnue/geas/lib/classdefs/gcdparser.c:1.39    Wed Jun  6 14:12:33 2001
+++ gnue/geas/lib/classdefs/gcdparser.c Wed Jun 27 11:46:57 2001
@@ -22,7 +22,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
-   $Id: gcdparser.c,v 1.39 2001/06/06 21:12:33 ntiffin Exp $
+   $Id: gcdparser.c,v 1.40 2001/06/27 18:46:57 ntiffin Exp $
    
 */
 
@@ -430,7 +430,7 @@
 #ifdef DEBUG
   assert (element != NULL);
   assert (e != NULL);
-  assert (e->elements);
+  /* assert (e->elements); */
 #endif
   l = e->elements;
   while (l)