DTC: Minor grammar rule shuffle.
I like to see the basis cases established early in
the rule sets, so place "empty" reduction first.
Purely cosmetic.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
diff --git a/dtc-parser.y b/dtc-parser.y
index 4698793..8e6ed64 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -87,14 +87,14 @@
;
memreserves:
- memreserve memreserves
- {
- $$ = chain_reserve_entry($1, $2);
- }
- | /* empty */
+ /* empty */
{
$$ = NULL;
}
+ | memreserve memreserves
+ {
+ $$ = chain_reserve_entry($1, $2);
+ }
;
memreserve:
@@ -123,14 +123,14 @@
;
proplist:
- propdef proplist
- {
- $$ = chain_property($1, $2);
- }
- | /* empty */
+ /* empty */
{
$$ = NULL;
}
+ | propdef proplist
+ {
+ $$ = chain_property($1, $2);
+ }
;
propdef:
@@ -165,7 +165,11 @@
;
propdataprefix:
- propdata ','
+ /* empty */
+ {
+ $$ = empty_data;
+ }
+ | propdata ','
{
$$ = $1;
}
@@ -173,10 +177,6 @@
{
$$ = data_add_label($1, $2);
}
- | /* empty */
- {
- $$ = empty_data;
- }
;
opt_cell_base:
@@ -188,7 +188,11 @@
;
celllist:
- celllist opt_cell_base DT_CELL
+ /* empty */
+ {
+ $$ = empty_data;
+ }
+ | celllist opt_cell_base DT_CELL
{
$$ = data_append_cell($1,
cell_from_string($3, $2));
@@ -201,14 +205,14 @@
{
$$ = data_add_label($1, $2);
}
- | /* empty */
- {
- $$ = empty_data;
- }
;
bytestring:
- bytestring DT_BYTE
+ /* empty */
+ {
+ $$ = empty_data;
+ }
+ | bytestring DT_BYTE
{
$$ = data_append_byte($1, $2);
}
@@ -216,21 +220,17 @@
{
$$ = data_add_label($1, $2);
}
- | /* empty */
- {
- $$ = empty_data;
- }
;
subnodes:
- subnode subnodes
- {
- $$ = chain_node($1, $2);
- }
- | /* empty */
+ /* empty */
{
$$ = NULL;
}
+ | subnode subnodes
+ {
+ $$ = chain_node($1, $2);
+ }
;
subnode:
@@ -252,14 +252,14 @@
;
label:
- DT_LABEL
- {
- $$ = $1;
- }
- | /* empty */
+ /* empty */
{
$$ = NULL;
}
+ | DT_LABEL
+ {
+ $$ = $1;
+ }
;
%%