Previously, there were a few shift/reduce and reduce/reduce
errors in the grammar that were being handled by the not-so-popular
GLR Parser technique.
Flip a right-recursive stack-abusing rule into a left-recursive
stack-friendly rule and clear up three messes in one shot: No more
conflicts, no need for the GLR parser, and friendlier stackness.
Signed-off-by: Jon Loeliger <[EMAIL PROTECTED]>
---
Makefile | 1 -
dtc-parser.y | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
Both "make check" and the "compare all old and new DTB kernel files"
tests are happy with this change.
diff --git a/Makefile b/Makefile
index d7d1af5..84f0efe 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,6 @@ clean: libfdt_clean tests_clean
%.tab.c %.tab.h %.output: %.y
@$(VECHO) BISON $@
- @$(VECHO) ---- Expect 2 s/r and 2 r/r. ----
$(BISON) -d $<
FORCE:
diff --git a/dtc-parser.y b/dtc-parser.y
index 4698793..0d140e5 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -18,7 +18,6 @@
* USA
*/
-%glr-parser
%locations
%{
@@ -123,9 +122,9 @@ nodedef:
;
proplist:
- propdef proplist
+ proplist propdef
{
- $$ = chain_property($1, $2);
+ $$ = chain_property($2, $1);
}
| /* empty */
{
--
1.5.3.1.139.g9346b
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
