more using of new token struct
Dana Jansens danakj@orodu.net
1 files changed,
9 insertions(+),
9 deletions(-)
jump to
M
openbox/parse.c
→
openbox/parse.c
@@ -37,7 +37,7 @@ GSList *it;
switch (token->type) { case TOKEN_STRING: - g_free(token-data.string); + g_free(token->data.string); break; case TOKEN_IDENTIFIER: g_free(token->data.identifier);@@ -82,7 +82,7 @@ static gboolean b;
if (id == NULL) { if (token->type == TOKEN_IDENTIFIER) { - id = token.identifier; + id = token->data.identifier; return; } else { yyerror("syntax error");@@ -96,16 +96,16 @@ yyerror("syntax error");
} } else if (!got_val) { if (token->type == TOKEN_STRING) { - s = token.string; - got_val = type; + s = token->data.string; + got_val = token->type; return; } else if (token->type == TOKEN_BOOL) { - b = token.bool; - got_val = type; + b = token->data.bool; + got_val = token->type; return; } else if (token->type == TOKEN_INTEGER) { - i = token.integer; - got_val = type; + i = token->data.integer; + got_val = token->type; return; } else yyerror("syntax error");@@ -140,5 +140,5 @@ g_free(s);
id = s = NULL; got_eq = FALSE; got_val = 0; - parse_free_token(token->type, token); + parse_free_token(token); }