summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-12-05 10:27:04 +1100
committerJon Loeliger <jdl@freescale.com>2007-12-05 08:27:46 -0600
commitc048102f5bcafb9a316bd7532fe3958c99af6b74 (patch)
tree3b7106828d9f8fd50ddeb37eb3248423099385a4
parent2b67c632df15ab57e5bf1a59f23cbcac8cda6acd (diff)
downloaddtc-c048102f5bcafb9a316bd7532fe3958c99af6b74.tar.gz
dtc: Generate useful error message for properties after subnodes
On several occasions, I've accidentally put properties after subnodes in a dts file. I've then spent ages thinking that the resulting syntax error was because of something else. This patch arranges for this specific syntax error to generate a more specific and useful error message. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--dtc-parser.y5
-rw-r--r--tests/prop-after-subnode.dts9
2 files changed, 14 insertions, 0 deletions
diff --git a/dtc-parser.y b/dtc-parser.y
index 2407af4..43182fd 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -276,6 +276,11 @@ subnodes:
{
$$ = chain_node($1, $2);
}
+ | subnode propdef
+ {
+ yyerror("syntax error: properties must precede subnodes\n");
+ YYERROR;
+ }
;
subnode:
diff --git a/tests/prop-after-subnode.dts b/tests/prop-after-subnode.dts
new file mode 100644
index 0000000..6dd0b66
--- /dev/null
+++ b/tests/prop-after-subnode.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+/ {
+ node1 {
+ };
+ prop;
+ node2 {
+ };
+};