Permalink
Browse files

Adjusted merlin code to embedded typer

We should find a way to retrieve config from main ocaml compiler
  • Loading branch information...
1 parent 9cabb1a commit adb7bd9d6371a5b064d0e3b5c9663cd1bb4f5669 @let-def let-def committed with trefis Feb 2, 2013
View
@@ -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)
View
@@ -0,0 +1,3 @@
+- Add command to parse up to next definition
+- Handle warnings properly
+- Handle arguments in partial let's
View
@@ -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
View
@@ -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
File renamed without changes.
File renamed without changes.
Oops, something went wrong. Retry.

0 comments on commit adb7bd9

Please sign in to comment.