# HG changeset patch # User Mike Becker # Date 1472212159 -7200 # Node ID 33ded421c512375f9e694ba62b6d217b7ac94abe # Parent f25ba6fd7a0864c1e94ca902c5caae699c203b41 merges all highlighter functions into one highlighter module diff -r f25ba6fd7a08 -r 33ded421c512 Makefile --- a/Makefile Thu Aug 25 12:16:57 2016 +0200 +++ b/Makefile Fri Aug 26 13:49:19 2016 +0200 @@ -33,9 +33,7 @@ SRC = c2html.c -SRC += codegens.c -SRC += ccodegen.c -SRC += javacodegen.c +SRC += highlighter.c SRC += ucx/allocator.c SRC += ucx/buffer.c SRC += ucx/list.c diff -r f25ba6fd7a08 -r 33ded421c512 src/c2html.c --- a/src/c2html.c Thu Aug 25 12:16:57 2016 +0200 +++ b/src/c2html.c Fri Aug 26 13:49:19 2016 +0200 @@ -26,7 +26,11 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + +#include + #include "c2html.h" +#include "highlighter.h" #include "ucx/list.h" @@ -45,14 +49,6 @@ "\n"); } -static void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { - while (*src && *src != '\n') { - put_htmlescaped(dest, *src); - src++; - } - ucx_buffer_putc(dest, '\n'); -} - void formatlines(highlighter_func highlighter, UcxList *in, write_func out, void *stream, int showlineno) { diff -r f25ba6fd7a08 -r 33ded421c512 src/c2html.h --- a/src/c2html.h Thu Aug 25 12:16:57 2016 +0200 +++ b/src/c2html.h Fri Aug 26 13:49:19 2016 +0200 @@ -30,12 +30,6 @@ #ifndef C2HTML_H #define C2HTML_H -#include -#include - -#include "javacodegen.h" -#include "ccodegen.h" - #ifdef __cplusplus extern "C" { #endif diff -r f25ba6fd7a08 -r 33ded421c512 src/ccodegen.c --- a/src/ccodegen.c Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "ccodegen.h" - -const char* ckeywords[] = { - "auto", "break", "case", "char", "const", "continue", "default", "do", - "double", "else", "enum", "extern", "float", "for", "goto", "if", "int", - "long", "register", "return", "short", "signed", "sizeof", "static", - "struct", "switch", "typedef", "union", "unsigned", "void", "volatile", - "while", NULL -}; - -void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { - /* reset buffers without clearing them */ - hd->primary_buffer->size = hd->primary_buffer->pos = 0; - hd->secondary_buffer->size = hd->secondary_buffer->pos = 0; - - /* alias the buffers for better handling */ - UcxBuffer *wbuf = hd->primary_buffer; - UcxBuffer *ifilebuf = hd->secondary_buffer; - - /* local information */ - size_t sp = (size_t)-1; - int isstring = 0, iscomment = 0, isinclude = 0, parseinclude = 0; - char quote = '\0'; - int isescaping = 0; - - /* continue a multi line comment highlighting */ - if (hd->multiline_comment) { - iscomment = 1; - ucx_buffer_puts(dest, ""); - } - - char c; - do { - c = src[++sp]; - if (!c) break; - - /* comments */ - if (!isstring && c == '/') { - if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') { - iscomment = 0; - hd->multiline_comment = 0; - ucx_buffer_puts(dest, "/"); - continue; - } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) { - iscomment = 1; - hd->multiline_comment = (src[sp+1] == '*'); - ucx_buffer_puts(dest, ""); - } - } - - if (iscomment) { - if (c == '\n') { - ucx_buffer_puts(dest, "\n"); - } else { - put_htmlescaped(dest, c); - } - } else if (isinclude) { - if (c == '<') { - ucx_buffer_puts(dest, - "<"); - } else if (c == '\"') { - if (parseinclude) { - ucx_buffer_puts(dest, "\">"); - ucx_buffer_write(ifilebuf->space, 1, ifilebuf->size, dest); - ucx_buffer_puts(dest, "\""); - parseinclude = 0; - } else { - ucx_buffer_puts(dest, - "') { - ucx_buffer_puts(dest, ">"); - } else { - if (parseinclude) { - ucx_buffer_putc(ifilebuf, c); - } - put_htmlescaped(dest, c); - } - } else { - /* strings */ - if (!isescaping && (c == '\'' || c == '\"')) { - if (isstring) { - put_htmlescaped(dest, c); - if (c == quote) { - isstring = 0; - ucx_buffer_puts(dest, ""); - } else { - put_htmlescaped(dest, c); - } - } else { - isstring = 1; - quote = c; - ucx_buffer_puts(dest, ""); - put_htmlescaped(dest, c); - } - } else { - if (isstring) { - put_htmlescaped(dest, c); - } else if (!isalnum(c) && c!='_' && c!='#') { - /* write buffered word, if any */ - if (wbuf->size > 0) { - sstr_t word = sstrn(wbuf->space, wbuf->size); - int closespan = 1; - sstr_t typesuffix = ST("_t"); - if (check_keyword(word, ckeywords)) { - ucx_buffer_puts(dest, - ""); - } else if (sstrsuffix(word, typesuffix)) { - ucx_buffer_puts(dest, - ""); - } else if (word.ptr[0] == '#') { - isinclude = !sstrcmp(word, S("#include")); - ucx_buffer_puts(dest, - ""); - } else if (check_capsonly(word)) { - ucx_buffer_puts(dest, - ""); - } else { - closespan = 0; - } - put_htmlescapedstr(dest, word); - if (closespan) { - ucx_buffer_puts(dest, ""); - } - } - wbuf->pos = wbuf->size = 0; /* reset word buffer */ - - /* write current character */ - put_htmlescaped(dest, c); - } else { - /* buffer the current word */ - ucx_buffer_putc(wbuf, c); - } - } - - isescaping = !isescaping & (c == '\\'); - } - } while (c != '\n'); -} diff -r f25ba6fd7a08 -r 33ded421c512 src/ccodegen.h --- a/src/ccodegen.h Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef CCODEGEN_H -#define CCODEGEN_H - -#include "codegens.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); - -#ifdef __cplusplus -} -#endif - -#endif /* CCODEGEN_H */ - diff -r f25ba6fd7a08 -r 33ded421c512 src/codegens.c --- a/src/codegens.c Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "codegens.h" - -HighlighterData* new_highlighter_data() { - HighlighterData* hd = malloc(sizeof(HighlighterData)); - if (hd == NULL) { - return NULL; - } else { - hd->multiline_comment = 0; - hd->primary_buffer = ucx_buffer_new(NULL, 256, UCX_BUFFER_AUTOEXTEND); - hd->secondary_buffer = ucx_buffer_new(NULL, 32, UCX_BUFFER_AUTOEXTEND); - return hd; - } -} - -void free_highlighter_data(HighlighterData *hd) { - ucx_buffer_free(hd->primary_buffer); - ucx_buffer_free(hd->secondary_buffer); - free(hd); -} - -void put_htmlescaped(UcxBuffer *dest, char c) { - if (c == '>') { - ucx_buffer_puts(dest, ">"); - } else if (c == '<') { - ucx_buffer_puts(dest, "<"); - } else { - ucx_buffer_putc(dest, c); - } -} - -void put_htmlescapedstr(UcxBuffer *dest, sstr_t s) { - for (int i = 0 ; i < s.length ; i++) { - put_htmlescaped(dest, s.ptr[i]); - } -} - -int check_keyword(sstr_t word, const char** keywords) { - for (int i = 0 ; keywords[i] ; i++) { - if (sstrcmp(word, sstr((char*)keywords[i])) == 0) { - return 1; - } - } - return 0; -} - -int check_capsonly(sstr_t word) { - for (size_t i = 0 ; i < word.length ; i++) { - if (!isupper(word.ptr[i]) && !isdigit(word.ptr[i]) - && word.ptr[i] != '_') { - return 0; - } - } - return 1; -} diff -r f25ba6fd7a08 -r 33ded421c512 src/codegens.h --- a/src/codegens.h Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef CODEGENS_H -#define CODEGENS_H - -#include -#include -#include -#include -#include "ucx/string.h" -#include "ucx/buffer.h" -#include "ucx/utils.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int multiline_comment; - UcxBuffer* primary_buffer; - UcxBuffer* secondary_buffer; -} HighlighterData; - -HighlighterData* new_highlighter_data(); -void free_highlighter_data(HighlighterData*); - -typedef void(*highlighter_func)(char*,UcxBuffer*,HighlighterData*); - -void put_htmlescaped(UcxBuffer *dest, char c); -void put_htmlescapedstr(UcxBuffer *dest, sstr_t s); - -int check_keyword(sstr_t word, const char** keywords); -int check_capsonly(sstr_t word); - - -#ifdef __cplusplus -} -#endif - -#endif /* CODEGENS_H */ - diff -r f25ba6fd7a08 -r 33ded421c512 src/highlighter.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/highlighter.c Fri Aug 26 13:49:19 2016 +0200 @@ -0,0 +1,356 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2016 Mike Becker. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "highlighter.h" + +HighlighterData* new_highlighter_data() { + HighlighterData* hd = malloc(sizeof(HighlighterData)); + if (hd == NULL) { + return NULL; + } else { + hd->multiline_comment = 0; + hd->primary_buffer = ucx_buffer_new(NULL, 256, UCX_BUFFER_AUTOEXTEND); + hd->secondary_buffer = ucx_buffer_new(NULL, 32, UCX_BUFFER_AUTOEXTEND); + return hd; + } +} + +void free_highlighter_data(HighlighterData *hd) { + ucx_buffer_free(hd->primary_buffer); + ucx_buffer_free(hd->secondary_buffer); + free(hd); +} + +static void put_htmlescaped(UcxBuffer *dest, char c) { + if (c == '>') { + ucx_buffer_puts(dest, ">"); + } else if (c == '<') { + ucx_buffer_puts(dest, "<"); + } else { + ucx_buffer_putc(dest, c); + } +} + +static void put_htmlescapedstr(UcxBuffer *dest, sstr_t s) { + for (int i = 0 ; i < s.length ; i++) { + put_htmlescaped(dest, s.ptr[i]); + } +} + +static int check_keyword(sstr_t word, const char** keywords) { + for (int i = 0 ; keywords[i] ; i++) { + if (sstrcmp(word, sstr((char*)keywords[i])) == 0) { + return 1; + } + } + return 0; +} + +static int check_capsonly(sstr_t word) { + for (size_t i = 0 ; i < word.length ; i++) { + if (!isupper(word.ptr[i]) && !isdigit(word.ptr[i]) + && word.ptr[i] != '_') { + return 0; + } + } + return 1; +} + +/* Plaintext Highlighter */ + +void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { + while (*src && *src != '\n') { + put_htmlescaped(dest, *src); + src++; + } + ucx_buffer_putc(dest, '\n'); +} + +/* C Highlighter */ + +static const char* ckeywords[] = { + "auto", "break", "case", "char", "const", "continue", "default", "do", + "double", "else", "enum", "extern", "float", "for", "goto", "if", "int", + "long", "register", "return", "short", "signed", "sizeof", "static", + "struct", "switch", "typedef", "union", "unsigned", "void", "volatile", + "while", NULL +}; + +void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { + /* reset buffers without clearing them */ + hd->primary_buffer->size = hd->primary_buffer->pos = 0; + hd->secondary_buffer->size = hd->secondary_buffer->pos = 0; + + /* alias the buffers for better handling */ + UcxBuffer *wbuf = hd->primary_buffer; + UcxBuffer *ifilebuf = hd->secondary_buffer; + + /* local information */ + size_t sp = (size_t)-1; + int isstring = 0, iscomment = 0, isinclude = 0, parseinclude = 0; + char quote = '\0'; + int isescaping = 0; + + /* continue a multi line comment highlighting */ + if (hd->multiline_comment) { + iscomment = 1; + ucx_buffer_puts(dest, ""); + } + + char c; + do { + c = src[++sp]; + if (!c) break; + + /* comments */ + if (!isstring && c == '/') { + if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') { + iscomment = 0; + hd->multiline_comment = 0; + ucx_buffer_puts(dest, "/"); + continue; + } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) { + iscomment = 1; + hd->multiline_comment = (src[sp+1] == '*'); + ucx_buffer_puts(dest, ""); + } + } + + if (iscomment) { + if (c == '\n') { + ucx_buffer_puts(dest, "\n"); + } else { + put_htmlescaped(dest, c); + } + } else if (isinclude) { + if (c == '<') { + ucx_buffer_puts(dest, + "<"); + } else if (c == '\"') { + if (parseinclude) { + ucx_buffer_puts(dest, "\">"); + ucx_buffer_write(ifilebuf->space, 1, ifilebuf->size, dest); + ucx_buffer_puts(dest, "\""); + parseinclude = 0; + } else { + ucx_buffer_puts(dest, + "') { + ucx_buffer_puts(dest, ">"); + } else { + if (parseinclude) { + ucx_buffer_putc(ifilebuf, c); + } + put_htmlescaped(dest, c); + } + } else { + /* strings */ + if (!isescaping && (c == '\'' || c == '\"')) { + if (isstring) { + put_htmlescaped(dest, c); + if (c == quote) { + isstring = 0; + ucx_buffer_puts(dest, ""); + } else { + put_htmlescaped(dest, c); + } + } else { + isstring = 1; + quote = c; + ucx_buffer_puts(dest, ""); + put_htmlescaped(dest, c); + } + } else { + if (isstring) { + put_htmlescaped(dest, c); + } else if (!isalnum(c) && c!='_' && c!='#') { + /* write buffered word, if any */ + if (wbuf->size > 0) { + sstr_t word = sstrn(wbuf->space, wbuf->size); + int closespan = 1; + sstr_t typesuffix = ST("_t"); + if (check_keyword(word, ckeywords)) { + ucx_buffer_puts(dest, + ""); + } else if (sstrsuffix(word, typesuffix)) { + ucx_buffer_puts(dest, + ""); + } else if (word.ptr[0] == '#') { + isinclude = !sstrcmp(word, S("#include")); + ucx_buffer_puts(dest, + ""); + } else if (check_capsonly(word)) { + ucx_buffer_puts(dest, + ""); + } else { + closespan = 0; + } + put_htmlescapedstr(dest, word); + if (closespan) { + ucx_buffer_puts(dest, ""); + } + } + wbuf->pos = wbuf->size = 0; /* reset word buffer */ + + /* write current character */ + put_htmlescaped(dest, c); + } else { + /* buffer the current word */ + ucx_buffer_putc(wbuf, c); + } + } + + isescaping = !isescaping & (c == '\\'); + } + } while (c != '\n'); +} + +/* Java Highlighter */ + +static const char* jkeywords[] = { + "abstract", "continue", "for", "new", "switch", "assert", "default", "goto", + "package", "synchronized", "boolean", "do", "if", "private", "this", + "break", "double", "implements", "protected", "throw", "byte", "else", + "import", "public", "throws", "case", "enum", "instanceof", "return", + "transient", "catch", "extends", "int", "short", "try", "char", "final", + "interface", "static", "void", "class", "finally", "long", "strictfp", + "volatile", "const", "float", "native", "super", "while", NULL +}; + +void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { + /* reset buffers without clearing them */ + hd->primary_buffer->size = hd->primary_buffer->pos = 0; + hd->secondary_buffer->size = hd->secondary_buffer->pos = 0; + + /* alias the buffers for better handling */ + UcxBuffer *wbuf = hd->primary_buffer; + + /* local information */ + size_t sp = (size_t)-1; + int isstring = 0, iscomment = 0, isimport = 0; + char quote = '\0'; + int isescaping = 0; + + if (hd->multiline_comment) { + iscomment = 1; + ucx_buffer_puts(dest, ""); + } + + char c; + do { + c = src[++sp]; + if (!c) break; + + /* comments */ + if (!isstring && c == '/') { + if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') { + iscomment = 0; + hd->multiline_comment = 0; + ucx_buffer_puts(dest, "/"); + continue; + } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) { + iscomment = 1; + hd->multiline_comment = (src[sp+1] == '*'); + ucx_buffer_puts(dest, ""); + } + } + + if (iscomment) { + if (c == '\n') { + ucx_buffer_puts(dest, "\n"); + } else { + put_htmlescaped(dest, c); + } + } else if (isimport) { + /* TODO: local imports */ + } else { + /* strings */ + if (!isescaping && (c == '\'' || c == '\"')) { + if (isstring) { + put_htmlescaped(dest, c); + if (c == quote) { + isstring = 0; + ucx_buffer_puts(dest, ""); + } else { + put_htmlescaped(dest, c); + } + } else { + isstring = 1; + quote = c; + ucx_buffer_puts(dest, + ""); + put_htmlescaped(dest, c); + } + } else { + if (isstring) { + put_htmlescaped(dest, c); + } else if (!isalnum(c) && c!='_' && c!='@') { + /* write buffered word, if any */ + if (wbuf->size > 0) { + sstr_t word = sstrn(wbuf->space, wbuf->size); + int closespan = 1; + if (check_keyword(word, jkeywords)) { + ucx_buffer_puts(dest, + ""); + } else if (isupper(word.ptr[0])) { + ucx_buffer_puts(dest, + ""); + } else if (word.ptr[0] == '@') { + ucx_buffer_puts(dest, + ""); + } else if (check_capsonly(word)) { + ucx_buffer_puts(dest, + ""); + } else { + closespan = 0; + } + put_htmlescapedstr(dest, word); + + if (closespan) { + ucx_buffer_puts(dest, ""); + } + } + wbuf->pos = wbuf->size = 0; /* reset buffer */ + + /* write current character */ + put_htmlescaped(dest, c); + } else { + /* buffer the current word */ + ucx_buffer_putc(wbuf, c); + } + } + + isescaping = !isescaping & (c == '\\'); + } + } while (c != '\n'); +} + diff -r f25ba6fd7a08 -r 33ded421c512 src/highlighter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/highlighter.h Fri Aug 26 13:49:19 2016 +0200 @@ -0,0 +1,65 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2016 Mike Becker. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef CODEGENS_H +#define CODEGENS_H + +#include +#include +#include +#include +#include "ucx/string.h" +#include "ucx/buffer.h" +#include "ucx/utils.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + int multiline_comment; + UcxBuffer* primary_buffer; + UcxBuffer* secondary_buffer; +} HighlighterData; + +HighlighterData* new_highlighter_data(); +void free_highlighter_data(HighlighterData*); + +typedef void(*highlighter_func)(char*,UcxBuffer*,HighlighterData*); + +void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); +void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); +void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); + +#ifdef __cplusplus +} +#endif + +#endif /* CODEGENS_H */ + diff -r f25ba6fd7a08 -r 33ded421c512 src/javacodegen.c --- a/src/javacodegen.c Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,148 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "javacodegen.h" - -const char* jkeywords[] = { - "abstract", "continue", "for", "new", "switch", "assert", "default", "goto", - "package", "synchronized", "boolean", "do", "if", "private", "this", - "break", "double", "implements", "protected", "throw", "byte", "else", - "import", "public", "throws", "case", "enum", "instanceof", "return", - "transient", "catch", "extends", "int", "short", "try", "char", "final", - "interface", "static", "void", "class", "finally", "long", "strictfp", - "volatile", "const", "float", "native", "super", "while", NULL -}; - -void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) { - /* reset buffers without clearing them */ - hd->primary_buffer->size = hd->primary_buffer->pos = 0; - hd->secondary_buffer->size = hd->secondary_buffer->pos = 0; - - /* alias the buffers for better handling */ - UcxBuffer *wbuf = hd->primary_buffer; - - /* local information */ - size_t sp = (size_t)-1; - int isstring = 0, iscomment = 0, isimport = 0; - char quote = '\0'; - int isescaping = 0; - - if (hd->multiline_comment) { - iscomment = 1; - ucx_buffer_puts(dest, ""); - } - - char c; - do { - c = src[++sp]; - if (!c) break; - - /* comments */ - if (!isstring && c == '/') { - if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') { - iscomment = 0; - hd->multiline_comment = 0; - ucx_buffer_puts(dest, "/"); - continue; - } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) { - iscomment = 1; - hd->multiline_comment = (src[sp+1] == '*'); - ucx_buffer_puts(dest, ""); - } - } - - if (iscomment) { - if (c == '\n') { - ucx_buffer_puts(dest, "\n"); - } else { - put_htmlescaped(dest, c); - } - } else if (isimport) { - /* TODO: local imports */ - } else { - /* strings */ - if (!isescaping && (c == '\'' || c == '\"')) { - if (isstring) { - put_htmlescaped(dest, c); - if (c == quote) { - isstring = 0; - ucx_buffer_puts(dest, ""); - } else { - put_htmlescaped(dest, c); - } - } else { - isstring = 1; - quote = c; - ucx_buffer_puts(dest, - ""); - put_htmlescaped(dest, c); - } - } else { - if (isstring) { - put_htmlescaped(dest, c); - } else if (!isalnum(c) && c!='_' && c!='@') { - /* write buffered word, if any */ - if (wbuf->size > 0) { - sstr_t word = sstrn(wbuf->space, wbuf->size); - int closespan = 1; - if (check_keyword(word, jkeywords)) { - ucx_buffer_puts(dest, - ""); - } else if (isupper(word.ptr[0])) { - ucx_buffer_puts(dest, - ""); - } else if (word.ptr[0] == '@') { - ucx_buffer_puts(dest, - ""); - } else if (check_capsonly(word)) { - ucx_buffer_puts(dest, - ""); - } else { - closespan = 0; - } - put_htmlescapedstr(dest, word); - - if (closespan) { - ucx_buffer_puts(dest, ""); - } - } - wbuf->pos = wbuf->size = 0; /* reset buffer */ - - /* write current character */ - put_htmlescaped(dest, c); - } else { - /* buffer the current word */ - ucx_buffer_putc(wbuf, c); - } - } - - isescaping = !isescaping & (c == '\\'); - } - } while (c != '\n'); -} diff -r f25ba6fd7a08 -r 33ded421c512 src/javacodegen.h --- a/src/javacodegen.h Thu Aug 25 12:16:57 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2016 Mike Becker. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef JAVACODEGEN_H -#define JAVACODEGEN_H - -#include "codegens.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); - -#ifdef __cplusplus -} -#endif - -#endif /* JAVACODEGEN_H */ -