Commit Diff

Commit:
156f1eccfe9db2432b26c09b0cae5eb29e843b71
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
allow newlines in table syntax
Actions:
Patch | Tree
commit - 9693abfe1f13a7ab02a82a47cc16be77bca2d98e
commit + 156f1eccfe9db2432b26c09b0cae5eb29e843b71
blob - b80a8ff10bf11348a0d3e19e4cccafe022007ea9
blob + aceb48834f148d3f19d218da8fbfc0774606dbec
--- parse.y
+++ parse.y
@@ -180,7 +180,6 @@ nl		: '\n' optnl		/* one or more newlines */
 arrow		: '=' '>' ;
 
 comma		: ',' optnl
-		| nl
 		;
 
 varset		: STRING '=' string		{
@@ -207,7 +206,7 @@ pki		: PKI STRING CERT STRING { add_cert($2, $4); }
 		| PKI STRING KEY STRING  { add_key($2, $4); }
 		;
 
-table_kp	: string arrow string {
+table_kp	: string arrow string optnl {
 			if (table_add(table, $1, $3) == -1)
 				yyerror("can't add to table %s",
 				    table->t_name);
@@ -251,7 +250,7 @@ table		: TABLE STRING STRING {
 		}
 		| TABLE STRING {
 			add_table($2, "static", NULL);
-		} '{' table_vals '}' {
+		} '{' optnl table_vals '}' {
 			table = NULL;
 		}
 		;