Mercurial > hg > c2html / changeset

     1.1 --- a/src/c2html.c	Tue Aug 23 17:31:15 2016 +0200
     1.2 +++ b/src/c2html.c	Thu Aug 25 11:30:30 2016 +0200
     1.3 @@ -53,7 +53,7 @@
     1.4      ucx_buffer_putc(dest, '\n');
     1.5  }
     1.6  
     1.7 -int formatlines(highlighter_func highlighter,
     1.8 +void formatlines(highlighter_func highlighter,
     1.9          UcxList *in, write_func out, void *stream, int showlineno) {
    1.10      
    1.11      /* compute width of line numbering */
    1.12 @@ -68,7 +68,8 @@
    1.13      /* allocate line buffer */
    1.14      UcxBuffer *line = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
    1.15      if(!line) {
    1.16 -        return 1;
    1.17 +        perror("Error allocating line buffer for output");
    1.18 +        return;
    1.19      }
    1.20      
    1.21      /* start monospace formatting */
    1.22 @@ -93,7 +94,7 @@
    1.23          /* process code line */
    1.24          highlighter(sourceline->data, line, &multiline_comment);
    1.25          
    1.26 -        /* write code line and reset buffer */
    1.27 +        /* write code line */
    1.28          out(line->space, 1, line->size, stream);
    1.29      }
    1.30      
    1.31 @@ -102,7 +103,6 @@
    1.32      
    1.33      /* cleanup and return */
    1.34      ucx_buffer_free(line);
    1.35 -    return 0;
    1.36  }
    1.37  
    1.38  #define FILEBUF_SIZE 4096

     2.1 --- a/src/ccodegen.c	Tue Aug 23 17:31:15 2016 +0200
     2.2 +++ b/src/ccodegen.c	Thu Aug 25 11:30:30 2016 +0200
     2.3 @@ -128,7 +128,7 @@
     2.4              } else {
     2.5                  if (isstring) {
     2.6                      put_htmlescaped(dest, c);
     2.7 -                } else if (!check_alnumex(c)) {
     2.8 +                } else if (!isalnum(c) && c!='_' && c!='#' && c!='@') {
     2.9                      if (word.length > 0 && word.length < WORDBUF_SIZE) {
    2.10                          int closespan = 1;
    2.11                          sstr_t typesuffix = ST("_t");

     3.1 --- a/src/codegens.h	Tue Aug 23 17:31:15 2016 +0200
     3.2 +++ b/src/codegens.h	Thu Aug 25 11:30:30 2016 +0200
     3.3 @@ -49,7 +49,6 @@
     3.4  void put_htmlescaped(UcxBuffer *dest, char c);
     3.5  void put_htmlescapedstr(UcxBuffer *dest, sstr_t s);
     3.6  
     3.7 -#define check_alnumex(c) (isalnum(c) || c=='_' || c=='#' || c=='@')
     3.8  int check_keyword(sstr_t word, const char** keywords);
     3.9  int check_capsonly(sstr_t word);
    3.10  

     4.1 --- a/src/javacodegen.c	Tue Aug 23 17:31:15 2016 +0200
     4.2 +++ b/src/javacodegen.c	Thu Aug 25 11:30:30 2016 +0200
     4.3 @@ -104,7 +104,7 @@
     4.4              } else {
     4.5                  if (isstring) {
     4.6                      put_htmlescaped(dest, c);
     4.7 -                } else if (!check_alnumex(c)) {
     4.8 +                } else if (!isalnum(c) && c!='_' && c!='#' && c!='@') {
     4.9                      if (word.length > 0 && word.length < WORDBUF_SIZE) {
    4.10                          int closespan = 1;
    4.11                          if (check_keyword(word, jkeywords)) {