added lexers to libtide

diff --git a/.gitignore b/.gitignore
index 47ad0313ce6f0d799d082fd7c834ce725436fe7d..d22483e1f53fdc50aca84ed8dfbc72a4c96f405f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tags
 *.a
 *.bin
 *.byte
+lib/lexers/*.ml

diff --git a/Makefile b/Makefile
index d1b01945ce5e3af4e7be47c8b659a4dfd39420c0..9b1348959c50bd68ab2aa07b99a737dc6df5d654 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ LIBSRCS = \
        lib/buf.ml \
        lib/draw.ml \
        lib/scrollmap.ml \
+       lib/colormap.ml \
        lib/view.ml
 
 TESTSRCS = \
@@ -45,8 +46,12 @@ TESTSRCS = \
        tests/buf_tests.ml \
        tests/misc_tests.ml \
        tests/rope_tests.ml \
+       tests/view_tests.ml \
        tests/scrollmap_tests.ml
 
+LEXERS = \
+       lib/lexers/lex_cpp.ml
+
 LIBOBJS = \
        $(LIBSRCS:.ml=.$(OBJEXT)) \
     lib/x11_prims.o \
@@ -57,7 +62,7 @@ TESTOBJS = $(TESTSRCS:.ml=.$(OBJEXT))
 
 .PHONY: all clean docs deps
 
-all: $(BINS)
+all: $(BINS) lib/lexers/lex_cpp.ml
        ./unittests.$(BINEXT)
 
 clean:
@@ -70,7 +75,7 @@ edit.$(BINEXT): tide.$(LIBEXT) edit.$(OBJEXT)
 unittests.$(BINEXT): tide.$(LIBEXT) $(TESTOBJS) unittests.$(OBJEXT)
 
 # Library targets
-tide.$(LIBEXT): $(LIBOBJS)
+tide.$(LIBEXT): $(LIBOBJS) $(LEXERS:.ml=.$(OBJEXT))
 docs: tide.$(LIBEXT)
        ocamldoc -d docs -html -I lib $(LIBSRCS)
 

diff --git a/deps.mk b/deps.mk
index c72a8ba843f25a041fbf0e7301ffc7825891bff1..75acadc57cfc060b646086a5efb2b75e31dbe110 100644 (file)
--- a/deps.mk
+++ b/deps.mk
@@ -5,6 +5,8 @@ lib/buf.cmx lib/buf.o : lib/rope.cmi lib/rope.cmx lib/misc.cmi lib/misc.cmx lib/
 lib/buf.cmi :
 lib/cfg.cmo lib/cfg.cmi : lib/x11.cmi lib/cfg.ml
 lib/cfg.cmx lib/cfg.o lib/cfg.cmi : lib/x11.cmi lib/x11.cmx lib/cfg.ml
+lib/colormap.cmo lib/colormap.cmi : lib/colormap.ml
+lib/colormap.cmx lib/colormap.o lib/colormap.cmi : lib/colormap.ml
 lib/draw.cmo : lib/x11.cmi lib/cfg.cmi lib/buf.cmi lib/draw.cmi lib/draw.ml
 lib/draw.cmx lib/draw.o : lib/x11.cmi lib/x11.cmx lib/cfg.cmi lib/cfg.cmx lib/buf.cmi lib/buf.cmx lib/draw.cmi lib/draw.ml
 lib/draw.cmi : lib/x11.cmi lib/buf.cmi
@@ -18,8 +20,6 @@ lib/scrollmap.cmx lib/scrollmap.o : lib/draw.cmi lib/draw.cmx lib/buf.cmi lib/bu
 lib/scrollmap.cmi : lib/buf.cmi
 lib/view.cmo lib/view.cmi : lib/scrollmap.cmi lib/draw.cmi lib/buf.cmi lib/view.ml
 lib/view.cmx lib/view.o lib/view.cmi : lib/scrollmap.cmi lib/scrollmap.cmx lib/draw.cmi lib/draw.cmx lib/buf.cmi lib/buf.cmx lib/view.ml
-lib/view_tests.cmo lib/view_tests.cmi : lib/view_tests.ml
-lib/view_tests.cmx lib/view_tests.o lib/view_tests.cmi : lib/view_tests.ml
 lib/x11.cmo lib/x11.cmi : lib/x11.ml
 lib/x11.cmx lib/x11.o lib/x11.cmi : lib/x11.ml
 tests/buf_tests.cmo tests/buf_tests.cmi : tests/buf_tests.ml
@@ -32,5 +32,7 @@ tests/scrollmap_tests.cmo tests/scrollmap_tests.cmi : tests/test.cmi lib/scrollm
 tests/scrollmap_tests.cmx tests/scrollmap_tests.o tests/scrollmap_tests.cmi : tests/test.cmi tests/test.cmx lib/scrollmap.cmi lib/scrollmap.cmx tests/scrollmap_tests.ml
 tests/test.cmo tests/test.cmi : tests/test.ml
 tests/test.cmx tests/test.o tests/test.cmi : tests/test.ml
+tests/view_tests.cmo tests/view_tests.cmi : tests/view_tests.ml
+tests/view_tests.cmx tests/view_tests.o tests/view_tests.cmi : tests/view_tests.ml
 unittests.cmo unittests.cmi : tests/test.cmi tests/scrollmap_tests.cmi tests/rope_tests.cmi tests/misc_tests.cmi tests/buf_tests.cmi unittests.ml
 unittests.cmx unittests.o unittests.cmi : tests/test.cmi tests/test.cmx tests/scrollmap_tests.cmi tests/scrollmap_tests.cmx tests/rope_tests.cmi tests/rope_tests.cmx tests/misc_tests.cmi tests/misc_tests.cmx tests/buf_tests.cmi tests/buf_tests.cmx unittests.ml

diff --git a/lib/colormap.ml b/lib/colormap.ml
new file mode 100644 (file)
index 0000000..ba435a2
--- /dev/null
+++ b/lib/colormap.ml
@@ -0,0 +1,7 @@
+exception Eof
+type style = Normal | Comment | Constant | Keyword | Type
+(*
+    String | Character | Number | Boolean
+  | Variable | Function | Keyword | Operator | PreProcessor | Type
+  | Statement | Special
+*)

diff --git a/lib/lexers/lex_cpp.mll b/lib/lexers/lex_cpp.mll
index b439bb570926b135d64ec569785232a08610b36e..2b19d1dd90117ecc4ef363910dddbdae7b40ed67 100644 (file)
--- a/lib/lexers/lex_cpp.mll
+++ b/lib/lexers/lex_cpp.mll
@@ -1,4 +1,4 @@
-(*{ open Highlight }*)
+{ open Colormap }
 
 (* Line and Block Comments *)
 let ln_cmt = "//" [^ '\r' '\n']*

diff --git a/lib/view_tests.ml b/tests/view_tests.ml
similarity index 100%
rename from lib/view_tests.ml
rename to tests/view_tests.ml