Fix parsing of indirect modifiers

rillig · Sep 14, 2024 · 0d00451 · 0d00451
1 parent cdd45cd
commit 0d00451
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/v23/mklexer.go b/v23/mklexer.go
@@ -359,8 +359,12 @@ func (p *MkLexer) exprModifier(varname string, closing byte) MkExprModifier {
 		}
 		return MkExprModifier(modifier)
 	}
-	if modifier != "" && modifierNoVar == "" {
-		return MkExprModifier(modifier)
+
+	lexer.Reset(mark)
+	if indirect := p.Expr(); indirect != nil {
+		if lexer.PeekByte() == ':' || lexer.PeekByte() == int(closing) {
+			return MkExprModifier(lexer.Since(mark))
+		}
 	}
 
 	// ${:!uname -a!:[2]}

diff --git a/v23/mklexer_test.go b/v23/mklexer_test.go
@@ -416,11 +416,7 @@ func (s *Suite) Test_MkLexer_Expr(c *check.C) {
 		expr("", "!command!", "Q"))
 
 	test("${_BUILD_DEFS.${v}:U${${v}}:${_BUILD_INFO_MOD.${v}}:Q}",
-		b.ExprTextToken(
-			"${_BUILD_DEFS.${v}:U${${v}}:${_BUILD_INFO_MOD.${v}}:Q}",
-			// FIXME: The indirect modifier is missing.
-			"_BUILD_DEFS.${v}", "U${${v}}", "Q"),
-		"WARN: Test_MkLexer_Expr.mk:1: Invalid variable modifier \"${_BUILD_INFO_MOD.${v}}\" for \"_BUILD_DEFS.${v}\".")
+		expr("_BUILD_DEFS.${v}", "U${${v}}", "${_BUILD_INFO_MOD.${v}}", "Q"))
 }
 
 // Pkglint can replace $(VAR) with ${VAR}. It doesn't look at all components