From: Patrick McHardy <kaber@trash.net>
Date: Wed, 18 Mar 2009 09:45:31 +0000 (+0100)
Subject: Allow newlines in regular maps
X-Git-Tag: v0.099~205
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=28ac64e4e79a392a6fb327f6cbb57c14fc3f5110;p=thirdparty%2Fnftables.git

Allow newlines in regular maps

The previous patch only handled sets and verdict maps.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/src/parser.y b/src/parser.y
index c527ce1fe..cc7e467cc 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -913,12 +913,14 @@ map_list		:	map_list_expr
 				$1->location = @$;
 				$$ = $1;
 			}
-			|	map_list	COMMA
+			|	map_list	COMMA	opt_newline
 			;
 
-map_list_expr		:	map_lhs_expr	ARROW	concat_expr
+map_list_expr		:	opt_newline	map_lhs_expr	opt_newline
+	       					ARROW		opt_newline
+						concat_expr	opt_newline
 			{
-				$$ = mapping_expr_alloc(&@$, $1, $3);
+				$$ = mapping_expr_alloc(&@$, $2, $6);
 			}
 			;