diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-04-04 18:59:25 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-04-04 18:59:25 +0000 |
| commit | 5da148530ee8931c8ed7771c373146afaf2b14e1 (patch) | |
| tree | 582dd43b75cf44f068761e8b6cfc6cd6d9c4d59c /openbox/parse.c | |
| parent | 8dc158ac2df602a7a59b469f3efdfd5746300578 (diff) | |
attempting to parse lists
Diffstat (limited to 'openbox/parse.c')
| -rw-r--r-- | openbox/parse.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/openbox/parse.c b/openbox/parse.c index f8f0cd94..421dc48f 100644 --- a/openbox/parse.c +++ b/openbox/parse.c @@ -65,7 +65,7 @@ void parse_token(ParseTokenType type, union ParseToken token) func(type, token); } -static void parse_rc_token(ParseTokenType type, union ParseToken token) +static void parse_rc_token(ParseToken *token) { static int got_eq = FALSE; static ParseTokenType got_val = 0; @@ -74,35 +74,35 @@ static void parse_rc_token(ParseTokenType type, union ParseToken token) static gboolean b; if (id == NULL) { - if (type == TOKEN_IDENTIFIER) { + if (token->type == TOKEN_IDENTIFIER) { id = token.identifier; return; } else { yyerror("syntax error"); } } else if (!got_eq) { - if (type == TOKEN_EQUALS) { + if (token->type == TOKEN_EQUALS) { got_eq = TRUE; return; } else { yyerror("syntax error"); } } else if (!got_val) { - if (type == TOKEN_STRING) { + if (token->type == TOKEN_STRING) { s = token.string; got_val = type; return; - } else if (type == TOKEN_BOOL) { + } else if (token->type == TOKEN_BOOL) { b = token.bool; got_val = type; return; - } else if (type == TOKEN_INTEGER) { + } else if (token->type == TOKEN_INTEGER) { i = token.integer; got_val = type; return; } else yyerror("syntax error"); - } else if (type != TOKEN_NEWLINE) { + } else if (token->type != TOKEN_NEWLINE) { yyerror("syntax error"); } else { ConfigValue v; @@ -133,5 +133,5 @@ static void parse_rc_token(ParseTokenType type, union ParseToken token) id = s = NULL; got_eq = FALSE; got_val = 0; - parse_free_token(type, token); + parse_free_token(token->type, token); } |