nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more using of new token struct

Browse source
This commit is contained in:
Dana Jansens 2003-04-04 19:02:22 +00:00
parent e2c3582a5c
commit 59621c4f41
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openbox/parse.c
View file

@ -37,7 +37,7 @@ void parse_free_token(ParseToken *token)
switch (token->type) { switch (token->type) {
case TOKEN_STRING: case TOKEN_STRING:
g_free(token-data.string); g_free(token->data.string);
break; break;
case TOKEN_IDENTIFIER: case TOKEN_IDENTIFIER:
g_free(token->data.identifier); g_free(token->data.identifier);
@ -82,7 +82,7 @@ static void parse_rc_token(ParseToken *token)
if (id == NULL) { if (id == NULL) {
if (token->type == TOKEN_IDENTIFIER) { if (token->type == TOKEN_IDENTIFIER) {
id = token.identifier; id = token->data.identifier;
return; return;
} else { } else {
yyerror("syntax error"); yyerror("syntax error");
@ -96,16 +96,16 @@ static void parse_rc_token(ParseToken *token)
} }
} else if (!got_val) { } else if (!got_val) {
if (token->type == TOKEN_STRING) { if (token->type == TOKEN_STRING) {
s = token.string; s = token->data.string;
got_val = type; got_val = token->type;
return; return;
} else if (token->type == TOKEN_BOOL) { } else if (token->type == TOKEN_BOOL) {
b = token.bool; b = token->data.bool;
got_val = type; got_val = token->type;
return; return;
} else if (token->type == TOKEN_INTEGER) { } else if (token->type == TOKEN_INTEGER) {
i = token.integer; i = token->data.integer;
got_val = type; got_val = token->type;
return; return;
} else } else
yyerror("syntax error"); yyerror("syntax error");
@ -140,5 +140,5 @@ static void parse_rc_token(ParseToken *token)
id = s = NULL; id = s = NULL;
got_eq = FALSE; got_eq = FALSE;
got_val = 0; got_val = 0;
parse_free_token(token->type, token); parse_free_token(token);
} }