Commit b64cc7ba authored by bguillaum's avatar bguillaum

rename grew_utils -> libgrew_utils to avoid conflict with grew code

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@8128 7838e531-6607-4d57-9587-6c381814729c
parent 5699a5ca
PRE_FILES_DEP = grew_utils grew_ast
PRE_FILES_DEP = libgrew_utils grew_ast
PRE_FILES_CMO = $(PRE_FILES_DEP:%=%.cmo)
PRE_FILES_CMX = $(PRE_FILES_DEP:%=%.cmx)
......@@ -19,8 +19,8 @@ PARSER_CMX = $(PARSER_DEP:%=%.cmx)
.PHONY: parser
all: grew_utils.cmx grew_ast.cmx parser grew test
byte: grew_utils.cmo grew_ast.cmo parser.byte grew.byte test.byte
all: libgrew_utils.cmx grew_ast.cmx parser grew test
byte: libgrew_utils.cmo grew_ast.cmo parser.byte grew.byte test.byte
include ../config/Makefile
......@@ -109,25 +109,25 @@ grew_core.cmx: $(GREW_CORE_CMX) parser_opt grew_core.cmi grew_core.ml
$(OCAMLOPT) $(OPT_FLAGS) -c $(DEPENDS_DIR) $(GREW_CORE_CMX) grew_core.ml
################################################################################
###### grew_utils.ml ##############################################################
GREW_UTILS_DEP =
GREW_UTILS_CMI = $(GREW_UTILS_DEP:%=%.cmi)
GREW_UTILS_CMO = $(GREW_UTILS_DEP:%=%.cmo)
GREW_UTILS_CMX = $(GREW_UTILS_DEP:%=%.cmx)
###### libgrew_utils.ml ##############################################################
LIBGREW_UTILS_DEP =
LIBGREW_UTILS_CMI = $(LIBGREW_UTILS_DEP:%=%.cmi)
LIBGREW_UTILS_CMO = $(LIBGREW_UTILS_DEP:%=%.cmo)
LIBGREW_UTILS_CMX = $(LIBGREW_UTILS_DEP:%=%.cmx)
grew_utils.cmi: $(GREW_UTILS_CMI) grew_utils.mli
$(OCAMLC) -c grew_utils.mli
libgrew_utils.cmi: $(LIBGREW_UTILS_CMI) libgrew_utils.mli
$(OCAMLC) -c libgrew_utils.mli
grew_utils.cmo: $(GREW_UTILS_CMO) grew_utils.cmi grew_utils.ml
$(OCAMLC) $(BYTE_FLAGS) -c $(DEPENDS_DIR) grew_utils.ml
libgrew_utils.cmo: $(LIBGREW_UTILS_CMO) libgrew_utils.cmi libgrew_utils.ml
$(OCAMLC) $(BYTE_FLAGS) -c $(DEPENDS_DIR) libgrew_utils.ml
grew_utils.cmx: $(GREW_UTILS_CMX) grew_utils.cmi grew_utils.ml
$(OCAMLOPT) $(OPT_FLAGS) -c $(DEPENDS_DIR) grew_utils.ml
libgrew_utils.cmx: $(LIBGREW_UTILS_CMX) libgrew_utils.cmi libgrew_utils.ml
$(OCAMLOPT) $(OPT_FLAGS) -c $(DEPENDS_DIR) libgrew_utils.ml
################################################################################
###### grew_ast.ml ##############################################################
GREW_AST_DEP = grew_utils
GREW_AST_DEP = libgrew_utils
GREW_AST_CMI = $(GREW_AST_DEP:%=%.cmi)
GREW_AST_CMO = $(GREW_AST_DEP:%=%.cmo)
GREW_AST_CMX = $(GREW_AST_DEP:%=%.cmx)
......@@ -144,7 +144,7 @@ grew_ast.cmx: $(GREW_AST_CMX) grew_ast.cmi grew_ast.ml
###### grew_html.ml ##############################################################
GREW_HTML_DEP = grew_utils grew_ast grew_rule grew_grs
GREW_HTML_DEP = libgrew_utils grew_ast grew_rule grew_grs
GREW_HTML_CMI = $(GREW_HTML_DEP:%=%.cmi)
GREW_HTML_CMO = $(GREW_HTML_DEP:%=%.cmo)
GREW_HTML_CMX = $(GREW_HTML_DEP:%=%.cmx)
......@@ -160,7 +160,7 @@ grew_html.cmx: $(GREW_HTML_CMX) grew_html.cmi grew_html.ml
################################################################################
###### grew_fs.ml ##############################################################
GREW_FS_DEP = grew_utils grew_ast
GREW_FS_DEP = libgrew_utils grew_ast
GREW_FS_CMI = $(GREW_FS_DEP:%=%.cmi)
GREW_FS_CMO = $(GREW_FS_DEP:%=%.cmo)
GREW_FS_CMX = $(GREW_FS_DEP:%=%.cmx)
......@@ -177,7 +177,7 @@ grew_fs.cmx: $(GREW_FS_CMX) grew_fs.cmi grew_fs.ml
###### grew_edge.ml ##############################################################
GREW_EDGE_DEP = grew_utils grew_ast
GREW_EDGE_DEP = libgrew_utils grew_ast
GREW_EDGE_CMI = $(GREW_EDGE_DEP:%=%.cmi)
GREW_EDGE_CMO = $(GREW_EDGE_DEP:%=%.cmo)
GREW_EDGE_CMX = $(GREW_EDGE_DEP:%=%.cmx)
......@@ -194,7 +194,7 @@ grew_edge.cmx: $(GREW_EDGE_CMX) grew_edge.cmi grew_edge.ml
###### grew_node.ml ##############################################################
GREW_NODE_DEP = grew_utils grew_ast grew_fs grew_edge
GREW_NODE_DEP = libgrew_utils grew_ast grew_fs grew_edge
GREW_NODE_CMI = $(GREW_NODE_DEP:%=%.cmi)
GREW_NODE_CMO = $(GREW_NODE_DEP:%=%.cmo)
GREW_NODE_CMX = $(GREW_NODE_DEP:%=%.cmx)
......@@ -211,7 +211,7 @@ grew_node.cmx: $(GREW_NODE_CMX) grew_node.cmi grew_node.ml
###### grew_graph.ml ##############################################################
GREW_GRAPH_DEP = grew_utils grew_ast grew_command grew_edge grew_fs grew_node
GREW_GRAPH_DEP = libgrew_utils grew_ast grew_command grew_edge grew_fs grew_node
GREW_GRAPH_CMI = $(GREW_GRAPH_DEP:%=%.cmi)
GREW_GRAPH_CMO = $(GREW_GRAPH_DEP:%=%.cmo)
GREW_GRAPH_CMX = $(GREW_GRAPH_DEP:%=%.cmx)
......@@ -245,7 +245,7 @@ grew_types.cmx: $(GREW_TYPES_CMX) grew_types.cmi grew_types.ml
###### grew_command.ml ##############################################################
GREW_COMMAND_DEP = grew_utils grew_ast grew_edge grew_fs
GREW_COMMAND_DEP = libgrew_utils grew_ast grew_edge grew_fs
GREW_COMMAND_CMI = $(GREW_COMMAND_DEP:%=%.cmi)
GREW_COMMAND_CMO = $(GREW_COMMAND_DEP:%=%.cmo)
GREW_COMMAND_CMX = $(GREW_COMMAND_DEP:%=%.cmx)
......@@ -262,7 +262,7 @@ grew_command.cmx: $(GREW_COMMAND_CMX) grew_command.cmi grew_command.ml
###### grew_rule.ml ##############################################################
GREW_RULE_DEP = grew_utils grew_ast grew_command grew_edge grew_fs grew_node grew_types grew_graph
GREW_RULE_DEP = libgrew_utils grew_ast grew_command grew_edge grew_fs grew_node grew_types grew_graph
GREW_RULE_CMI = $(GREW_RULE_DEP:%=%.cmi)
GREW_RULE_CMO = $(GREW_RULE_DEP:%=%.cmo)
GREW_RULE_CMX = $(GREW_RULE_DEP:%=%.cmx)
......@@ -287,7 +287,7 @@ endif
###### grew_grs.ml ##############################################################
GREW_GRS_DEP = grew_utils grew_edge grew_types grew_graph grew_rule
GREW_GRS_DEP = libgrew_utils grew_edge grew_types grew_graph grew_rule
GREW_GRS_CMI = $(GREW_GRS_DEP:%=%.cmi)
GREW_GRS_CMO = $(GREW_GRS_DEP:%=%.cmo)
GREW_GRS_CMX = $(GREW_GRS_DEP:%=%.cmx)
......
open Printf
open Log
open Grew_utils
open Libgrew_utils
module Ast = struct
let dot_split s = Str.split (Str.regexp "\\.") s
......
open Grew_utils
open Libgrew_utils
module Ast : sig
type feature_name = string (* cat, num, ... *)
......
open Printf
open Log
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_edge
open Grew_fs
......
open Grew_ast
open Grew_utils
open Libgrew_utils
open Grew_edge
(* ==================================================================================================== *)
......
open Log
open Printf
open Grew_utils
open Libgrew_utils
open Grew_ast
......
open Grew_utils
open Libgrew_utils
open Grew_ast
(* ================================================================================ *)
......
open Printf
open Log
open Grew_utils
open Libgrew_utils
open Grew_ast
......
open Grew_utils
open Libgrew_utils
open Grew_ast
module Domain: sig
......
open Printf
open Log
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_edge
open Grew_fs
......
......@@ -2,7 +2,7 @@ open Grew_ast
open Grew_fs
open Grew_edge
open Grew_node
open Grew_utils
open Libgrew_utils
open Grew_command
(* ==================================================================================================== *)
......
......@@ -2,7 +2,7 @@ open Printf
open Log
open Grew_fs
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_edge
open Grew_command
......
open Grew_utils
open Libgrew_utils
open Grew_graph
open Grew_rule
open Grew_ast
......
open Printf
open Log
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_graph
open Grew_rule
......
open Printf
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_edge
open Grew_fs
......
open Grew_utils
open Libgrew_utils
open Grew_fs
open Grew_edge
open Grew_ast
......
open Log
open Printf
open Grew_utils
open Libgrew_utils
open Grew_ast
open Grew_edge
open Grew_fs
......
open Grew_utils
open Libgrew_utils
open Grew_graph
open Grew_command
open Grew_edge
......
......@@ -4,7 +4,7 @@ open Printf
open Log
open Grew_fs
open Grew_utils
open Libgrew_utils
open Grew_graph
open Grew_rule
open Grew_grs
......@@ -28,7 +28,6 @@ exception Run of string * (string * int) option
exception Bug of string * (string * int) option
let handle ?(name="") ?(file="No file defined") fct () =
(* Printf.printf " ==========> %s ...%!" name; *)
try fct () with
(* Raise again already catched exceptions *)
| Parsing_err msg -> raise (Parsing_err msg)
......
(** {2 Grew's core} *)
open Grew_utils
open Libgrew_utils
open Grew_graph
open Grew_rule
open Grew_grs
......
......@@ -11,15 +11,15 @@ parser_global.cmx: parser_global.ml
$(OCAMLOPT) -c $(OPT_FLAGS) parser_global.ml
gr_grs_parser.ml: gr_grs_parser.mly
menhir --infer --ocamlc "ocamlc -c -I .. grew_utils.cmo grew_ast.cmo parser_global.cmo" gr_grs_parser.mly
menhir --infer --ocamlc "ocamlc -c -I .. libgrew_utils.cmo grew_ast.cmo parser_global.cmo" gr_grs_parser.mly
gr_grs_parser.cmx: gr_grs_parser.ml ../grew_utils.cmx ../grew_ast.cmx parser_global.cmo
$(OCAMLOPT) -c $(OPT_FLAGS) -I .. grew_utils.cmx grew_ast.cmx gr_grs_parser.mli
$(OCAMLOPT) -c $(OPT_FLAGS) -I .. grew_utils.cmx grew_ast.cmx gr_grs_parser.ml
gr_grs_parser.cmx: gr_grs_parser.ml ../libgrew_utils.cmx ../grew_ast.cmx parser_global.cmo
$(OCAMLOPT) -c $(OPT_FLAGS) -I .. libgrew_utils.cmx grew_ast.cmx gr_grs_parser.mli
$(OCAMLOPT) -c $(OPT_FLAGS) -I .. libgrew_utils.cmx grew_ast.cmx gr_grs_parser.ml
gr_grs_parser.cmo: gr_grs_parser.ml ../grew_utils.cmo ../grew_ast.cmx parser_global.cmo
$(OCAMLC) -c $(BYTE_FLAGS) -I .. grew_utils.cmo grew_ast.cmo gr_grs_parser.mli
$(OCAMLC) -c $(BYTE_FLAGS) -I .. grew_utils.cmo grew_ast.cmo gr_grs_parser.ml
gr_grs_parser.cmo: gr_grs_parser.ml ../libgrew_utils.cmo ../grew_ast.cmx parser_global.cmo
$(OCAMLC) -c $(BYTE_FLAGS) -I .. libgrew_utils.cmo grew_ast.cmo gr_grs_parser.mli
$(OCAMLC) -c $(BYTE_FLAGS) -I .. libgrew_utils.cmo grew_ast.cmo gr_grs_parser.ml
lexer.ml: lexer.mll
ocamllex lexer.mll
......
......@@ -2,7 +2,7 @@
open Grew_ast
open Grew_utils
open Libgrew_utils
(* Some intermediate sum types used in sub-functions when building the ast *)
type pat_item =
......
open Grew_utils
open Libgrew_utils
open Grew_ast
module Grew_parser = struct
......
......@@ -2,7 +2,7 @@
{
open Printf
open Log
open Grew_utils
open Libgrew_utils
open Grew_ast
open Gr_grs_parser
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment