Merge pull request #121 from jhump/jh/lenient-text-format-in-protoparse

protoparse is more lenient with aggregate values
jhump · Apr 1, 2018 · cfdba73 · cfdba73
2 parents 41e3273 + fff4be9
commit cfdba73
Show file tree

Hide file tree

Showing 2 changed files with 505 additions and 462 deletions.
diff --git a/desc/protoparse/proto.y b/desc/protoparse/proto.y
@@ -314,6 +314,9 @@ aggField : aggFieldEntry
 	| aggFieldEntry ',' {
 		$$ = $1
 	}
+	| aggFieldEntry ';' {
+		$$ = $1
+	}
 
 aggFieldEntry : aggName ':' scalarConstant {
 		a := &aggregateEntryNode{name: $1, val: $3}
@@ -374,6 +377,9 @@ constantList : constant {
 	| constantList ',' constant {
 		$$ = append($1, $3)
 	}
+	| constantList ';' constant {
+		$$ = append($1, $3)
+	}
 	| '<' aggFields '>' {
 		s := &aggregateLiteralNode{elements: $2}
 		s.setRange($1, $3)
@@ -384,6 +390,11 @@ constantList : constant {
 		s.setRange($3, $5)
 		$$ = append($1, s)
 	}
+	| constantList ';'  '<' aggFields '>' {
+		s := &aggregateLiteralNode{elements: $4}
+		s.setRange($3, $5)
+		$$ = append($1, s)
+	}
 
 typeIdent : ident
 	| _TYPENAME