summaryrefslogtreecommitdiffstats
path: root/usr.sbin/config/config.y
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2003-11-14 11:23:25 +0000
committerbde <bde@FreeBSD.org>2003-11-14 11:23:25 +0000
commit3debe8bd3d682c590fabf116ac6e8e7584ec5e98 (patch)
tree96195ea1667ad2cc206a6eefffcaca15614ee17a /usr.sbin/config/config.y
parent54cb274195e666c265d344bc5efddf3169491881 (diff)
downloadFreeBSD-src-3debe8bd3d682c590fabf116ac6e8e7584ec5e98.zip
FreeBSD-src-3debe8bd3d682c590fabf116ac6e8e7584ec5e98.tar.gz
Fixed spurious syntax errors for including files that don't begin with
a SEMICOLON token (a newline or semicolon, or one of these preceded by a comment and/or whitespace). The input stream was switched too early and the parser was expecting a SEMICOLON in the included file instead of after the filename in the include directive. Submitted by: Stefan Farfeleder <stefan@fafoe.narf.at> Kept alive by: Adam C. Migus <adam@migus.org>
Diffstat (limited to 'usr.sbin/config/config.y')
-rw-r--r--usr.sbin/config/config.y7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 12440dd..0ee7f28 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -118,6 +118,9 @@ Spec:
|
Config_spec SEMICOLON
|
+ INCLUDE ID SEMICOLON
+ = { include($2, 0); };
+ |
SEMICOLON
|
error SEMICOLON
@@ -164,9 +167,7 @@ Config_spec:
= {
hints = $2;
hintmode = 1;
- } |
- INCLUDE ID
- = { include($2, 0); };
+ }
System_spec:
CONFIG System_id System_parameter_list
OpenPOWER on IntegriCloud