diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-04-27 22:35:03 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-04-27 22:37:26 +0900 |
| commit | 321ec7ef1cb7ce3147ab65bf8ed50b1c0932aed5 (patch) | |
| tree | abe4ecb916cbe3c8ca905e9a6e86ccc8b4c21d93 /expr_test.go | |
| parent | 0483e64055eba480a8c68d842703b38926203f58 (diff) | |
| download | kati-321ec7ef1cb7ce3147ab65bf8ed50b1c0932aed5.tar.gz | |
Revert "fix: handle $(eval foo := $(var)) case"
This reverts commit ca9183b18f7445419d67913328f605a0ec5e0288.
Repro step:
$ ./repo/android.sh time kati -n
...
including ./system/vold/Android.mk ...
including ./tools/external/fat32lib/Android.mk ...
build/core/prebuilt_internal.mk:258: warning: overriding commands for target "javalib.jar"
build/core/prebuilt_internal.mk:0: warning: ignoring old commands for target "javalib.jar"
build/core/prebuilt_internal.mk:258: warning: overriding commands for target "javalib.jar"
build/core/prebuilt_internal.mk:0: warning: ignoring old commands for target "javalib.jar"
...
Diffstat (limited to 'expr_test.go')
| -rw-r--r-- | expr_test.go | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/expr_test.go b/expr_test.go index 7cc7747..febe438 100644 --- a/expr_test.go +++ b/expr_test.go @@ -226,46 +226,40 @@ func TestParseExpr(t *testing.T) { rhs: literal(""), }, }, - { - in: `$(eval foo := $(bar))`, - val: &funcEvalAssign{ - lhs: "foo", - op: ":=", - rhs: varref{ - literal("bar"), + /* + { + in: `$(eval foo := $(bar))`, + val: &funcEvalAssign{ + lhs: "foo", + op: ":=", + rhs: varref{ + literal("bar"), + }, }, }, - }, - { - in: `$(eval foo := $$(bar))`, - val: &funcEvalAssign{ - lhs: "foo", - op: ":=", - rhs: literal("$(bar)"), - }, - }, - { - in: `$(strip $1)`, - val: &funcStrip{ - fclosure: fclosure{ - args: []Value{ - literal("(strip"), - paramref(1), + { + in: `$(strip $1)`, + val: &funcStrip{ + fclosure: fclosure{ + args: []Value{ + literal("(strip"), + paramref(1), + }, }, }, }, - }, - { - in: `$(strip $(1))`, - val: &funcStrip{ - fclosure: fclosure{ - args: []Value{ - literal("(strip"), - paramref(1), + { + in: `$(strip $(1))`, + val: &funcStrip{ + fclosure: fclosure{ + args: []Value{ + literal("(strip"), + paramref(1), + }, }, }, }, - }, + */ } { val, _, err := parseExpr([]byte(tc.in), nil) if tc.isErr { |