From becea217436a79b7ef37a023da6cb4c560225a71 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 2 Dec 2015 14:24:10 +0200
Subject: Redo extension derivation for file{}, doc{}, and cli{}

We now first check the 'extension' variable, then use the default.
---
 build/parser.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'build/parser.cxx')

diff --git a/build/parser.cxx b/build/parser.cxx
index c896c71..ee22254 100644
--- a/build/parser.cxx
+++ b/build/parser.cxx
@@ -818,6 +818,8 @@ namespace build
     return r;
   }
 
+  constexpr const char derived_ext_var[] = "extension";
+
   void parser::
   define (token& t, token_type& tt)
   {
@@ -852,6 +854,11 @@ namespace build
       dt->base = bt;
       dt->factory = &derived_factory;
 
+      // Override extension derivation function: we most likely don't want
+      // to use the same default as our base (think cli: file).
+      //
+      dt->extension = &target_extension_var<derived_ext_var, nullptr>;
+
       target_type& rdt (*dt); // Save a non-const reference to the object.
 
       auto pr (scope_->target_types.emplace (dn, target_type_ref (move (dt))));
-- 
cgit v1.1