aboutsummaryrefslogtreecommitdiff
path: root/build/parser.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-08-27 15:11:40 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-08-27 15:11:40 +0200
commitfd689eb883655dcb29e505b041cd02fac01f0bac (patch)
tree0d85ec32d95a1c96eaa7eff28734b900c44dd3ca /build/parser.cxx
parent7f2d06258d57e39940e8fa959336da0ea66fe37f (diff)
Dist module/meta-operation initial implementation
Diffstat (limited to 'build/parser.cxx')
-rw-r--r--build/parser.cxx31
1 files changed, 31 insertions, 0 deletions
diff --git a/build/parser.cxx b/build/parser.cxx
index 03c20d0..9c50d17 100644
--- a/build/parser.cxx
+++ b/build/parser.cxx
@@ -36,6 +36,8 @@ namespace build
void parser::
parse_buildfile (istream& is, const path& p, scope& root, scope& base)
{
+ enter_buildfile (p);
+
string rw (diag_relative (p)); // Relative to work.
path_ = &rw;
@@ -446,6 +448,8 @@ namespace build
level4 ([&]{trace (t) << "entering " << p;});
+ enter_buildfile (p);
+
string rw (diag_relative (p)); // Relative to work.
const string* op (path_);
path_ = &rw;
@@ -585,6 +589,8 @@ namespace build
level4 ([&]{trace (t) << "entering " << p;});
+ enter_buildfile (p);
+
string rw (diag_relative (p)); // Relative to work.
const string* op (path_);
path_ = &rw;
@@ -1015,11 +1021,23 @@ namespace build
//
if (tt == type::dollar)
{
+ // Switch to the variable name mode. We want to use this
+ // mode for $foo but not for $(foo). Since we don't know
+ // whether the next token is a paren or a name, we turn
+ // it on and turn it off if what we get next is a paren
+ // so that the following name is scanned in the normal
+ // mode.
+ //
+ lexer_->mode (lexer_mode::variable);
+
next (t, tt);
bool paren (tt == type::lparen);
if (paren)
+ {
+ lexer_->mode (lexer_mode::normal);
next (t, tt);
+ }
if (tt != type::name)
fail (t) << "variable name expected instead of " << t;
@@ -1499,6 +1517,19 @@ namespace build
ct.prerequisites.emplace_back (p);
}
+ void parser::
+ enter_buildfile (const path& p)
+ {
+ tracer trace ("parser::enter_buildfile", &path_);
+
+ const char* e (p.extension ());
+ targets.insert<buildfile> (
+ p.directory (),
+ p.leaf ().base ().string (),
+ &extension_pool.find (e == nullptr ? "" : e), // Always specified.
+ trace);
+ }
+
token_type parser::
next (token& t, token_type& tt)
{