aboutsummaryrefslogtreecommitdiff
path: root/libbbot
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-10-19 08:20:40 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-10-19 08:20:40 +0300
commit976d6ce0198cbe8c54c244665cc8dd63f2f85a86 (patch)
treeefc56e01e0638704ba7d8bea698da071ca6d1d49 /libbbot
parent8269189c803e2792d185ebafdc739071e2a0961e (diff)
Get rid of configuration arguments check
Diffstat (limited to 'libbbot')
-rw-r--r--libbbot/build-config.cxx3
-rw-r--r--libbbot/manifest.cxx25
-rw-r--r--libbbot/manifest.hxx7
3 files changed, 1 insertions, 34 deletions
diff --git a/libbbot/build-config.cxx b/libbbot/build-config.cxx
index 9005eca..05d123e 100644
--- a/libbbot/build-config.cxx
+++ b/libbbot/build-config.cxx
@@ -93,10 +93,7 @@ namespace bbot
config.warning_regexes.emplace_back (move (re));
}
else // Configuration variable.
- {
- task_manifest::check_config (v);
config.vars.emplace_back (move (v));
- }
}
}
catch (const invalid_argument& e)
diff --git a/libbbot/manifest.cxx b/libbbot/manifest.cxx
index a1cb325..db33021 100644
--- a/libbbot/manifest.cxx
+++ b/libbbot/manifest.cxx
@@ -536,7 +536,7 @@ namespace bbot
if (!config.empty ())
bad_name ("task configuration redefinition");
- config = parse_tab (v, check_config, "configuration");
+ config = parse_tab (v, [](const string&){}, "configuration");
if (config.empty ())
bad_value ("empty task configuration");
@@ -629,29 +629,6 @@ namespace bbot
}
void task_manifest::
- check_config (const string& s)
- {
- auto i (s.begin ());
- auto e (s.end ());
-
- // Iterate until the variable name end and check that it contains no
- // whitespaces.
- //
- for (; i != e; ++i)
- {
- char c (*i);
-
- if (c == ' ' || c == '\t') // Whitespace in name.
- throw invalid_argument ("expected variable assignment");
- else if (c == '=')
- break;
- }
-
- if (i == e)
- throw invalid_argument ("no variable value");
- }
-
- void task_manifest::
check_regex (const string& s)
{
try
diff --git a/libbbot/manifest.hxx b/libbbot/manifest.hxx
index 75a6995..117abb6 100644
--- a/libbbot/manifest.hxx
+++ b/libbbot/manifest.hxx
@@ -166,13 +166,6 @@ namespace bbot
void
serialize (butl::manifest_serializer&) const;
- // Check that a string has the name=value format. The name must not
- // contain spaces. Throw invalid_argument if the string doesn't conform to
- // these rules.
- //
- static void
- check_config (const std::string&);
-
// Check that a string is a valid (ECMAScript) regular expression. Throw
// invalid_argument if that's not the case.
//