darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-25 12:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

nicer trace output, strings now get escaped

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-11 11:31:50 +02:00
parent 9c2e6a2334
commit b5bee640d0
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
exec.c
View file

@ -211,6 +211,32 @@ qcint prog_tempstring(qc_program *prog, const char *_str)
return at; return at;
} }
static int print_escaped_string(const char *str)
{
int len = 2;
putchar('"');
while (*str) {
switch (*str) {
case '\a': len += 2; putchar('\\'); putchar('a'); break;
case '\b': len += 2; putchar('\\'); putchar('b'); break;
case '\r': len += 2; putchar('\\'); putchar('r'); break;
case '\n': len += 2; putchar('\\'); putchar('n'); break;
case '\t': len += 2; putchar('\\'); putchar('t'); break;
case '\f': len += 2; putchar('\\'); putchar('f'); break;
case '\v': len += 2; putchar('\\'); putchar('v'); break;
case '\\': len += 2; putchar('\\'); putchar('\\'); break;
case '"': len += 2; putchar('\\'); putchar('"'); break;
default:
++len;
putchar(*str);
break;
}
++str;
}
putchar('"');
return len;
}
static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) static void trace_print_global(qc_program *prog, unsigned int glob, int vtype)
{ {
static char spaces[16+1] = " "; static char spaces[16+1] = " ";
@ -245,7 +271,8 @@ static void trace_print_global(qc_program *prog, unsigned int glob, int vtype)
value->vector[2]); value->vector[2]);
break; break;
case TYPE_STRING: case TYPE_STRING:
len += printf("\"%s\",", prog_getstring(prog, value->string)); len += print_escaped_string(prog_getstring(prog, value->string));
/* len += printf("\"%s\",", prog_getstring(prog, value->string)); */
break; break;
case TYPE_FLOAT: case TYPE_FLOAT:
default: default:
@ -265,7 +292,7 @@ static void prog_print_statement(qc_program *prog, prog_section_statement *st)
printf("<illegal instruction %d>\n", st->opcode); printf("<illegal instruction %d>\n", st->opcode);
return; return;
} }
printf("%-12s", asm_instr[st->opcode].m); printf(" <> %-12s", asm_instr[st->opcode].m);
if (st->opcode >= INSTR_IF && if (st->opcode >= INSTR_IF &&
st->opcode <= INSTR_IFNOT) st->opcode <= INSTR_IFNOT)
{ {