From f932a890c3ceecd1ee21b0cfc8191e44ce0d4e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Fri, 15 Jun 2012 15:17:51 +0000 Subject: [PATCH] End-user error message in Boost Jam based Boost Build utility.ungrist() rule did not correspond to the actual rule's implementation. It implied that the value '<>' should be acceptable while it was not. Python based Boost Build implementation on the other hand accepted such values. Updated the original rule to accept this value as well. [SVN r78956] --- src/util/utility.jam | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/util/utility.jam b/src/util/utility.jam index aa234aad2..93a8a59a3 100644 --- a/src/util/utility.jam +++ b/src/util/utility.jam @@ -113,7 +113,7 @@ rule ungrist ( names * ) for local name in $(names) { local stripped = [ MATCH ^<(.*)>$ : $(name) ] ; - if ! $(stripped) + if ! $(stripped)-defined { import errors ; local quoted-names = \"$(names)\" ; @@ -183,6 +183,7 @@ rule __test__ ( ) assert.result \"foo\" : unquote \"\"foo\"\" ; assert.result : ungrist ; + assert.result "" : ungrist <> ; assert.result foo : ungrist ; assert.result : ungrist <> ; assert.result foo bar : ungrist ; @@ -193,12 +194,6 @@ rule __test__ ( ) } catch "in" ungrist \"\": \"\" is not of the form <.*> ; - try ; - { - ungrist <> ; - } - catch "in" ungrist \"<>\": \"<>\" is not of the form <.*> ; - try ; { ungrist foo ;