From a33a9477521b933018aa546d33b4b30c838cae50 Mon Sep 17 00:00:00 2001 From: Sylvain Pogodalla Date: Wed, 3 Dec 2008 15:34:43 +0000 Subject: [PATCH] Modifications in order to have the datalog directory compile --- src/datalog/Makefile.in | 52 +++++++++++++++++++++++++++ src/datalog/adornment2.ml | 4 +++ src/datalog/datalog_solver.ml | 4 +++ src/datalog/kanazawa_transform.ml | 10 ++++++ src/datalog/magic_set_rewritting2.ml | 6 ++++ src/datalog/oriented_pmcfg.ml | 7 ++++ src/datalog/pmcfg.ml | 6 ++++ src/datalog/pmcfg_syn.ml | 6 +++- src/datalog/pmcfg_to_datalog.ml | 6 ++++ src/datalog/prefix_correct_program.ml | 5 +++ src/datalog/program.ml | 3 ++ src/datalog/program_printer.ml | 3 ++ src/datalog/test.ml | 10 ++++-- src/utils/version.ml | 2 +- 14 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 src/datalog/Makefile.in diff --git a/src/datalog/Makefile.in b/src/datalog/Makefile.in new file mode 100644 index 0000000..8a52f55 --- /dev/null +++ b/src/datalog/Makefile.in @@ -0,0 +1,52 @@ +########################################################################## +# # +# 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 + diff --git a/src/datalog/adornment2.ml b/src/datalog/adornment2.ml index 88c5b71..0137e76 100644 --- a/src/datalog/adornment2.ml +++ b/src/datalog/adornment2.ml @@ -1,3 +1,7 @@ +open Signature +open Program +open Int_set + module Adornment = struct type adornment = Ad of Signature.predicate*((int*bool) list) diff --git a/src/datalog/datalog_solver.ml b/src/datalog/datalog_solver.ml index f815644..b3e0af2 100644 --- a/src/datalog/datalog_solver.ml +++ b/src/datalog/datalog_solver.ml @@ -1,3 +1,7 @@ +open Signature +open Int_map +open Program + module Datalog_solver = struct diff --git a/src/datalog/kanazawa_transform.ml b/src/datalog/kanazawa_transform.ml index 9d7443d..29622f7 100644 --- a/src/datalog/kanazawa_transform.ml +++ b/src/datalog/kanazawa_transform.ml @@ -1,3 +1,13 @@ +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= diff --git a/src/datalog/magic_set_rewritting2.ml b/src/datalog/magic_set_rewritting2.ml index c189939..3ed16e9 100644 --- a/src/datalog/magic_set_rewritting2.ml +++ b/src/datalog/magic_set_rewritting2.ml @@ -1,3 +1,9 @@ +open Adornment2 +open Signature +open Program +open Int_map + + module Magic_set_rewritting = struct diff --git a/src/datalog/oriented_pmcfg.ml b/src/datalog/oriented_pmcfg.ml index 2577829..35d6bb9 100644 --- a/src/datalog/oriented_pmcfg.ml +++ b/src/datalog/oriented_pmcfg.ml @@ -1,3 +1,10 @@ +open Pmcfg +open Signature +open String_map +open Int_map +open Program + + module Oriented_pmcfg = struct open PMCFG diff --git a/src/datalog/pmcfg.ml b/src/datalog/pmcfg.ml index 54b5841..594aea3 100644 --- a/src/datalog/pmcfg.ml +++ b/src/datalog/pmcfg.ml @@ -1,3 +1,9 @@ +open Signature +open String_map +open Int_map +open Program + + module PMCFG = struct type argument = Var of int | Val of string diff --git a/src/datalog/pmcfg_syn.ml b/src/datalog/pmcfg_syn.ml index e6bd1a6..7c27322 100644 --- a/src/datalog/pmcfg_syn.ml +++ b/src/datalog/pmcfg_syn.ml @@ -1,3 +1,7 @@ +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*) diff --git a/src/datalog/pmcfg_to_datalog.ml b/src/datalog/pmcfg_to_datalog.ml index 9aa3d15..64fd4d2 100644 --- a/src/datalog/pmcfg_to_datalog.ml +++ b/src/datalog/pmcfg_to_datalog.ml @@ -1,3 +1,9 @@ +open Pmcfg +open Signature +open String_map +open Int_map +open Program + module PMCFG_to_datalog = struct open PMCFG diff --git a/src/datalog/prefix_correct_program.ml b/src/datalog/prefix_correct_program.ml index 38cdc22..9fa74b4 100644 --- a/src/datalog/prefix_correct_program.ml +++ b/src/datalog/prefix_correct_program.ml @@ -1,3 +1,8 @@ +open Signature +open Int_map +open Program +open Int_set + module Prefix_correct_program = struct diff --git a/src/datalog/program.ml b/src/datalog/program.ml index 1a14e53..6717bbe 100644 --- a/src/datalog/program.ml +++ b/src/datalog/program.ml @@ -1,3 +1,6 @@ +open Signature +open Int_set + module Program = struct type predicate = Pred of (Signature.predicate*(int list)) diff --git a/src/datalog/program_printer.ml b/src/datalog/program_printer.ml index 240f711..fbf2c51 100644 --- a/src/datalog/program_printer.ml +++ b/src/datalog/program_printer.ml @@ -1,3 +1,6 @@ +open Program +open Signature + module Program_printer = struct open Program diff --git a/src/datalog/test.ml b/src/datalog/test.ml index e6de868..1a1fac2 100644 --- a/src/datalog/test.ml +++ b/src/datalog/test.ml @@ -1,4 +1,4 @@ -#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*) diff --git a/src/utils/version.ml b/src/utils/version.ml index 68f1f3d..f25e4cf 100644 --- a/src/utils/version.ml +++ b/src/utils/version.ml @@ -17,7 +17,7 @@ (* *) (**************************************************************************) -DEFINE VERSION = "20081120" +DEFINE VERSION = "20081201" let version = VERSION -- 2.26.2