gnue/geas/src Makefile.am geas-server.c classde...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/12/02 05:58:39

Modified files:
        geas/src       : Makefile.am geas-server.c 
        geas/src/classdef: Makefile.am 

Log message:
        Included the new parser into the main program.
        This is the start of the (hopefully short) phase where the old and the 
new parser are used in parallel.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/Makefile.am.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/geas-server.c.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/Makefile.am.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/geas/src/Makefile.am
diff -c gnue/geas/src/Makefile.am:1.46 gnue/geas/src/Makefile.am:1.47
*** gnue/geas/src/Makefile.am:1.46      Wed Nov 21 14:32:19 2001
--- gnue/geas/src/Makefile.am   Sun Dec  2 05:58:39 2001
***************
*** 1,4 ****
! ## $Id: Makefile.am,v 1.46 2001/11/21 19:32:19 reinhard Exp $
  
  SUBDIRS       = classdef config objectstore oql objectcache methods 
datamonitor
  
--- 1,4 ----
! ## $Id: Makefile.am,v 1.47 2001/12/02 10:58:39 reinhard Exp $
  
  SUBDIRS       = classdef config objectstore oql objectcache methods 
datamonitor
  
***************
*** 6,12 ****
  
  bin_PROGRAMS = geas-server
  
! MODULES = $(top_builddir)/src/config/libconfig.a \
            $(top_builddir)/src/oql/liboql.a \
            $(top_builddir)/src/objectcache/libobjectcache.a \
            $(top_builddir)/src/objectstore/libobjectstore.a \
--- 6,13 ----
  
  bin_PROGRAMS = geas-server
  
! MODULES = $(top_builddir)/src/classdef/libclassdef.a \
!           $(top_builddir)/src/config/libconfig.a \
            $(top_builddir)/src/oql/liboql.a \
            $(top_builddir)/src/objectcache/libobjectcache.a \
            $(top_builddir)/src/objectstore/libobjectstore.a \
Index: gnue/geas/src/classdef/Makefile.am
diff -c gnue/geas/src/classdef/Makefile.am:1.8 
gnue/geas/src/classdef/Makefile.am:1.9
*** gnue/geas/src/classdef/Makefile.am:1.8      Fri Sep 28 14:41:02 2001
--- gnue/geas/src/classdef/Makefile.am  Sun Dec  2 05:58:39 2001
***************
*** 1,10 ****
! ## $Id: Makefile.am,v 1.8 2001/09/28 18:41:02 reinhard Exp $
  
  TESTS = test-parse
  
  INCLUDES = $(GLIB_CFLAGS) -D'G_LOG_DOMAIN="GEAS-cd"'
  
  AM_YFLAGS = -d
  
  # 
-----------------------------------------------------------------------------
  
--- 1,24 ----
! ## $Id: Makefile.am,v 1.9 2001/12/02 10:58:39 reinhard Exp $
  
  TESTS = test-parse
  
  INCLUDES = $(GLIB_CFLAGS) -D'G_LOG_DOMAIN="GEAS-cd"'
  
  AM_YFLAGS = -d
+ 
+ ## FIXME: needed to compile two parsers/scanners in one program
+ AM_CFLAGS = -Dyyin=new_yyin -Dyyout=new_yyout -Dyylex=new_yylex \
+             -Dyyrestart=new_yyrestart -Dyywrap=new_yywrap \
+             -Dyy_create_buffer=new_yy_create_buffer \
+             -Dyy_init_buffer=new_yy_init_buffer \
+             -Dyy_switch_to_buffer=new_yy_switch_to_buffer \
+             -Dyy_load_buffer_state=new_yy_load_buffer_state \
+             -Dyy_flush_buffer=new_yy_flush_buffer \
+             -Dyy_delete_buffer=new_yy_delete_buffer \
+             -Dyy_scan_buffer=new_yy_scan_buffer \
+             -Dyy_scan_string=new_yy_scan_string \
+             -Dyy_scan_bytes=new_yy_scan_bytes \
+             -Dyyparse=new_yyparse
  
  # 
-----------------------------------------------------------------------------
  
Index: gnue/geas/src/geas-server.c
diff -c gnue/geas/src/geas-server.c:1.111 gnue/geas/src/geas-server.c:1.112
*** gnue/geas/src/geas-server.c:1.111   Wed Nov 14 16:17:14 2001
--- gnue/geas/src/geas-server.c Sun Dec  2 05:58:39 2001
***************
*** 19,25 ****
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
!   $Id: geas-server.c,v 1.111 2001/11/14 21:17:14 reinhard Exp $
   
  */
  
--- 19,25 ----
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
!   $Id: geas-server.c,v 1.112 2001/12/02 10:58:39 reinhard Exp $
   
  */
  
***************
*** 51,56 ****
--- 51,58 ----
  #include "globals.h"
  #include "geas-skeleton.h"
  
+ #include "classdef/classdef.h"
+ #include "classdef/read-gcd.h"
  #include "config/configuration.h"
  #include "objectcache/objectcache.h"
  #include "objectstore/objectstore.h"
***************
*** 150,155 ****
--- 152,171 ----
  
  #endif
  
+ /* ------------------------------------------------------------------------- 
*\
+  * Initialize the classdef module and load the class definitions
+ \* ------------------------------------------------------------------------- 
*/
+ static void
+ init_classdef (void)
+ {
+   const char *directory;
+ 
+   directory = (char *)get_global_option_str (configdata, "classdir", ".");
+ 
+   geas_cd_init ();
+   geas_cd_read_gcd (directory);
+ }
+ 
  /* Public functions */
  
  /** \brief Main function
***************
*** 258,265 ****
      reserve_sql_words (filename, OQL_DBTYPE_POSTGRESQL);
  
    /* note: server side classes must be first, so can be inherited from */
!   message ("Load business class definitions");
    load_class_files ();
  
    /* note: classes must be loaded */
    message ("Initialising business class method handling.");
--- 274,284 ----
      reserve_sql_words (filename, OQL_DBTYPE_POSTGRESQL);
  
    /* note: server side classes must be first, so can be inherited from */
!   message ("Load business class definitions (old parser)");
    load_class_files ();
+ 
+   message ("Load business class definitions (new parser)");
+   init_classdef ();
  
    /* note: classes must be loaded */
    message ("Initialising business class method handling.");