Modifications in order to have the datalog directory compile

src/datalog/Makefile.in

+##########################################################################
+#                                                                        #
+#                 ACG development toolkit                                #
+#                                                                        #
+#                  Copyright 2008 INRIA                                  #
+#                                                                        #
+#  More information on "http://acg.gforge.loria.fr/"                     #
+#  License: CeCILL, see the LICENSE file or "http://www.cecill.info"     #
+#  Authors: see the AUTHORS file                                         #
+#                                                                        #
+#                                                                        #
+#                                                                        #
+#                                                                        #
+#  $Rev:: 211                          $:  Revision of last commit       #
+#  $Author:: pogodall                  $:  Author of last commit         #
+#  $Date:: 2008-10-21 17:11:50 +0200 (#$:  Date of last commit           #
+#                                                                        #
+##########################################################################
+
+include ../Makefile.master
+
+###############################
+#                             #
+# Set the following variables #
+#                             #
+###############################
+
+# Used libraries
+LIBS += 
+
+# The corresponding directories
+# (if not in the main ocaml lib directory,
+# ex. -I  +campl4
+LIBDIR = -I +camlp4
+
+# Directories to which the current source files depend on
+PREVIOUS_DIRS = 
+
+# Source files in the right order of dependance
+
+ML = signature.ml string_map.ml int_map.ml int_set.ml program.ml pmcfg.ml pmcfg_to_datalog.ml oriented_pmcfg.ml lexicalizer.ml pmcfg_syn.ml program_printer.ml prefix_correct_program.ml adornment2.ml magic_set_rewritting2.ml kanazawa_transform.ml datalog_solver.ml
+
+EXE_SOURCES = test.ml
+
+####################################
+#                                  #
+# End of the configuration section #
+#                                  #
+####################################
+
+include ../Makefile.common
+

src/datalog/adornment2.ml

+open Signature
+open Program
+open Int_set
+
 module Adornment =
 struct 
   type adornment = Ad of Signature.predicate*((int*bool) list)

src/datalog/datalog_solver.ml

+open Signature
+open Int_map
+open Program
+
 module Datalog_solver =
 struct
 

src/datalog/kanazawa_transform.ml

+open Adornment2
+open Program
+open Signature
+open Prefix_correct_program
+open Program_printer
+open Magic_set_rewritting2
+open Pmcfg
+open Oriented_pmcfg
+open Pmcfg_to_datalog
+
 module Kanazawa_transform = 
   struct
     let is_impermissible n= 

src/datalog/magic_set_rewritting2.ml

+open Adornment2
+open Signature
+open Program
+open Int_map
+
+
 module Magic_set_rewritting = 
 struct
   

src/datalog/oriented_pmcfg.ml

+open Pmcfg
+open Signature
+open String_map
+open Int_map
+open Program
+
+
 module Oriented_pmcfg = 
   struct open PMCFG
 

src/datalog/pmcfg.ml

+open Signature
+open String_map
+open Int_map
+open Program
+
+
 module PMCFG =
 struct
   type argument = Var of int | Val of string

src/datalog/pmcfg_syn.ml

+open Signature
+open String_map
+open Pmcfg
+
 module PMCFG_syn = 
 struct
 (*
@@ -14,7 +18,7 @@ RHS_ARG_LIST -> Ident F_RHS_ARG_LIST
 F_RHS_ARG_LIST -> COMMA RHS_ARG_LIST | RPAR PREMISSES
 *)
 
-  open Lexicalizer
+open Lexicalizer.Lexicalizer
 
 (*The parser*)
 

src/datalog/pmcfg_to_datalog.ml

+open Pmcfg
+open Signature
+open String_map
+open Int_map
+open Program
+
 module PMCFG_to_datalog = 
 struct
   open PMCFG

src/datalog/prefix_correct_program.ml

+open Signature
+open Int_map
+open Program
+open Int_set
+
 module Prefix_correct_program =
 struct
   

src/datalog/program.ml

+open Signature
+open Int_set
+
 module Program =
   struct
     type predicate = Pred of (Signature.predicate*(int list))

src/datalog/program_printer.ml

+open Program
+open Signature
+
 module Program_printer =
   struct
     open Program

src/datalog/test.ml

-#use "signature.ml";;
+(*#use "signature.ml";;
 #use "string_map.ml";;
 #use "int_map.ml";;
 #use "int_set.ml";;
@@ -13,7 +13,13 @@
 #use "adornment2.ml";;
 #use "magic_set_rewritting2.ml";;
 #use "kanazawa_transform.ml";;
-#use "datalog_solver.ml";;
+#use "datalog_solver.ml";;*)
+
+open Pmcfg_syn
+open Kanazawa_transform
+open Program_printer
+open Datalog_solver
+
 (*opening the file containing the grammar, here gram.pmcfg*)
 let ch_in = open_in "kan.pmcfg";;
 (*parsing the grammar*)

src/utils/version.ml

@@ -17,7 +17,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-DEFINE VERSION = "20081120"
+DEFINE VERSION = "20081201"
 
 
 let version = VERSION