@ 261105.1

230224.1 · 5e1bbbca4983ac00e2dc89e1e2cc85b5916ebad8

added support for Hare

reading declarations

filetypes.conf

@@ -111,6 +111,7 @@ FileMapping = {  { Lang="ascend", Extensions={"a4c"} },  { Lang="actionscript", Extensions={"as"} },  { Lang="express", Extensions={"exp"} },+ { Lang="hare", Extensions={"ha"} },  { Lang="haxe", Extensions={"hx"} },  { Lang="pyrex", Extensions={"pyx"} }, @@ -177,4 +178,3 @@ FileMapping = {  { Lang="php", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?php]] },  { Lang="javascript", Shebang=[[^#!\s*(/usr)?(/local)?/bin/(env\s+)?node]] } }-

gui_files/ext/fileopenfilter.conf

@@ -86,6 +86,7 @@ GDScript (*.gd) Graphviz (*.dot) Groovy (*.groovy *.grv) Haml (*.haml)+Hare (*.ha) Haskell (*.hs *.sbcl) HaskellLHS (*.lhs) haXe (*.hx)

langDefs/hare.lang

new file mode 100644@@ -0,0 +1,47 @@++Description="Hare"++Categories = {"source"}++Digits = [[ (?:0x|0X|0b)[0-9a-fA-F']+|\d*[\.]?\d+(?:[eE][\-\+]\d+)?[iflLuUz]* ]]++Keywords={+  { Id=1,+    List={+      "abort","alloc","append","as","assert","break","case","const","continue","def","defer",+      "delete","else","enum","export","fn","for","free","if","insert","is","len",+      "let","match","null","nullable","offset","return","size","static","switch",+      "type","union","yield", "_"+    }+  },+  { Id=2,+    List= {+      "bool","char","f32","f64","false","i16","i32","i64","i8","int","rune","true","u16","u32","u64","u8",+      "uint","uintptr","void","iconst", "fconst", "rconst", "valist","str","struct"+    }+  },+  { Id=3,+    List= {+      "use"+    }+  },+  { Id=4,+    Regex=[[(\w+)\s*\(]]+  },+}++Strings = {+  Delimiter=[["]],+  Interpolation=[[ \{\} ]]+}++Comments = {+  {+    Block=false,+    Delimiter = { [[//]] }+  }+}++IgnoreCase=false++Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\.|\:|\&|<|>|\!|=|\/|\*|\%|\+|\-|\~|\||\^|\?]]

src/gui-qt/highlight.pro

@@ -4,7 +4,7 @@ TEMPLATE = app INCLUDEPATH += . ../include QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets+QT += widgets  PRECOMPILED_HEADER = precomp.h DEFINES += O2 QT@@ -30,7 +30,7 @@ RESOURCES = highlight-gui.qrc TRANSLATIONS = highlight_de_DE.ts highlight_es_ES.ts highlight_cs_CZ.ts \     highlight_zh_CN.ts highlight_it_IT.ts highlight_fr_FR.ts highlight_bg_BG.ts -QMAKE_CXXFLAGS += -std=c++11+QMAKE_CXXFLAGS += -std=c++17  # If Lua 5.2 is not default on your system yet you have to omit 5.1 here: unix {@@ -73,14 +73,15 @@ win32 {     QMAKE_POST_LINK = F:\upx393w\upx.exe --best --force F:\git\highlight\highlight-gui.exe } -macx-clang {++macx-clang|macx-clang-arm64  {     QMAKE_CC = clang     QMAKE_CXX = clang++     INCLUDEPATH+=/usr/local/Cellar/lua/5.4.4/include/     INCLUDEPATH += ../../include-    INCLUDEPATH+=/usr/local/Cellar/boost/1.78.0_1/include+    INCLUDEPATH+=/usr/local/Cellar/boost/1.80.0/include -    QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13+    QMAKE_MACOSX_DEPLOYMENT_TARGET=12.3     CONFIG += app_bundle     LIBS += -L.. -lhighlight     LIBS += -L/Users/andresimon/MyProjects/lua-5.4.1/src -llua