renamed highlight engine script and tweaked some rules

diff --git a/Makefile b/Makefile
index 528df68a8da9fb02e7daf2d372f81e225bd5dd4a..7f57b98f37a3aec1186ebe7460f762ab4c339ad8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,13 +33,13 @@ docs:
 clean:
        find . -name '*.[oad]' -delete
        find . \( -name '*.gcno' -o -name '*.gcda' \) -delete
-       $(RM) pick tide xcpd term tests/libedit
+       $(RM) pick tide xcpd term tests/libedit hl-cpp
        $(RM) $(TEST_BINS)
 
 install: all
        mkdir -p $(PREFIX)/bin
        cp -f tide $(PREFIX)/bin
-       cp -f tide-hl $(PREFIX)/bin
+       cp -f tide-hl.rb $(PREFIX)/bin
        cp -f pick $(PREFIX)/bin
        cp -f xcpd $(PREFIX)/bin
        cp -f pickfile $(PREFIX)/bin
@@ -47,7 +47,7 @@ install: all
 
 uninstall:
        rm -f $(PREFIX)/bin/tide
-       rm -f $(PREFIX)/bin/tide-hl
+       rm -f $(PREFIX)/bin/tide-hl.rb
        rm -f $(PREFIX)/bin/pick
        rm -f $(PREFIX)/bin/xcpd
        rm -f $(PREFIX)/bin/pickfile

diff --git a/lib/colors.c b/lib/colors.c
index d90e19f51d0b0215ee052ce01af07f591abf2dbe..3b8d703211d1c6b853c240029a341028b4de68cd 100644 (file)
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -15,7 +15,7 @@ static int read_byte(void);
 static int read_num(void);
 
 void colors_init(char* path) {
-    cmdspawn((char*[]){ "tide-hl", path, NULL }, &ChildIn, &ChildOut);
+    cmdspawn((char*[]){ "tide-hl.rb", path, NULL }, &ChildIn, &ChildOut);
 }
 
 SyntaxSpan* colors_scan(SyntaxSpan* spans, Buf* buf, size_t beg, size_t end) {

diff --git a/tide-hl b/tide-hl.rb
similarity index 98%
rename from tide-hl
rename to tide-hl.rb
index 3ec9d0cd5452d76f089a7c9e0b14bd52b679a389..08d81f792e0bbea292aab663edaf19b468dc1911 100755 (executable)
--- a/tide-hl
+++ b/tide-hl.rb
@@ -109,7 +109,7 @@ languages({
 language "C" do
   types = Set.new %w[
     bool short int long unsigned signed char size_t
-    void extern static inline struct typedef union
+    void extern static inline struct typedef union volatile
     int8_t int16_t int32_t int64_t uint8_t uint16_t uint32_t uint64_t
   ]