Skip to content

Distribute and run LLMs with a single file.

Improve SQL syntax highlighting

Justine Tunney01ac87a121b8
diff --git a/llamafile/highlight.h b/llamafile/highlight.h
index b9b1dc36..e7df0a5e 100644
--- a/llamafile/highlight.h
+++ b/llamafile/highlight.h
@@ -82,6 +82,7 @@ is_keyword_f is_keyword_pascal_builtin;
is_keyword_f is_keyword_go;
is_keyword_f is_keyword_go_type;
is_keyword_f is_keyword_sql;
+is_keyword_f is_keyword_sql_type;
is_keyword_f is_keyword_php;
is_keyword_f is_keyword_php_constant;
is_keyword_f is_keyword_csharp;
diff --git a/llamafile/highlight_sql.cpp b/llamafile/highlight_sql.cpp
index c3bccd8b..8621b1cd 100644
--- a/llamafile/highlight_sql.cpp
+++ b/llamafile/highlight_sql.cpp
@@ -76,6 +76,10 @@ void HighlightSql::feed(std::string *r, std::string_view input) {
*r += HI_KEYWORD;
*r += word_;
*r += HI_RESET;
+ } else if (is_keyword_sql_type(word_.data(), word_.size())) {
+ *r += HI_TYPE;
+ *r += word_;
+ *r += HI_RESET;
} else {
*r += word_;
}
@@ -176,6 +180,10 @@ void HighlightSql::flush(std::string *r) {
*r += HI_KEYWORD;
*r += word_;
*r += HI_RESET;
+ } else if (is_keyword_sql_type(word_.data(), word_.size())) {
+ *r += HI_TYPE;
+ *r += word_;
+ *r += HI_RESET;
} else {
*r += word_;
}
diff --git a/llamafile/is_keyword_sql.gperf b/llamafile/is_keyword_sql.gperf
index 1bb3ba2c..de43bd6d 100644
--- a/llamafile/is_keyword_sql.gperf
+++ b/llamafile/is_keyword_sql.gperf
@@ -61,6 +61,7 @@ ATANH
ATOMIC
AUDIT
AUTHORIZATION
+AUTOINCREMENT
AUX
AUXILIARY
AVE
@@ -72,11 +73,7 @@ BEGIN
BEGIN_FRAME
BEGIN_PARTITION
BETWEEN
-BIGINT
BINARY
-BIT
-BLOB
-BOOLEAN
BOTH
BREADTH
BREAK
@@ -87,9 +84,6 @@ BUFFERPOOL
BULK
BUT
BY
-BYTE
-BYTEINT
-BYTES
CALL
CALLED
CAPTURE
@@ -106,9 +100,7 @@ CD
CEIL
CEILING
CHANGE
-CHAR
CHAR2HEXINT
-CHARACTER
CHARACTERS
CHARACTER_LENGTH
CHARS
@@ -188,7 +180,6 @@ DATA
DATABASE
DATABASES
DATABLOCKSIZE
-DATE
DATEFORM
DAY
DAYS
@@ -201,7 +192,6 @@ DBINFO
DEALLOCATE
DEC
DECFLOAT
-DECIMAL
DECLARE
DEFAULT
DEFERRABLE
@@ -236,7 +226,6 @@ DIV
DO
DOCUMENT
DOMAIN
-DOUBLE
DROP
DSSIZE
DUAL
@@ -292,9 +281,6 @@ FILTER
FINAL
FIRST
FIRST_VALUE
-FLOAT
-FLOAT4
-FLOAT8
FLOOR
FOR
FORCE
@@ -377,11 +363,9 @@ INT2
INT3
INT4
INT8
-INTEGER
INTEGERDATE
INTERSECT
INTERSECTION
-INTERVAL
INTO
IO_AFTER_GTIDS
IO_BEFORE_GTIDS
@@ -476,9 +460,6 @@ MAXIMUM
MAXVALUE
MCHARACTERS
MDIFF
-MEDIUMBLOB
-MEDIUMINT
-MEDIUMTEXT
MEMBER
MERGE
METHOD
@@ -538,8 +519,6 @@ NULL
NULLIF
NULLIFZERO
NULLS
-NUMBER
-NUMERIC
NUMPARTS
OBID
OBJECT
@@ -613,7 +592,6 @@ POSITION_REGEX
POSTFIX
POWER
PRECEDES
-PRECISION
PREFIX
PREORDER
PREPARE
@@ -651,7 +629,6 @@ READ
READS
READTEXT
READ_WRITE
-REAL
RECONFIGURE
RECURSIVE
REF
@@ -764,7 +741,6 @@ SINH
SIZE
SKEW
SKIP
-SMALLINT
SOME
SOUNDEX
SOURCE
@@ -834,13 +810,8 @@ TEXTSIZE
THAN
THEN
THRESHOLD
-TIME
-TIMESTAMP
TIMEZONE_HOUR
TIMEZONE_MINUTE
-TINYBLOB
-TINYINT
-TINYTEXT
TITLE
TO
TOP
@@ -894,14 +865,12 @@ VALUES
VALUE_OF
VARBINARY
VARBYTE
-VARCHAR
VARCHAR2
VARCHARACTER
VARGRAPHIC
VARIABLE
VARIADIC
VARIANT
-VARYING
VAR_POP
VAR_SAMP
VCAT
diff --git a/llamafile/is_keyword_sql_type.gperf b/llamafile/is_keyword_sql_type.gperf
new file mode 100644
index 00000000..de811bd5
--- /dev/null
+++ b/llamafile/is_keyword_sql_type.gperf
@@ -0,0 +1,50 @@
+%{
+#include <string.h>
+#include <libc/str/tab.h>
+#define GPERF_DOWNCASE
+%}
+%pic
+%ignore-case
+%compare-strncmp
+%language=ANSI-C
+%readonly-tables
+%define lookup-function-name is_keyword_sql_type
+%%
+BIGINT
+BIGSERIAL
+BIT
+BLOB
+BOOLEAN
+BYTE
+BYTEINT
+BYTES
+CHAR
+CHARACTER
+DATE
+DATETIME
+DECIMAL
+DOUBLE
+FLOAT
+FLOAT4
+FLOAT8
+INTEGER
+INTERVAL
+MEDIUMBLOB
+MEDIUMINT
+MEDIUMTEXT
+NATIVE
+NUMBER
+NUMERIC
+PRECISION
+REAL
+SERIAL
+SMALLINT
+SMALLSERIAL
+TEXT
+TIME
+TIMESTAMP
+TINYBLOB
+TINYINT
+TINYTEXT
+VARCHAR
+VARYING