cue/parser: support string selector labels

Allowed by the spec, but previously unimplemented.

Change-Id: I2fb7aad303cdfac8862a0744b80d524cb749f5b3
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/7342
Reviewed-by: Marcel van Lohuizen <[email protected]>
Reviewed-by: CUE cueckoo <[email protected]>

Author: mpvl

cue/ast/ast.go

@@ -660,8 +660,8 @@ type ParenExpr struct {
 
 // A SelectorExpr node represents an expression followed by a selector.
 type SelectorExpr struct {
-	X   Expr   // expression
-	Sel *Ident // field selector
+	X   Expr  // expression
+	Sel Label // field selector
 
 	comments
 	expr

cue/format/node.go

@@ -909,11 +909,13 @@ func (f *formatter) selectorExpr(x *ast.SelectorExpr, depth int) bool {
 	f.expr1(x.X, token.HighestPrec, depth)
 	f.print(token.PERIOD)
 	if x.Sel.Pos().IsNewline() {
-		f.print(indent, formfeed, x.Sel.Pos(), x.Sel)
+		f.print(indent, formfeed)
+		f.expr(x.Sel.(ast.Expr))
 		f.print(unindent)
 		return true
 	}
-	f.print(x.Sel.Pos(), x.Sel)
+	f.print(noblank)
+	f.expr(x.Sel.(ast.Expr))
 	return false
 }
 

cue/format/testdata/expressions.golden

@@ -213,4 +213,14 @@ package expressions
 	]
 
 	foo: bar
+
+	a: "foo-bar": 3
+	b: a."foo-bar"
+	c: a."foo-bar".b
+	d: a.
+		"foo-bar"
+	e: a.
+		"foo-bar".
+		b
+	f: 2
 }

cue/format/testdata/expressions.input

@@ -209,4 +209,14 @@ package expressions
     ]
 
     foo : bar
+
+    a: "foo-bar": 3
+    b: a."foo-bar"
+    c: a. "foo-bar" . b
+    d: a.
+        "foo-bar"
+    e: a.
+        "foo-bar".
+                b
+    f: 2
 }

cue/parser/parser.go

@@ -1361,6 +1361,21 @@ L:
 					X:   p.checkExpr(x),
 					Sel: p.parseIdent(),
 				}
+			case token.STRING:
+				if strings.HasPrefix(p.lit, `"`) && !strings.HasPrefix(p.lit, `""`) {
+					str := &ast.BasicLit{
+						ValuePos: p.pos,
+						Kind:     token.STRING,
+						Value:    p.lit,
+					}
+					p.next()
+					x = &ast.SelectorExpr{
+						X:   p.checkExpr(x),
+						Sel: str,
+					}
+					break
+				}
+				fallthrough
 			default:
 				pos := p.pos
 				p.errorExpected(pos, "selector")

cue/parser/parser_test.go

@@ -116,6 +116,23 @@ func TestParse(t *testing.T) {
 		"one-line embedding",
 		`{ V1, V2 }`,
 		`{V1, V2}`,
+	}, {
+		"selectors",
+		`a.b. "str"`,
+		`a.b."str"`,
+	}, {
+		"selectors",
+		`a.b. "str"`,
+		`a.b."str"`,
+	}, {
+		"faulty bytes selector",
+		`a.b.'str'`,
+		"a.b._\nexpected selector, found 'STRING' 'str'",
+	}, {
+		"faulty multiline string selector",
+		`a.b."""
+			"""`,
+		"a.b._\nexpected selector, found 'STRING' \"\"\"\n\t\t\t\"\"\"",
 	}, {
 		"expression embedding",
 		`#Def: {
@@ -697,8 +714,8 @@ func TestImports(t *testing.T) {
 // *BadExpr.
 func TestIncompleteSelection(t *testing.T) {
 	for _, src := range []string{
-		"{ a: fmt. }",           // at end of object
-		"{ a: fmt.\n\"a\": x }", // not at end of struct
+		"{ a: fmt. }",         // at end of object
+		"{ a: fmt.\n0.0: x }", // not at end of struct
 	} {
 		t.Run("", func(t *testing.T) {
 			f, err := ParseFile("", src)

cue/testdata/eval/selectors.txtar

@@ -1,14 +1,21 @@
 -- in.cue --
-	a: 1
-	b: a + 1
-	d: {
-		x: _
-		y: b + x
-	}
-	e: d & {
-		x: 5
-	}
-
+a: 1
+b: a + 1
+d: {
+  x: _
+  y: b + x
+}
+e: d & {
+  x: 5
+}
+f: {
+  a: "foo-bar": 3
+  b: a."foo-bar"
+}
+g: {
+  a: "foo-bar": c: 3
+  b: a."foo-bar".c
+}
 -- out/eval --
 (struct){
   a: (int){ 1 }
@@ -24,6 +31,20 @@
     x: (int){ 5 }
     y: (int){ 7 }
   }
+  f: (struct){
+    a: (struct){
+      "foo-bar": (int){ 3 }
+    }
+    b: (int){ 3 }
+  }
+  g: (struct){
+    a: (struct){
+      "foo-bar": (struct){
+        c: (int){ 3 }
+      }
+    }
+    b: (int){ 3 }
+  }
 }
 -- out/compile --
 --- in.cue
@@ -37,4 +58,18 @@
   e: (〈0;d〉 & {
     x: 5
   })
+  f: {
+    a: {
+      "foo-bar": 3
+    }
+    b: 〈0;a〉."foo-bar"
+  }
+  g: {
+    a: {
+      "foo-bar": {
+        c: 3
+      }
+    }
+    b: 〈0;a〉."foo-bar".c
+  }
 }

internal/core/adt/expr.go

@@ -583,7 +583,7 @@ func (x *SelectorExpr) Source() ast.Node {
 
 func (x *SelectorExpr) resolve(c *OpContext) *Vertex {
 	n := c.node(x.X, Partial)
-	return c.lookup(n, x.Src.Sel.NamePos, x.Sel)
+	return c.lookup(n, x.Src.Sel.Pos(), x.Sel)
 }
 
 // IndexExpr is like a selector, but selects an index.

internal/core/export/adt.go

@@ -155,7 +155,7 @@ func (e *exporter) adt(expr adt.Expr, conjuncts []adt.Conjunct) ast.Expr {
 	case *adt.SelectorExpr:
 		return &ast.SelectorExpr{
 			X:   e.expr(x.X),
-			Sel: e.ident(x.Sel),
+			Sel: e.stringLabel(x.Sel),
 		}
 
 	case *adt.IndexExpr: