Adjusted merlin code to embedded typer

We should find a way to retrieve config from main ocaml compiler
ocaml · Feb 3, 2013 · adb7bd9 · adb7bd9
1 parent 9cabb1a
commit adb7bd9
Show file tree

Hide file tree

Showing 25 changed files with 1,235 additions and 38,095 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,11 @@
 include Makefile.config
 
 TARGET = ocamlmerlin.native
-FAKE_CMI = location asttypes longident parsetree clflags syntaxerr misc
 
 DISTNAME = ocamlmerlin-0.1
 DISTFILES = configure Makefile README _tags vim $(wildcard *.ml *.mli *.mly *.mll)
 
-OCAMLBUILD=ocamlbuild
+OCAMLBUILD=ocamlbuild -Is .,typing,parsing,utils
 OCAMLFIND=ocamlfind
 
 all: $(TARGET)

diff --git a/TODO b/TODO
@@ -0,0 +1,3 @@
+- Add command to parse up to next definition
+- Handle warnings properly
+- Handle arguments in partial let's
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 true: use_menhir, use_menhir_table
 
-true: package(menhirLib), package(compiler-libs.bytecomp), package(yojson), package(findlib)
+true: package(menhirLib), package(yojson), package(findlib)
 
 <outline_parser.*>: ext_tokens
diff --git a/extensions.ml b/extensions.ml
@@ -2,7 +2,7 @@ let ident = Ident.create "_"
 
 let parse_sig str =
   let buf = Lexing.from_string str in
-  Chunk_parser.interface Outline_lexer.token buf
+  Chunk_parser.interface Lexer.token buf
 
 let type_sig env sg =
   let sg = Typemod.transl_signature env sg in

diff --git a/outline_lexer.mli → lexer.mli b/outline_lexer.mli → lexer.mli
diff --git a/outline_lexer.mll → lexer.mll b/outline_lexer.mll → lexer.mll