cue: elide comma after ...

Fixes #958
Fixes #768

Change-Id: Ic6c463dd305e4a326f73ce3b65ed1ca02f752dde
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/9724
Reviewed-by: Paul Jolly <[email protected]>

cue/parser/parser.go

@@ -746,6 +746,7 @@ func (p *parser) parseFieldList() (list []ast.Decl) {
 			p.next()
 			c.closeNode(p, ellipsis)
 			list = append(list, ellipsis)
+			p.consumeDeclComma()
 
 		default:
 			list = append(list, p.parseField())

cue/parser/parser_test.go

@@ -24,6 +24,25 @@ import (
 
 func TestParse(t *testing.T) {
 	testCases := []struct{ desc, in, out string }{{
+
+		"ellipsis in structs",
+		`#Def: {
+			b: "2"
+			...
+		}
+		...
+
+		#Def2: {
+			...
+			b: "2"
+		}
+		#Def3: {...
+		_}
+		...
+		`,
+		`#Def: {b: "2", ...}, ..., #Def2: {..., b: "2"}, #Def3: {..., _}, ...`,
+	}, {
+
 		"empty file", "", "",
 	}, {
 		"empty struct", "{}", "{}",
@@ -149,13 +168,17 @@ func TestParse(t *testing.T) {
 			b: "2"
 			...
 		}
+		...
 
 		#Def2: {
 			...
 			b: "2"
 		}
+		#Def3: {...
+		_}
+		...
 		`,
-		`#Def: {b: "2", ...}, #Def2: {..., b: "2"}`,
+		`#Def: {b: "2", ...}, ..., #Def2: {..., b: "2"}, #Def3: {..., _}, ...`,
 	}, {
 		"emitted referencing non-emitted",
 		`a: 1
@@ -664,6 +687,10 @@ func TestStrict(t *testing.T) {
 			`X=3`},
 		{"old-style alias 2",
 			`X={}`},
+
+		// Not yet supported
+		{"additional typed not yet supported",
+			`{...int}`},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {

cue/scanner/scanner.go

@@ -907,6 +907,7 @@ scanAgain:
 				if s.ch == '.' {
 					s.next()
 					tok = token.ELLIPSIS
+					insertEOL = true
 				} else {
 					s.errf(s.file.Offset(pos), "illegal token '..'; expected '.'")
 				}

cue/scanner/scanner_test.go

@@ -403,7 +403,7 @@ var lines = []string{
 	"<=\n",
 	">=\n",
 	":=\n",
-	"...\n",
+	"...^\n",
 
 	"(\n",
 	"[\n",

doc/ref/spec.md

@@ -166,6 +166,7 @@ the token stream immediately after a line's final token if that token is
 - an identifier, keyword, or bottom
 - a number or string literal, including an interpolation
 - one of the characters `)`, `]`, `}`, or `?`
+- an ellipsis `...`
 
 
 Although commas are automatically inserted, the parser will require