Tolerate missing ';' in message body #218
Conversation
| func newMessageElements(semicolons []*ast.RuneNode, elements []ast.MessageElement) []ast.MessageElement { | ||
| elems := make([]ast.MessageElement, 0, len(semicolons)+len(elements)) | ||
| for _, semicolon := range semicolons { | ||
| elems = append(elems, ast.NewEmptyDeclNode(semicolon)) | ||
| } | ||
| elems = append(elems, elements...) | ||
| return elems | ||
| } | ||
|
|
There was a problem hiding this comment.
I just realized that this and the above functions can be trivially collapsed into a single generic function.
There was a problem hiding this comment.
the problem is line 141. How do I say T is an interface *ast.EmptyDeclNode implements?
| @@ -182,3 +191,12 @@ func toEnumElements[T ast.EnumElement](nodes nodeWithEmptyDecls[T]) []ast.EnumEl | |||
| } | |||
| return elements | |||
| } | |||
|
|
|||
| func toMessageElements[T ast.MessageElement](nodes nodeWithEmptyDecls[T]) []ast.MessageElement { | |||
There was a problem hiding this comment.
Sadly, we can't make this more generic and collapse into a single function, since there's no way to express assignability/convertibility constraints in Go generic type parameters :/
But we could at least hoist this body into another generic function so each of these functions becomes a one-liner.
There was a problem hiding this comment.
I don't see how to do that.
parser/proto.y
Outdated
| @@ -49,7 +45,7 @@ import ( | |||
| mtdMsgType *ast.RPCTypeNode | |||
| mtdElements []ast.RPCElement | |||
| opt *ast.OptionNode | |||
| optN nodeWithEmptyDecls[*ast.OptionNode] | |||
| optWE nodeWithEmptyDecls[*ast.OptionNode] | |||
There was a problem hiding this comment.
Is "WE" (with empty?) the new notation for "N"? If so, should msgFld and msgGrp above instead be fldWE and grpWE?
There was a problem hiding this comment.
I changed the opt->optRaw instead (without empty decls is the corner case)
While still producing an error, see: bufbuild#200
While still producing an error, see: #200