1.1 --- a/src/javacodegen.c Tue Aug 23 15:28:56 2016 +0200
1.2 +++ b/src/javacodegen.c Tue Aug 23 15:55:02 2016 +0200
1.3 @@ -41,18 +41,10 @@
1.4 "volatile", "const", "float", "native", "super", "while", NULL
1.5 };
1.6
1.7 -int check_jtype(char *word, size_t len) {
1.8 - return isupper(word[0]);
1.9 -}
1.10 -
1.11 -int check_jdirective(char *word) {
1.12 - return word[0] == '@';
1.13 -}
1.14 -
1.15 #define memcpy_const(darr,doff,str) memcpy(&(darr[doff]), str, sizeof(str)-1); \
1.16 dp += sizeof(str)-1
1.17
1.18 -void jparseline(char *src, UcxBuffer *destbuf, highlighter_t *hltr) {
1.19 +void jparseline(char *src, UcxBuffer *destbuf, HighlighterData *hltr) {
1.20 /* TODO: workaround for using old code with UcxBuffer */
1.21 char *dest = destbuf->space + destbuf->pos;
1.22
1.23 @@ -119,13 +111,13 @@
1.24 /* interpret word int_t */
1.25 if (wp > 0 && wp < WORDBUF_SIZE) {
1.26 int closespan = 1;
1.27 - if (check_keyword(hltr->word, hltr->keywords)) {
1.28 + if (check_keyword(hltr->word, jkeywords)) {
1.29 memcpy_const(dest, dp,
1.30 "<span class=\"c2html-keyword\">");
1.31 - } else if (hltr->istype(hltr->word, wp)) {
1.32 + } else if (isupper(hltr->word[0])) {
1.33 memcpy_const(dest, dp,
1.34 "<span class=\"c2html-type\">");
1.35 - } else if (hltr->isdirective(hltr->word)) {
1.36 + } else if (hltr->word[0] == '@') {
1.37 memcpy_const(dest, dp,
1.38 "<span class=\"c2html-directive\">");
1.39 } else if (check_capsonly(hltr->word, wp)) {
