gnue/geas/src/classdef Makefile.am classdef.c p...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/09/15 05:28:50

Modified files:
        geas/src/classdef: Makefile.am classdef.c parse.y scan.h scan.l 
                           test-parse.c 
Added files:
        geas/src/classdef: README read-gcd.c read-gcd.h 

Log message:
        Added code to parse all *.gcd files of a directory tree and other minor 
changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/README?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/read-gcd.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/read-gcd.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/classdef.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/parse.y.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/scan.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/scan.l.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/test-parse.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/geas/src/classdef/Makefile.am
diff -u gnue/geas/src/classdef/Makefile.am:1.4 
gnue/geas/src/classdef/Makefile.am:1.5
--- gnue/geas/src/classdef/Makefile.am:1.4      Thu Sep 13 11:06:46 2001
+++ gnue/geas/src/classdef/Makefile.am  Sat Sep 15 05:28:50 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2001/09/13 15:06:46 reinhard Exp $
+## $Id: Makefile.am,v 1.5 2001/09/15 09:28:50 reinhard Exp $
 
 TESTS = test-parse
 
@@ -10,7 +10,8 @@
 
 noinst_LIBRARIES = libclassdef.a
 
-libclassdef_a_SOURCES = classdef.c classdef.h parse.y scan.l scan.h
+libclassdef_a_SOURCES = classdef.c classdef.h parse.y scan.l scan.h \
+                        read-gcd.c read-gcd.h
 
 # -----------------------------------------------------------------------------
 
@@ -21,7 +22,7 @@
 check_PROGRAMS = test-parse
 
 test_parse_SOURCES = test-parse.c
-test_parse_LDADD = $(GLIB_LIBS) libclassdef.a
+test_parse_LDADD = libclassdef.a $(GLIB_LIBS)
 
 # -----------------------------------------------------------------------------
 
Index: gnue/geas/src/classdef/classdef.c
diff -u gnue/geas/src/classdef/classdef.c:1.4 
gnue/geas/src/classdef/classdef.c:1.5
--- gnue/geas/src/classdef/classdef.c:1.4       Mon Sep 10 18:17:30 2001
+++ gnue/geas/src/classdef/classdef.c   Sat Sep 15 05:28:50 2001
@@ -19,13 +19,14 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: classdef.c,v 1.4 2001/09/10 22:17:30 reinhard Exp $
+   $Id: classdef.c,v 1.5 2001/09/15 09:28:50 reinhard Exp $
 */
 
 #include "config.h"
 
 #include "classdef.h"
 
+/* glib */
 #define G_LOG_DOMAIN "GEAS Class Definitions"
 #include <glib.h>
 
Index: gnue/geas/src/classdef/parse.y
diff -u gnue/geas/src/classdef/parse.y:1.5 gnue/geas/src/classdef/parse.y:1.6
--- gnue/geas/src/classdef/parse.y:1.5  Mon Sep 10 18:17:30 2001
+++ gnue/geas/src/classdef/parse.y      Sat Sep 15 05:28:50 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: parse.y,v 1.5 2001/09/10 22:17:30 reinhard Exp $
+   $Id: parse.y,v 1.6 2001/09/15 09:28:50 reinhard Exp $
 */
 
 %{
@@ -57,7 +57,7 @@
 
 /* this function is called in the main program */
 
-void geas_cd_parse (const char *file, int pass);
+void _geas_cd_parse (const char *file, int pass);
 
 /* functions that are called wile parsing */
 
@@ -74,8 +74,8 @@
 static void _set_type_ref  (geas_cd_class *clss);
 static void _set_type_list (geas_cd_class *clss);
 
-static     void _new_field  (const gchar *name, gint format,
-                             const gchar *fdefault, gint properties);
+static void _new_field (const gchar *name, gint format, const gchar *fdefault,
+                        gint properties);
 %}
 
 /* ========================================================================= *\
@@ -277,6 +277,7 @@
 
 fdefault:   /* */                       { $$ = NULL; }
   |         '=' STRING                  { $$ = $2; }
+  |         '=' SYMBOL                  { $$ = $2; }
   |         '=' INTEGER                 { $$ = g_strdup_printf("%d",$2); }
   |         '=' FLOAT                   { $$ = g_strdup_printf("%f",$2); }
 ;
@@ -296,6 +297,7 @@
 ;
 
 arguments:  /* */                       { /* TODO */ }
+  |         argument                    { /* TODO */ }
   |         arguments ',' argument      { /* TODO */ }
 ;
 
@@ -346,7 +348,7 @@
  * Run the parser on a specific file for a specific pass
 \* ------------------------------------------------------------------------- */
 void
-geas_cd_parse (const char *file, int pass)
+_geas_cd_parse (const char *file, int pass)
 {
   g_return_if_fail (file);
 
@@ -355,10 +357,10 @@
   _current_file = file;
   _current_pass = pass;
 
-  if (geas_cd_scan_begin (file))
+  if (_geas_cd_scan_begin (file))
     {
       yyparse ();
-      geas_cd_scan_end ();
+      _geas_cd_scan_end ();
     }
 }
 
Index: gnue/geas/src/classdef/scan.h
diff -u gnue/geas/src/classdef/scan.h:1.1 gnue/geas/src/classdef/scan.h:1.2
--- gnue/geas/src/classdef/scan.h:1.1   Thu Sep  6 14:44:15 2001
+++ gnue/geas/src/classdef/scan.h       Sat Sep 15 05:28:50 2001
@@ -19,14 +19,14 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: scan.h,v 1.1 2001/09/06 18:44:15 reinhard Exp $
+   $Id: scan.h,v 1.2 2001/09/15 09:28:50 reinhard Exp $
 */
 
 #ifndef _SCAN_H
 #define _SCAN_H
 
-int  geas_cd_scan_begin (const char *filename);
-void geas_cd_scan_end (void);
+int  _geas_cd_scan_begin (const char *filename);
+void _geas_cd_scan_end (void);
 
 int  yylex (void);
 
Index: gnue/geas/src/classdef/scan.l
diff -u gnue/geas/src/classdef/scan.l:1.2 gnue/geas/src/classdef/scan.l:1.3
--- gnue/geas/src/classdef/scan.l:1.2   Thu Sep  6 17:18:16 2001
+++ gnue/geas/src/classdef/scan.l       Sat Sep 15 05:28:50 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: scan.l,v 1.2 2001/09/06 21:18:16 reinhard Exp $
+   $Id: scan.l,v 1.3 2001/09/15 09:28:50 reinhard Exp $
 */
 
 %option case-insensitive
@@ -140,9 +140,8 @@
 null      { TTP; return (NUL);       }
 readonly  { TTP; return (READONLY);  }
 
-list      { TTP; return (LIST);      }
-lookup    { TTP; return (LOOKUP);    }
 reference { TTP; return (REFERENCE); }
+list      { TTP; return (LIST);      }
 
 unique    { TTP; return (UNIQUE);    }
 index     { TTP; return (INDEX);     }
@@ -181,7 +180,7 @@
  * Open new file to parse
 \* ------------------------------------------------------------------------- */
 int
-geas_cd_scan_begin (const char *file)
+_geas_cd_scan_begin (const char *file)
 {
   g_return_val_if_fail (file, 0);
 
@@ -202,7 +201,7 @@
  * Close file after parse
 \* ------------------------------------------------------------------------- */
 void
-geas_cd_scan_end (void)
+_geas_cd_scan_end (void)
 {
   _token_line = 0;                    /* don't display line on error message */
 
Index: gnue/geas/src/classdef/test-parse.c
diff -u gnue/geas/src/classdef/test-parse.c:1.3 
gnue/geas/src/classdef/test-parse.c:1.4
--- gnue/geas/src/classdef/test-parse.c:1.3     Mon Sep 10 18:17:30 2001
+++ gnue/geas/src/classdef/test-parse.c Sat Sep 15 05:28:50 2001
@@ -19,17 +19,15 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: test-parse.c,v 1.3 2001/09/10 22:17:30 reinhard Exp $
+   $Id: test-parse.c,v 1.4 2001/09/15 09:28:50 reinhard Exp $
 */
 
 #include "classdef.h"
+#include "read-gcd.h"
 
-/* This function is defined in parse.y */
-void geas_cd_parse (const char *file, int pass);
-
 int main (void)
 {
   geas_cd_init ();
-  geas_cd_parse ("test-parse.gcd", 0);
+  geas_cd_read_gcd ("../../../gnue-config");
   return (0);
 }