From c6bb7c448e2bbc45b1631234fee70b11a7dd6a24 Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Thu, 24 Jan 2019 15:59:33 +0000 Subject: fix shift/reduce conflict --- sbin/unwind/uw_parse.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sbin') diff --git a/sbin/unwind/uw_parse.y b/sbin/unwind/uw_parse.y index 6f24bbad45a..000c6888481 100644 --- a/sbin/unwind/uw_parse.y +++ b/sbin/unwind/uw_parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: uw_parse.y,v 1.1 2019/01/23 13:11:00 florian Exp $ */ +/* $OpenBSD: uw_parse.y,v 1.2 2019/01/24 15:59:32 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser @@ -190,11 +190,11 @@ nl : '\n' optnl /* one or more newlines */ unwind_forwarder : FORWARDER forwarder_block ; -forwarder_block : '{' optnl forwarderopts_l optnl '}' +forwarder_block : '{' optnl forwarderopts_l '}' | forwarderoptsl ; -forwarderopts_l : forwarderopts_l forwarderoptsl optnl +forwarderopts_l : forwarderopts_l forwarderoptsl nl | forwarderoptsl optnl forwarderoptsl : STRING { -- cgit v1.2.3