Commit cbd504b4 authored by POGODALLA Sylvain's avatar POGODALLA Sylvain
Browse files

Changed token.ml into acg_token.ml to avoid conflicting with camlp4

parent 5eb551a1
......@@ -97,6 +97,7 @@ depend.ps : depend.dot
dot -Tps -o $@ $<
%.dot : $(CMO)
# ocamldoc.opt $(PP) $(LIBDIR) -o $@ -dot $(DEP_FLAG) $(ML)
ocamldoc.opt $(PP) $(LIBDIR) -o $@ -dot $(DEP_FLAG) $(ML)
......
......@@ -97,6 +97,7 @@ depend.ps : depend.dot
dot -Tps -o $@ $<
%.dot : $(CMO)
# @OCAMLDOC@ $(PP) $(LIBDIR) -o $@ -dot $(DEP_FLAG) $(ML)
@OCAMLDOC@ $(PP) $(LIBDIR) -o $@ -dot $(DEP_FLAG) $(ML)
......
......@@ -29,7 +29,7 @@ PREVIOUS_DIRS = ../utils ../logic
# Source files in the right order of dependance
#ML = error.ml abstract_syntax.ml interface.ml environment.ml entry.ml parser.ml lexer.ml data_parsing.ml
ML = error.ml interface.ml environment.ml entry.ml syntactic_data_structures.ml token.ml lexer.ml parser.ml interactive.ml
ML = error.ml interface.ml environment.ml entry.ml syntactic_data_structures.ml acg_token.ml lexer.ml parser.ml interactive.ml
DYP = parser.dyp
CAMLLEX = lexer.mll
......@@ -58,13 +58,14 @@ include ../Makefile.common
# lexer.ml : lexer.mll
# ocamllex.opt $<
parser.ml: ../utils/utils.cmi token.cmi syntactic_data_structures.cmi \
parser.ml: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
lexer.cmo error.cmi environment.cmi entry.cmi \
../logic/abstract_syntax.cmi
parser.cmo: ../utils/utils.cmi token.cmi syntactic_data_structures.cmi \
parser.cmo: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
lexer.cmo error.cmi environment.cmi entry.cmi \
../logic/abstract_syntax.cmi parser.cmi
parser.cmx: ../utils/utils.cmx token.cmx syntactic_data_structures.cmx \
parser.cmx: ../utils/utils.cmx acg_token.cmx syntactic_data_structures.cmx \
lexer.cmx error.cmx environment.cmx entry.cmx \
../logic/abstract_syntax.cmx parser.cmi
parser.ml: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
......@@ -29,7 +29,7 @@ PREVIOUS_DIRS = ../utils ../logic
# Source files in the right order of dependance
#ML = error.ml abstract_syntax.ml interface.ml environment.ml entry.ml parser.ml lexer.ml data_parsing.ml
ML = error.ml interface.ml environment.ml entry.ml syntactic_data_structures.ml token.ml lexer.ml parser.ml interactive.ml
ML = error.ml interface.ml environment.ml entry.ml syntactic_data_structures.ml acg_token.ml lexer.ml parser.ml interactive.ml
DYP = parser.dyp
CAMLLEX = lexer.mll
......@@ -58,14 +58,14 @@ include ../Makefile.common
# lexer.ml : lexer.mll
# @OCAMLLEX@ $<
parser.ml: ../utils/utils.cmi token.cmi syntactic_data_structures.cmi \
parser.ml: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
lexer.cmo error.cmi environment.cmi entry.cmi \
../logic/abstract_syntax.cmi
parser.cmo: ../utils/utils.cmi token.cmi syntactic_data_structures.cmi \
parser.cmo: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
lexer.cmo error.cmi environment.cmi entry.cmi \
../logic/abstract_syntax.cmi parser.cmi
parser.cmx: ../utils/utils.cmx token.cmx syntactic_data_structures.cmx \
parser.cmx: ../utils/utils.cmx acg_token.cmx syntactic_data_structures.cmx \
lexer.cmx error.cmx environment.cmx entry.cmx \
../logic/abstract_syntax.cmx parser.cmi
parser.ml: ../utils/utils.cmi token.cmi syntactic_data_structures.cmi \
parser.ml: ../utils/utils.cmi acg_token.cmi syntactic_data_structures.cmi \
{
open Entry
(* open Parser *)
open Token
open Acg_token
(* open Token*)
......
......@@ -7,8 +7,8 @@
module Env = Utils.StringSet
type token=Token.Token.t
open Token.Token
type token=Acg_token.Token.t
open Acg_token.Token
(* type token=t*)
module Make (E:Environment.Environment_sig) =
......
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