Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5f7ad3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix issue with referencing the loop variable in a foreach"

parents 6028b556 b67aa082

mk2rbc/expr.go

+1 −0
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ func (cx *callExpr) transform(transformer func(expr starlarkExpr) starlarkExpr) 
	for i, arg := range cx.args {

		argsCopy[i] = arg.transform(transformer)

	}

	cx.args = argsCopy

	if replacement := transformer(cx); replacement != nil {

		return replacement

	} else {

mk2rbc/mk2rbc_test.go

+4 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,9 @@ BOOT_KERNEL_MODULES_LIST := foo.ko 
BOOT_KERNEL_MODULES_LIST += bar.ko

BOOT_KERNEL_MODULES_FILTER_2 := $(foreach m,$(BOOT_KERNEL_MODULES_LIST),%/$(m))



FOREACH_WITH_IF := $(foreach module,\

  $(BOOT_KERNEL_MODULES_LIST),\

  $(if $(filter $(module),foo.ko),,$(error module "$(module)" has an error!)))

`,

		expected: `load("//build/make/core:product_config.rbc", "rblf")
@@ -1238,6 +1241,7 @@ def init(g, handle): 
  g["BOOT_KERNEL_MODULES_LIST"] = ["foo.ko"]

  g["BOOT_KERNEL_MODULES_LIST"] += ["bar.ko"]

  g["BOOT_KERNEL_MODULES_FILTER_2"] = ["%%/%s" % m for m in g["BOOT_KERNEL_MODULES_LIST"]]

  g["FOREACH_WITH_IF"] = [("" if rblf.filter(module, "foo.ko") else rblf.mkerror("product.mk", "module \"%s\" has an error!" % module)) for module in g["BOOT_KERNEL_MODULES_LIST"]]

`,

	},

	{