diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2017-09-20 10:42:26 +0200 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2017-09-20 10:51:14 +0200 |
| commit | a06385c5130f7477530732896a8b2830b40e85b6 (patch) | |
| tree | 349d090d4c672faac9c9e2b916af825fc09973dc | |
| parent | 9f404313e8d81344157494d33e0897cf9e5e1ca5 (diff) | |
Merge T_DEF_BOOL and T_DEF_TRISTATE cases
Extend TOKEN_TO_TYPE to map T_DEF_BOOL and T_DEF_TRISTATE to BOOL and
TRISTATE as a convenience.
| -rw-r--r-- | kconfiglib.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/kconfiglib.py b/kconfiglib.py index 11b462d..07c2089 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -924,8 +924,8 @@ class Config(object): new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) - elif t0 == T_DEF_BOOL: - stmt.type = BOOL + elif t0 in (T_DEF_BOOL, T_DEF_TRISTATE): + stmt.type = TOKEN_TO_TYPE[t0] if tokens.peek_next() is not None: new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) @@ -948,12 +948,6 @@ class Config(object): self._parse_expr(tokens, stmt, line, filename, linenr) if tokens.check(T_IF) else None)) - elif t0 == T_DEF_TRISTATE: - stmt.type = TRISTATE - if tokens.peek_next() is not None: - new_def_exprs.append(parse_val_and_cond(tokens, line, - filename, linenr)) - elif t0 == T_OPTION: if tokens.check(T_ENV) and tokens.check(T_EQUAL): env_var = tokens.get_next() @@ -3575,7 +3569,8 @@ TYPENAME = {UNKNOWN: "unknown", BOOL: "bool", TRISTATE: "tristate", # Token to type mapping TOKEN_TO_TYPE = {T_BOOL: BOOL, T_TRISTATE: TRISTATE, T_STRING: STRING, - T_INT: INT, T_HEX: HEX} + T_INT: INT, T_HEX: HEX, T_DEF_BOOL: BOOL, + T_DEF_TRISTATE: TRISTATE} # Default values for symbols of different types (the value the symbol gets if # it is not assigned a user value and none of its 'default' clauses kick in) |