From f53c70c0dfe89162daa72764493a3201efa88d89 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 10 Dec 2004 15:49:30 +0000
Subject: [PATCH] Use property-set in more places

[SVN r26487]
---
 v2/build/toolset.jam        | 7 ++++---
 v2/build/virtual-target.jam | 9 ++++-----
 v2/tools/builtin.jam        | 5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/v2/build/toolset.jam b/v2/build/toolset.jam
index f041ab41e..27cad9cc5 100644
--- a/v2/build/toolset.jam
+++ b/v2/build/toolset.jam
@@ -194,14 +194,15 @@ rule handle-flag-value ( value * : properties * )
     }
     else
     {
-        result += $(values) ;
+        result += $(value) ;
     }      
     return $(result) ;
 }
 
 
-rule set-target-variables ( rule-or-module targets + : properties * )
+rule set-target-variables ( rule-or-module targets + : property-set )
 { 
+    properties = [ $(property-set).raw ] ;
     for local f in $(.$(rule-or-module).flags) 
     {
         local variable = $(.$(rule-or-module).variable.$(f)) ;
@@ -229,7 +230,7 @@ rule set-target-variables ( rule-or-module targets + : properties * )
     local next = [ MATCH ^(.+)\\.([^\\.])* : $(rule-or-module) ] ;
     if $(next)
     {
-        set-target-variables $(next) $(targets) : $(properties) ;        
+        set-target-variables $(next) $(targets) : $(property-set) ;        
     }    
 }
 
diff --git a/v2/build/virtual-target.jam b/v2/build/virtual-target.jam
index 520ed5643..170124ada 100644
--- a/v2/build/virtual-target.jam
+++ b/v2/build/virtual-target.jam
@@ -609,8 +609,7 @@ class action
             self.actualized = true ;
 
             local ps = [ properties ] ;
-            local properties = [ adjust-properties [ $(ps).raw ] ] ;
-
+            local properties = [ adjust-properties $(ps) ] ;
 
             local actual-targets ;
             for local i in [ targets ]
@@ -629,7 +628,7 @@ class action
                 : $(properties) ;
             
             indirect.call $(self.action-name) 
-              $(actual-targets) : $(self.actual-sources) : $(properties)
+              $(actual-targets) : $(self.actual-sources) : [ $(properties).raw ] 
                 ;
             
             # Since we set up creating action here, we also set up
@@ -694,9 +693,9 @@ class action
     # This is last chance to fix properties, for example to adjust includes
     # to get generated headers correctly. Default implementation returns
     # its argument.
-    rule adjust-properties ( properties * )
+    rule adjust-properties ( property-set )
     {
-        return $(properties) ;
+        return $(property-set) ;
     }
 
 
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index 5a13cc87a..1c572627b 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -460,10 +460,11 @@ class compile-action : action
     # For all virtual targets for the same dependency graph as self, 
     # i.e. which belong to the same main target, add their directories
     # to include path.
-    rule adjust-properties ( properties * )
+    rule adjust-properties ( property-set )
     {        
         local s = [ $(self.targets[1]).creating-subvariant ] ;
-        return $(properties) [ $(s).implicit-includes "include" : H ] ;
+        return [ $(property-set).add-raw 
+          [ $(s).implicit-includes "include" : H ] ] ;
     }    
 }