aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-10-28 10:10:08 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:36 +0200
commitcd40097447ff2400cb420ec973c16dadd26e6cda (patch)
treebcd1c902d487e7a60ffffd5b02b7c608829fbc57
parente61874e76052d3600d6f10807248f92935f3dd61 (diff)
Implement description support in testscript
-rw-r--r--build2/test/script/lexer12
-rw-r--r--build2/test/script/lexer.cxx60
-rw-r--r--build2/test/script/parser16
-rw-r--r--build2/test/script/parser.cxx256
-rw-r--r--build2/test/script/script9
-rw-r--r--unit-tests/test/script/lexer/buildfile4
-rw-r--r--unit-tests/test/script/lexer/description-line.test17
-rw-r--r--unit-tests/test/script/lexer/driver.cxx22
-rw-r--r--unit-tests/test/script/lexer/first-token.test5
-rw-r--r--unit-tests/test/script/lexer/script-line.test19
-rw-r--r--unit-tests/test/script/lexer/second-token.test5
-rw-r--r--unit-tests/test/script/parser/buildfile4
-rw-r--r--unit-tests/test/script/parser/description.test332
-rw-r--r--unit-tests/test/script/parser/driver.cxx39
-rw-r--r--unit-tests/test/script/parser/here-string.test11
-rw-r--r--unit-tests/test/script/parser/scope.test15
16 files changed, 764 insertions, 62 deletions
diff --git a/build2/test/script/lexer b/build2/test/script/lexer
index 53b88be..65ef297 100644
--- a/build2/test/script/lexer
+++ b/build2/test/script/lexer
@@ -25,11 +25,12 @@ namespace build2
enum
{
script_line = base_type::value_next,
- first_token, // Auto-expires at the end of the token.
- second_token, // Auto-expires at the end of the token.
- variable_line, // Auto-expires at the end of the line.
+ first_token, // Expires at the end of the token.
+ second_token, // Expires at the end of the token.
+ variable_line, // Expires at the end of the line.
command_line,
- here_line
+ here_line,
+ description_line // Expires at the end of the line.
};
lexer_mode () = default;
@@ -64,6 +65,9 @@ namespace build2
token
next_line ();
+ token
+ next_description ();
+
virtual token
word (state, bool) override;
diff --git a/build2/test/script/lexer.cxx b/build2/test/script/lexer.cxx
index 003e4ac..aa7b098 100644
--- a/build2/test/script/lexer.cxx
+++ b/build2/test/script/lexer.cxx
@@ -26,8 +26,8 @@ namespace build2
{
case lexer_mode::script_line:
{
- s1 = ";=!|&<> $(#\t\n";
- s2 = " == ";
+ s1 = ":;=!|&<> $(#\t\n";
+ s2 = " == ";
break;
}
case lexer_mode::first_token:
@@ -39,8 +39,8 @@ namespace build2
// Note that to recognize only leading '+-{}' we shouldn't add
// them to the separator strings.
//
- s1 = ";=+!|&<> $(#\t\n";
- s2 = " == ";
+ s1 = ":;=+!|&<> $(#\t\n";
+ s2 = " == ";
break;
}
case lexer_mode::second_token:
@@ -52,8 +52,8 @@ namespace build2
// add them to the separator strings (so this is identical to
// script_line).
//
- s1 = ";=!|&<> $(#\t\n";
- s2 = " == ";
+ s1 = ":;=!|&<> $(#\t\n";
+ s2 = " == ";
break;
}
case lexer_mode::variable_line:
@@ -85,6 +85,13 @@ namespace build2
q = false;
break;
}
+ case lexer_mode::description_line:
+ {
+ // This one is like a single-quoted string and has an ad hoc
+ // implementation.
+ //
+ break;
+ }
default:
{
// Disable pair separator except for attributes.
@@ -109,8 +116,15 @@ namespace build2
case lexer_mode::second_token:
case lexer_mode::variable_line:
case lexer_mode::command_line:
- case lexer_mode::here_line: r = next_line (); break;
- default: r = base_lexer::next_impl (); break;
+ case lexer_mode::here_line:
+ r = next_line ();
+ break;
+ case lexer_mode::description_line:
+ r = next_description ();
+ break;
+ default:
+ r = base_lexer::next_impl ();
+ break;
}
if (r.quoted)
@@ -191,6 +205,16 @@ namespace build2
}
}
+ if (m == lexer_mode::script_line ||
+ m == lexer_mode::first_token ||
+ m == lexer_mode::second_token)
+ {
+ switch (c)
+ {
+ case ':': return make_token (type::colon);
+ }
+ }
+
// Command line operator/separators.
//
if (m == lexer_mode::script_line ||
@@ -379,6 +403,26 @@ namespace build2
}
token lexer::
+ next_description ()
+ {
+ xchar c (get ());
+
+ uint64_t ln (c.line), cn (c.column);
+ string lexeme;
+
+ // For now no line continutions though we could support them.
+ //
+ for (; !eos (c) && c != '\n'; c = get ())
+ lexeme += c;
+
+ if (eos (c))
+ fail (c) << "expected newline at the end of description line";
+
+ state_.pop (); // Expire the description mode.
+ return token (move (lexeme), false, false, ln, cn);
+ }
+
+ token lexer::
word (state st, bool sep)
{
lexer_mode m (st.mode);
diff --git a/build2/test/script/parser b/build2/test/script/parser
index 1d8ecf3..f8a5f3e 100644
--- a/build2/test/script/parser
+++ b/build2/test/script/parser
@@ -54,8 +54,13 @@ namespace build2
void
parse_scope_body ();
+ description
+ pre_parse_description (token&, token_type&);
+
void
- pre_parse_line (token&, token_type&, lines* = nullptr);
+ pre_parse_line (token&, token_type&,
+ optional<description>&&,
+ lines* = nullptr);
bool
parse_variable_line (token&, token_type&);
@@ -87,6 +92,12 @@ namespace build2
size_t replay_quoted_;
+ // Insert id into the id map checking for duplicates.
+ //
+ protected:
+ const string&
+ insert_id (string, location);
+
protected:
using base_parser = build2::parser;
@@ -96,7 +107,10 @@ namespace build2
// Pre-parse state.
//
+ using id_map = std::unordered_map<string, location>;
+
group* group_;
+ id_map* id_map_;
// Parse state.
//
diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx
index 152f1f0..e09f98e 100644
--- a/build2/test/script/parser.cxx
+++ b/build2/test/script/parser.cxx
@@ -28,9 +28,12 @@ namespace build2
lexer_ = &l;
base_parser::lexer_ = &l;
+ id_map idm;
+
script_ = &s;
runner_ = nullptr;
group_ = script_;
+ id_map_ = &idm;
scope_ = nullptr;
// Start location of the implied script group is the beginning of the
@@ -59,6 +62,7 @@ namespace build2
script_ = &s;
runner_ = &r;
group_ = nullptr;
+ id_map_ = nullptr;
scope_ = &sc;
parse_scope_body ();
@@ -74,18 +78,29 @@ namespace build2
//
for (;;)
{
- // Start lexing each line recognizing leading '+-{}'.
+ // Start lexing each line recognizing leading ':+-{}'.
//
mode (lexer_mode::first_token);
+ tt = peek ();
+
+ // Handle description.
+ //
+ optional<description> d;
+ if (tt == type::colon)
+ d = pre_parse_description (t, tt);
// Determine the line type by peeking at the first token.
//
- switch (tt = peek ())
+ switch (tt)
{
case type::eos:
case type::rcbrace:
{
next (t, tt);
+
+ if (d)
+ fail (t) << "description before " << t;
+
return t;
}
case type::lcbrace:
@@ -98,13 +113,23 @@ namespace build2
if (next (t, tt) != type::newline)
fail (t) << "expected newline after '{'";
- // Push group. Use line number as the scope id.
+ // Push group. If there is no user-supplied id, use the line
+ // number as the scope id.
//
- unique_ptr<group> g (new group (to_string (sl.line), *group_));
+ const string& id (d && !d->id.empty ()
+ ? d->id
+ : insert_id (to_string (sl.line), sl));
+ id_map idm;
+ unique_ptr<group> g (new group (id, *group_));
+
+ id_map* om (id_map_);
+ id_map_ = &idm;
group* og (group_);
group_ = g.get ();
+ group_->desc = move (d);
+
group_->start_loc_ = sl;
token e (pre_parse_scope_body ());
group_->end_loc_ = get_location (e);
@@ -112,6 +137,7 @@ namespace build2
// Pop group.
//
group_ = og;
+ id_map_ = om;
// Drop empty scopes.
//
@@ -119,10 +145,8 @@ namespace build2
{
// See if this turned out to be an explicit test scope. An
// explicit test scope contains a single test, only variable
- // assignments in setup and nothing in teardown. Plus only the
- // test or the scope (but not both) can have an explicit id.
- //
- // @@ TODO: explicit id.
+ // assignments in setup and nothing in teardown. Plus only
+ // test or scope (but not both) can have a description.
//
auto& sc (g->scopes);
auto& su (g->setup_);
@@ -131,24 +155,47 @@ namespace build2
test* t;
if (sc.size () == 1 &&
(t = dynamic_cast<test*> (sc.back ().get ())) != nullptr &&
- td.empty () &&
find_if (
su.begin (), su.end (),
[] (const line& l)
{
return l.type != line_type::variable;
- }) == su.end ())
+ }) == su.end () &&
+ td.empty () &&
+ (!g->desc || !t->desc))
{
// It would have been nice to reuse the test object and only
- // throw aways the group. However, the merged scope should
- // have id_path/wd_path of the group. So to keep things
+ // throw aways the group. However, the merged scope may have
+ // to use id_path/wd_path of the group. So to keep things
// simple we are going to throw away both and create a new
// test object.
//
- // @@ TODO: decide whose id to use.
+ // Decide whose id to use. We use the group's unless there
+ // is a user-provided one for the test (note that they
+ // cannot be both user-provided since only one can have a
+ // description). If we are using the test's then we also
+ // have to insert it into the outer scope. Good luck getting
+ // its location.
//
- unique_ptr<test> m (new test (g->id_path.leaf ().string (),
- *group_));
+ string id;
+ if (t->desc && !t->desc->id.empty ())
+ {
+ // In the id map of the group we should have exactly one
+ // entry -- the one for the test id. That's where we will
+ // get the location.
+ //
+ assert (idm.size () == 1);
+ id = insert_id (t->desc->id, idm.begin ()->second);
+ }
+ else
+ id = g->id_path.leaf ().string ();
+
+ unique_ptr<test> m (new test (id, *group_));
+
+ // Move the description (again cannot be both).
+ //
+ if (g->desc) m->desc = move (g->desc);
+ else if (t->desc) m->desc = move (t->desc);
// Merge the lines of the group and the test.
//
@@ -183,7 +230,7 @@ namespace build2
}
default:
{
- pre_parse_line (t, tt);
+ pre_parse_line (t, tt, move (d));
assert (tt == type::newline);
break;
}
@@ -283,8 +330,139 @@ namespace build2
runner_->leave (*scope_, scope_->end_loc_);
}
+ description parser::
+ pre_parse_description (token& t, token_type& tt)
+ {
+ // Note: token is only peeked at. On return tt is also only peeked at
+ // and in the first_token mode.
+ //
+ assert (tt == type::colon);
+
+ description r;
+ location loc (get_location (peeked ()));
+
+ string sp; // Strip prefix.
+ size_t sn (0); // Strip prefix length.
+
+ for (size_t ln (1); tt == type::colon; ++ln)
+ {
+ next (t, tt); // Get ':'.
+
+ mode (lexer_mode::description_line);
+ next (t, tt);
+ assert (tt == type::word);
+
+ const string& l (t.value);
+
+ // If this is the first line, then get the "strip prefix", i.e., the
+ // beginning of the line that contains only whitespaces. If the
+ // subsequent lines start with the same prefix, then we strip it.
+ //
+ if (ln == 1)
+ {
+ sn = l.find_first_not_of (" \t");
+ sp.assign (l, 0, sn == string::npos ? (sn = 0) : sn);
+ }
+
+ // Apply strip prefix.
+ //
+ size_t i (l.compare (0, sn, sp) == 0 ? sn : 0);
+
+ // Strip trailing whitespaces, as a courtesy to the user.
+ //
+ size_t j (l.find_last_not_of (" \t"));
+ j = j != string::npos ? j + 1 : i;
+
+ size_t n (j - i); // [i, j) is our data.
+
+ if (ln == 1)
+ {
+ // First line. Ignore if it's blank.
+ //
+ if (n == 0)
+ --ln; // Stay as if on the first line.
+ else
+ {
+ // Otherwise, see if it is the id. Failed that we assume it is
+ // the summary until we see the next line.
+ //
+ (l.find_first_of (" \t", i) >= j ? r.id : r.summary).
+ assign (l, i, n);
+ }
+ }
+ else if (ln == 2)
+ {
+ // If this is a blank then whatever we have in id/summary is good.
+ // Otherwise, if we have id, then assume this is summary until we
+ // see the next line. And if not, then move what we (wrongly)
+ // assumed to be the summary to details.
+ //
+ if (n != 0)
+ {
+ if (!r.id.empty ())
+ r.summary.assign (l, i, n);
+ else
+ {
+ r.details = move (r.summary);
+ r.details += '\n';
+ r.details.append (l, i, n);
+
+ r.summary.clear ();
+ }
+ }
+ }
+ // Don't treat line 3 as special if we have given up on id/summary.
+ //
+ else if (ln == 3 && r.details.empty ())
+ {
+ // If this is a blank and we have id and/or summary, then we are
+ // good. Otherwise, if we have both, then move what we (wrongly)
+ // assumed to be id and summary to details.
+ //
+ if (n != 0)
+ {
+ if (!r.id.empty () && !r.summary.empty ())
+ {
+ r.details = move (r.id);
+ r.details += '\n';
+ r.details += r.summary;
+ r.details += '\n';
+
+ r.id.clear ();
+ r.summary.clear ();
+ }
+
+ r.details.append (l, i, n);
+ }
+ }
+ else
+ {
+ if (!r.details.empty ())
+ r.details += '\n';
+
+ r.details.append (l, i, n);
+ }
+
+ mode (lexer_mode::first_token);
+ tt = peek ();
+ }
+
+ // Zap trailing newlines in the details.
+ //
+ size_t p (r.details.find_last_not_of ('\n'));
+ if (p != string::npos && ++p != r.details.size ())
+ r.details.resize (p);
+
+ // Insert id into the id map if we have one.
+ //
+ if (!r.id.empty ())
+ insert_id (r.id, loc);
+
+ return r;
+ }
+
void parser::
- pre_parse_line (token& t, type& tt, lines* ls)
+ pre_parse_line (token& t, type& tt, optional<description>&& d, lines* ls)
{
// Note: token is only peeked at.
//
@@ -375,6 +553,9 @@ namespace build2
{
case line_type::setup:
{
+ if (d)
+ fail (ll) << "description before setup command";
+
if (!group_->scopes.empty ())
fail (ll) << "setup command after tests";
@@ -386,6 +567,9 @@ namespace build2
}
case line_type::tdown:
{
+ if (d)
+ fail (ll) << "description before teardown command";
+
ls = &group_->tdown_;
break;
}
@@ -393,10 +577,14 @@ namespace build2
{
// If there is a semicolon after the variable then we assume
// it is part of a test (there is no reason to use semicolons
- // after variables in the group scope).
+ // after variables in the group scope). Otherwise -- setup or
+ // teardown.
//
if (!semi)
{
+ if (d)
+ fail (ll) << "description before setup/teardown variable";
+
// If we don't have any nested scopes or teardown commands,
// then we assume this is a setup, otherwise -- teardown.
//
@@ -445,6 +633,8 @@ namespace build2
switch (tt)
{
+ case type::colon:
+ fail (ll) << "description inside test";
case type::eos:
case type::rcbrace:
case type::lcbrace:
@@ -454,21 +644,29 @@ namespace build2
case type::minus:
fail (ll) << "teardown command in test";
default:
- pre_parse_line (t, tt, ls);
+ pre_parse_line (t, tt, nullopt, ls);
assert (tt == type::newline); // End of last test line.
}
}
- // Create implicit test scope. Use line number as the scope id.
+ // Create implicit test scope.
//
if (ls == &tests)
{
- unique_ptr<test> p (new test (to_string (ll.line), *group_));
+ // If there is no user-supplied id, use the line number as the scope
+ // id.
+ //
+ const string& id (d && !d->id.empty ()
+ ? d->id
+ : insert_id (to_string (ll.line), ll));
- p->start_loc_ = ll;
- p->end_loc_ = get_location (t);
+ unique_ptr<test> p (new test (id, *group_));
+ p->desc = move (d);
+
+ p->start_loc_ = ll;
p->tests_ = move (tests);
+ p->end_loc_ = get_location (t);
group_->scopes.push_back (move (p));
}
@@ -1461,6 +1659,18 @@ namespace build2
assert (replay_data_[replay_quoted_].token.quoted == cur.quoted);
}
}
+
+ const string& parser::
+ insert_id (string id, location l)
+ {
+ auto p (id_map_->emplace (move (id), move (l)));
+
+ if (!p.second)
+ fail (l) << "duplicate id " << p.first->first <<
+ info (p.first->second) << "previously used here";
+
+ return p.first->first;
+ }
}
}
}
diff --git a/build2/test/script/script b/build2/test/script/script
index a841d6c..7ce6708 100644
--- a/build2/test/script/script
+++ b/build2/test/script/script
@@ -139,6 +139,13 @@ namespace build2
ostream&
operator<< (ostream&, const command&);
+ struct description
+ {
+ string id;
+ string summary;
+ string details;
+ };
+
class script;
class scope
@@ -155,6 +162,8 @@ namespace build2
const path& id_path; // Id path ($@, relative in POSIX form).
const dir_path& wd_path; // Working dir ($~, absolute and normalized).
+ optional<description> desc;
+
// Files and directories that must be automatically cleaned up when
// the scope is left. If the path ends with a trailing slash, then it
// is assumed to be to a directory, otherwise -- to a file.
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index 30f6b9f..d9b17e8 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -8,7 +8,7 @@ import libs = libbutl%lib{butl}
src = token lexer diagnostics utility variable name test/script/{token lexer}
exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \
-test{script-line command-line first-token second-token variable-line variable \
- comment}
+test{script-line command-line first-token second-token variable-line \
+ description-line variable comment}
include ../../../../build2/
diff --git a/unit-tests/test/script/lexer/description-line.test b/unit-tests/test/script/lexer/description-line.test
new file mode 100644
index 0000000..f0f0c9f
--- /dev/null
+++ b/unit-tests/test/script/lexer/description-line.test
@@ -0,0 +1,17 @@
+test.arguments += description-line
+
+$* <" foo bar " >>EOO # full
+' foo bar '
+EOO
+
+$* <" " >>EOO # space
+' '
+EOO
+
+$* <"" >>EOO # empty
+''
+EOO
+
+$* <:"foo" 2>>EOE != 0 # eof
+stdin:1:4: error: expected newline at the end of description line
+EOE
diff --git a/unit-tests/test/script/lexer/driver.cxx b/unit-tests/test/script/lexer/driver.cxx
index c5beebb..abd32ba 100644
--- a/unit-tests/test/script/lexer/driver.cxx
+++ b/unit-tests/test/script/lexer/driver.cxx
@@ -29,13 +29,14 @@ namespace build2
assert (argc == 2);
string s (argv[1]);
- if (s == "script-line") m = lexer_mode::script_line;
- else if (s == "first-token") m = lexer_mode::first_token;
- else if (s == "second-token") m = lexer_mode::second_token;
- else if (s == "variable-line") m = lexer_mode::variable_line;
- else if (s == "command-line") m = lexer_mode::command_line;
- else if (s == "here-line") m = lexer_mode::here_line;
- else if (s == "variable") m = lexer_mode::variable;
+ if (s == "script-line") m = lexer_mode::script_line;
+ else if (s == "first-token") m = lexer_mode::first_token;
+ else if (s == "second-token") m = lexer_mode::second_token;
+ else if (s == "variable-line") m = lexer_mode::variable_line;
+ else if (s == "command-line") m = lexer_mode::command_line;
+ else if (s == "here-line") m = lexer_mode::here_line;
+ else if (s == "description-line") m = lexer_mode::description_line;
+ else if (s == "variable") m = lexer_mode::variable;
else assert (false);
}
@@ -45,9 +46,10 @@ namespace build2
// Some modes auto-expire so we need something underneath.
//
- bool u (m == lexer_mode::first_token ||
- m == lexer_mode::second_token ||
- m == lexer_mode::variable_line ||
+ bool u (m == lexer_mode::first_token ||
+ m == lexer_mode::second_token ||
+ m == lexer_mode::variable_line ||
+ m == lexer_mode::description_line ||
m == lexer_mode::variable);
lexer l (cin, path ("stdin"), u ? lexer_mode::script_line : m);
diff --git a/unit-tests/test/script/lexer/first-token.test b/unit-tests/test/script/lexer/first-token.test
index a433362..456ef6d 100644
--- a/unit-tests/test/script/lexer/first-token.test
+++ b/unit-tests/test/script/lexer/first-token.test
@@ -7,6 +7,11 @@ $* <";" >>EOO # semi
<newline>
EOO
+$* <":" >>EOO # colon
+:
+<newline>
+EOO
+
$* <"{" >>EOO # lcbrace
{
<newline>
diff --git a/unit-tests/test/script/lexer/script-line.test b/unit-tests/test/script/lexer/script-line.test
index 6c5038a..96eb19c 100644
--- a/unit-tests/test/script/lexer/script-line.test
+++ b/unit-tests/test/script/lexer/script-line.test
@@ -17,6 +17,25 @@ $* <";" >>EOO # semi-only
<newline>
EOO
+$* <"cmd: dsc" >>EOO # colon
+'cmd'
+:
+'dsc'
+<newline>
+EOO
+
+$* <"cmd :dsc" >>EOO # colon-separated
+'cmd'
+:
+'dsc'
+<newline>
+EOO
+
+$* <":" >>EOO # colon-only
+:
+<newline>
+EOO
+
$* <"cmd <+ 1>+" >>EOO # pass-redirect
'cmd'
<+
diff --git a/unit-tests/test/script/lexer/second-token.test b/unit-tests/test/script/lexer/second-token.test
index 058dc65..5238a82 100644
--- a/unit-tests/test/script/lexer/second-token.test
+++ b/unit-tests/test/script/lexer/second-token.test
@@ -7,6 +7,11 @@ $* <";" >>EOO # semi
<newline>
EOO
+$* <":" >>EOO # colon
+:
+<newline>
+EOO
+
$* <"=foo" >>EOO # assign
=
'foo'
diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile
index e64159e..c65dd73 100644
--- a/unit-tests/test/script/parser/buildfile
+++ b/unit-tests/test/script/parser/buildfile
@@ -11,7 +11,7 @@ filesystem config/{utility init operation} dump types-parsers \
test/{target script/{token lexer parser script}}
exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \
-test{cleanup command-re-parse expansion here-document pre-parse redirect \
- scope setup-teardown}
+test{cleanup command-re-parse description expansion here-document here-string \
+ pre-parse redirect scope setup-teardown}
include ../../../../build2/
diff --git a/unit-tests/test/script/parser/description.test b/unit-tests/test/script/parser/description.test
new file mode 100644
index 0000000..881cb5b
--- /dev/null
+++ b/unit-tests/test/script/parser/description.test
@@ -0,0 +1,332 @@
+$* <<EOI >>EOO # id
+: foo
+cmd
+EOI
+: id:foo
+cmd
+EOO
+
+$* <<EOI >>EOO # summary
+: foo bar
+cmd
+EOI
+: sm:foo bar
+cmd
+EOO
+
+$* <<EOI >>EOO # id-summary
+: foo-bar
+: foo bar
+cmd
+EOI
+: id:foo-bar
+: sm:foo bar
+cmd
+EOO
+
+# Initially assumed summary.
+#
+$* <<EOI >>EOO # details-summary
+: foo bar
+: bar baz
+cmd
+EOI
+: foo bar
+: bar baz
+cmd
+EOO
+
+# Initially assumed id and summary.
+#
+$* <<EOI >>EOO # details-id-summary
+: foo-bar
+: bar baz
+: baz fox
+cmd
+EOI
+: foo-bar
+: bar baz
+: baz fox
+cmd
+EOO
+
+$* <<EOI >>EOO # id-details
+: foo-bar
+:
+: foo bar
+: bar baz
+cmd
+EOI
+: id:foo-bar
+:
+: foo bar
+: bar baz
+cmd
+EOO
+
+$* <<EOI >>EOO # summary-details
+: foo bar
+:
+: foo bar
+: bar baz
+cmd
+EOI
+: sm:foo bar
+:
+: foo bar
+: bar baz
+cmd
+EOO
+
+$* <<EOI >>EOO # id-summary-details
+: foo-bar
+: foo bar
+:
+: foo bar
+: bar baz
+cmd
+EOI
+: id:foo-bar
+: sm:foo bar
+:
+: foo bar
+: bar baz
+cmd
+EOO
+
+$* <<EOI >>EOO # blanks
+:
+:
+: foo bar
+: bar baz
+:
+: baz fox
+:
+:
+cmd
+EOI
+: foo bar
+: bar baz
+:
+: baz fox
+cmd
+EOO
+
+$* <<EOI >>EOO # strip
+: foo-bar
+: bar baz
+:
+: baz fox
+: fox biz
+:biz buz
+:
+cmd
+EOI
+: id:foo-bar
+: sm:bar baz
+:
+: baz fox
+: fox biz
+: biz buz
+cmd
+EOO
+
+# Legal places for a description.
+#
+$* <<EOI >>EOO # legal-var
+: foo bar
+x = y;
+cmd \$x
+EOI
+: sm:foo bar
+cmd y
+EOO
+
+# Illegal places for a description.
+#
+$* <": foo" 2>>EOE != 0 # illegal-eof
+testscript:2:1: error: description before <end of file>
+EOE
+
+$* <<EOI 2>>EOE != 0 # illegal-rcbrace
+{
+ cmd
+ : foo
+}
+EOI
+testscript:4:1: error: description before '}'
+EOE
+
+$* <<EOI 2>>EOE != 0 # illegal-setup
+: foo
++cmd
+EOI
+testscript:2:1: error: description before setup command
+EOE
+
+$* <<EOI 2>>EOE != 0 # illegal-tdown
+: foo
+-cmd
+EOI
+testscript:2:1: error: description before teardown command
+EOE
+
+$* <<EOI 2>>EOE != 0 # illegal-var
+: foo
+x = y
+EOI
+testscript:2:1: error: description before setup/teardown variable
+EOE
+
+$* <<EOI 2>>EOE != 0 # illegal-test
+cmd1;
+: foo
+cmd2
+EOI
+testscript:2:1: error: description inside test
+EOE
+
+# Id uniqueness.
+#
+$* <<EOI 2>>EOE != 0 # id-dup-test-test
+: foo
+cmd
+: foo
+cmd
+EOI
+testscript:3:1: error: duplicate id foo
+ testscript:1:1: info: previously used here
+EOE
+
+$* <<EOI 2>>EOE != 0 # id-dup-test-group
+: foo
+cmd
+: foo
+{
+ cmd
+ cmd
+}
+EOI
+testscript:3:1: error: duplicate id foo
+ testscript:1:1: info: previously used here
+EOE
+
+$* <<EOI 2>>EOE != 0 # id-dup-group-test
+: foo
+{
+ cmd
+ cmd
+}
+: foo
+cmd
+EOI
+testscript:6:1: error: duplicate id foo
+ testscript:1:1: info: previously used here
+EOE
+
+$* <<EOI 2>>EOE != 0 # id-dup-group-group
+: foo
+{
+ cmd
+ cmd
+}
+: foo
+{
+ cmd
+ cmd
+}
+EOI
+testscript:6:1: error: duplicate id foo
+ testscript:1:1: info: previously used here
+EOE
+
+$* <<EOI 2>>EOE != 0 # id-dup-group-derived
+: 3
+cmd
+{
+ cmd
+ cmd
+}
+EOI
+testscript:3:1: error: duplicate id 3
+ testscript:1:1: info: previously used here
+EOE
+
+$* <<EOI 2>>EOE != 0 # id-dup-test-derived
+: 3
+cmd
+cmd
+EOI
+testscript:3:1: error: duplicate id 3
+ testscript:1:1: info: previously used here
+EOE
+
+# Interaction with test scope merging.
+#
+
+# No merge since both have description.
+#
+$* -s -i <<EOI >>EOO # test-scope-both
+: foo
+{
+ : bar
+ cmd
+}
+EOI
+{
+ : id:foo
+ { # foo
+ : id:bar
+ { # foo/bar
+ cmd
+ }
+ }
+}
+EOO
+
+$* -s -i <<EOI >>EOO # test-scope-group
+: foo-bar
+: foo bar
+{
+ cmd
+}
+EOI
+{
+ : id:foo-bar
+ : sm:foo bar
+ { # foo-bar
+ cmd
+ }
+}
+EOO
+
+$* -s -i <<EOI >>EOO # test-scope-test
+{
+ : foo-bar
+ : foo bar
+ cmd
+}
+EOI
+{
+ : id:foo-bar
+ : sm:foo bar
+ { # foo-bar
+ cmd
+ }
+}
+EOO
+
+# Id conflict once moved to outer scope.
+#
+$* <<EOI 2>>EOE != 0 # test-scope-id-dup
+: foo
+cmd
+{
+ : foo
+ cmd
+}
+cmd
+EOI
+testscript:4:3: error: duplicate id foo
+ testscript:1:1: info: previously used here
+EOE
diff --git a/unit-tests/test/script/parser/driver.cxx b/unit-tests/test/script/parser/driver.cxx
index aad94f9..18fcdce 100644
--- a/unit-tests/test/script/parser/driver.cxx
+++ b/unit-tests/test/script/parser/driver.cxx
@@ -35,12 +35,47 @@ namespace build2
virtual void
enter (scope& s, const location&) override
{
+ if (s.desc)
+ {
+ const auto& d (*s.desc);
+
+ if (!d.id.empty ())
+ cout << ind_ << ": id:" << d.id << endl;
+
+ if (!d.summary.empty ())
+ cout << ind_ << ": sm:" << d.summary << endl;
+
+ if (!d.details.empty ())
+ {
+ if (!d.id.empty () || !d.summary.empty ())
+ cout << ind_ << ":" << endl; // Blank.
+
+ const auto& s (d.details);
+ for (size_t b (0), e (0), n; e != string::npos; b = e + 1)
+ {
+ e = s.find ('\n', b);
+ n = ((e != string::npos ? e : s.size ()) - b);
+
+ cout << ind_ << ':';
+ if (n != 0)
+ {
+ cout << ' ';
+ cout.write (s.c_str () + b, static_cast<streamsize> (n));
+ }
+ cout << endl;
+ }
+ }
+ }
+
if (scope_)
{
+ cout << ind_ << "{";
+
if (id_ && !s.id_path.empty ()) // Skip empty root scope id.
- cout << ind_ << ": " << s.id_path.string () << endl;
+ cout << " # " << s.id_path.string ();
+
+ cout << endl;
- cout << ind_ << "{" << endl;
ind_ += " ";
}
}
diff --git a/unit-tests/test/script/parser/here-string.test b/unit-tests/test/script/parser/here-string.test
new file mode 100644
index 0000000..9f44bb2
--- /dev/null
+++ b/unit-tests/test/script/parser/here-string.test
@@ -0,0 +1,11 @@
+$* <<EOI >>EOO # empty
+cmd <""
+EOI
+cmd <""
+EOO
+
+$* <<EOI >>EOO # empty-nn
+cmd <:""
+EOI
+cmd <:""
+EOO
diff --git a/unit-tests/test/script/parser/scope.test b/unit-tests/test/script/parser/scope.test
index a903959..38b6a76 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.test
@@ -57,8 +57,7 @@ $* -s -i <<EOI >>EOO # test-scope
}
EOI
{
- : 1
- {
+ { # 1
cmd
}
}
@@ -72,8 +71,7 @@ $* -s -i <<EOI >>EOO # test-scope-nested
}
EOI
{
- : 1
- {
+ { # 1
cmd
}
}
@@ -86,8 +84,7 @@ $* -s -i <<EOI >>EOO # test-scope-var
}
EOI
{
- : 1
- {
+ { # 1
cmd abc
}
}
@@ -101,11 +98,9 @@ $* -s -i <<EOI >>EOO # test-scope-setup
}
EOI
{
- : 1
- {
+ { # 1
setup
- : 1/4
- {
+ { # 1/4
cmd abc
}
}