summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Watson <jarrah@users.sourceforge.net>2003-06-25 15:27:41 +0000
committerGreg Watson <jarrah@users.sourceforge.net>2003-06-25 15:27:41 +0000
commit4f22177aa5fdbdd8166ba59938018fc53a4ad2ba (patch)
tree0408770adb656c6011247dcb91b67c87ad44705b
parent584997b5284b7fe50e446d81837252f93376a4eb (diff)
downloadcoreboot-4f22177aa5fdbdd8166ba59938018fc53a4ad2ba.tar.xz
Simple printing of options. Will make this better.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@916 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/newconfig/config.g18
1 files changed, 12 insertions, 6 deletions
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index e6a3787f62..41e0726e9f 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -1101,13 +1101,19 @@ parser Config:
rule option<<C>>: OPTION ID EQ value {{ if (C): setoptionstmt(ID, value) }}
- rule opif: IF ID {{ c = lookup(ID) }}
- (option<<c>>)* [ ELSE (option<<not c>>)* ] END
+ rule opif<<C>>: IF ID {{ c = lookup(ID) }}
+ (opstmt<<C and c>>)*
+ [ ELSE (opstmt<<C and not c>>)* ] END
+
+ rule opstmt<<C>>: option<<C>>
+ | opif<<C>>
+ | pprint<<C>>
- rule opstmt: option<<1>>
- | opif
# print clashes with a python keyword
- rule pprint<<C>>: PRINT STR {{ if (C): print "%s\n"%STR}}
+ rule pprint<<C>>: PRINT
+ ( STR {{ if (C): print "%s" % dequote(STR) }}
+ | ID {{ if (C): print "%s" % getformated(ID, curpart) }}
+ )
# ENTRY for parsing a delayed value
rule delexpr: "{" expr "}" {{ return expr }}
@@ -1116,7 +1122,7 @@ parser Config:
rule board: LOADOPTIONS {{ loadoptions() }}
TARGET DIRPATH {{ target(DIRPATH) }}
(uses<<1>>)*
- (opstmt)*
+ (opstmt<<1>>)*
mainboard {{ return 1 }}
rule defstmts<<ID>>: {{ d = 0 }}