From 12fc75188cc1f0a8c4c443c04e7a022131198c36 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Dec 2016 11:45:55 +0200 Subject: Allow implicit (lexical) typed-to-typed conversion --- tests/expansion/type.test | 9 +++------ tests/variable/dir-path/buildfile | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/expansion/type.test b/tests/expansion/type.test index d524eea..27c646d 100644 --- a/tests/expansion/type.test +++ b/tests/expansion/type.test @@ -36,14 +36,11 @@ y = "$x" assert ($type($y) == "") EOI -: type-conflict +: retypify : -$* <'print [bool] ([string] true)' 2>>EOE != 0 -:1:7: error: conflicting attribute type bool and value type string - info: use quoting to untypify the value -EOE +$* <'print [bool] ([string] true)' >'true' -: retypify +: retypify-quote : $* <'print [bool] "([string] true)"' >'true' diff --git a/tests/variable/dir-path/buildfile b/tests/variable/dir-path/buildfile index c6fdb46..5c99f07 100644 --- a/tests/variable/dir-path/buildfile +++ b/tests/variable/dir-path/buildfile @@ -27,7 +27,7 @@ print [strings] -I $y print -I $y/baz print -z = [strings] "$x" # Re-typed. +z = [strings] $x # Re-typed. print $z print @@ -37,9 +37,9 @@ r = [dir_path] / print $r/foo r += foo -print [strings] "$r" +print [strings] $r r += bar -print [strings] "$r" +print [strings] $r ./: -- cgit v1.1