aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-08-09 18:36:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-08-09 18:36:43 +0200
commit388b94567f3136d1370b37610081c5465a74bdb7 (patch)
tree8bdec1112e74dd8fd01e5d9e55b0f5f4c958b816
parentc5d4b19bb5e622697931870a293de0f794416c8f (diff)
Use parse_variable_name() in parse_import(), parse_config()
-rw-r--r--libbuild2/parser.cxx34
-rw-r--r--libbuild2/parser.hxx3
2 files changed, 22 insertions, 15 deletions
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index 9efc9eb..f8f463f 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -2903,8 +2903,7 @@ namespace build2
}
const variable& var (
- scope_->var_pool ().insert (move (name), true /* overridable */));
-
+ parse_variable_name (move (name), get_location (t)));
apply_variable_attributes (var);
// Note that even though we are relying on the config.** variable
@@ -3047,8 +3046,6 @@ namespace build2
if (stage_ == stage::boot)
fail (t) << "import during bootstrap";
- auto& vp (scope_->var_pool ());
-
// General import format:
//
// import[?!] [<attrs>] <var> = [<attrs>] (<target>|<project>%<target>])+
@@ -3090,8 +3087,8 @@ namespace build2
if (tt != type::word)
fail (t) << "expected variable name instead of " << t;
- const variable& var (vp.insert (move (t.value), true /* overridable */));
-
+ const variable& var (
+ parse_variable_name (move (t.value), get_location (t)));
apply_variable_attributes (var);
if (var.visibility > variable_visibility::scope)
@@ -4137,21 +4134,15 @@ namespace build2
}
const variable& parser::
- parse_variable_name (names&& ns, const location& l)
+ parse_variable_name (string&& on, const location& l)
{
- // Parse and enter a variable name for assignment (as opposed to lookup).
-
- // The list should contain a single, simple name.
- //
- if (ns.size () != 1 || ns[0].pattern || !ns[0].simple () || ns[0].empty ())
- fail (l) << "expected variable name instead of " << ns;
+ // Enter a variable name for assignment (as opposed to lookup).
// Note that the overridability can still be restricted (e.g., by a module
// that enters this variable or by a pattern).
//
bool ovr (true);
- auto r (scope_->var_pool ().insert (
- move (ns[0].value), nullptr, nullptr, &ovr));
+ auto r (scope_->var_pool ().insert (move (on), nullptr, nullptr, &ovr));
if (!r.second)
return r.first;
@@ -4179,6 +4170,19 @@ namespace build2
return r.first;
}
+ const variable& parser::
+ parse_variable_name (names&& ns, const location& l)
+ {
+ // Parse and enter a variable name for assignment (as opposed to lookup).
+
+ // The list should contain a single, simple name.
+ //
+ if (ns.size () != 1 || ns[0].pattern || !ns[0].simple () || ns[0].empty ())
+ fail (l) << "expected variable name instead of " << ns;
+
+ return parse_variable_name (move (ns[0].value), l);
+ }
+
void parser::
parse_variable (token& t, type& tt, const variable& var, type kind)
{
diff --git a/libbuild2/parser.hxx b/libbuild2/parser.hxx
index bc5bf4b..b1ac8b2 100644
--- a/libbuild2/parser.hxx
+++ b/libbuild2/parser.hxx
@@ -234,6 +234,9 @@ namespace build2
const variable&, token_type, const location&);
const variable&
+ parse_variable_name (string&&, const location&);
+
+ const variable&
parse_variable_name (names&&, const location&);
// Note: calls attributes_push() that the caller must pop.