mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2025-01-01 17:44:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

tcc -E: preserve spaces (partial solution)

Browse Source 
Recently I needed to trim storage space on an embedded distro which has
X.

X depend on cpp which is ~8MB in size as shipped in Debian, so the idea
was to remove cpp and use `tcc -E` instead where appropriate.

I've done this with the following 'hack' put inplace of /usr/bin/cpp :

    #!/bin/sh -e
    TCC=/home/kirr/local/tcc/bin/tcc
    last="${!#}"

    # hack to distinguish between '... -D...'  and '... file'
    if test -r "$last"; then
        exec $TCC -E "$@"
    else
        exec $TCC -E "$@" -
    fi

But the problem turned out to be in `tcc -E` inability to preserve
spaces between tokens. So e.g. the following ~/.Xresources

    XTerm*VT100*foreground: black
    ...

got translated to

    XTerm * VT100 * foreground : black

which is bad, bacause now X don't understand it.

Below is a newbie "fix" for the problem.

It still does not preserve spaces on macro expansion, but since the fix
cures original problem, I think it is at least one step forward.

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
This commit is contained in:
Kirill Smelkov 2009-01-18 16:52:09 +03:00 committed by grischka
parent 6213d4b4b6
commit 00f0932760
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tcc.c
View File

@ -331,6 +331,7 @@ typedef struct CachedInclude {
/* parser */
static struct BufferedFile *file;
static int ch, tok;
static CString tok_spaces; /* spaces before current token */
static CValue tokc;
static CString tokcstr; /* current parsed string, if any */
/* additional informations about token */
@ -3675,6 +3676,7 @@ static inline void next_nomacro1(void)
uint8_t *p, *p1;
unsigned int h;
cstr_reset(&tok_spaces);
p = file->buf_ptr;
redo_no_start:
c = *p;
@ -3684,6 +3686,7 @@ static inline void next_nomacro1(void)
case '\f':
case '\v':
case '\r':
cstr_ccat(&tok_spaces, c);
p++;
goto redo_no_start;
@ -9777,7 +9780,10 @@ static int tcc_compile(TCCState *s1)
}
/* Preprocess the current file */
/* XXX: add line and file infos, add options to preserve spaces */
/* XXX: add line and file infos,
* XXX: add options to preserve spaces (partly done, only spaces in macro are
* not preserved)
*/
static int tcc_preprocess(TCCState *s1)
{
Sym *define_start;
@ -9806,7 +9812,7 @@ static int tcc_preprocess(TCCState *s1)
++line_ref;
token_seen = 0;
} else if (token_seen) {
fputc(' ', s1->outfile);
fwrite(tok_spaces.data, tok_spaces.size, 1, s1->outfile);
} else {
int d = file->line_num - line_ref;
if (file != file_ref || d < 0 || d >= 8)