aboutsummaryrefslogtreecommitdiff
path: root/mod/page.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-12-21 21:37:02 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-01-17 19:22:38 +0300
commit36115f92a7fdebaf13cb968b1acfe3c9973c0df4 (patch)
tree3b7a518df3f276a06793811d205faef4b38c1692 /mod/page.cxx
parent66e1aa46e47873227295aac41bcabf75f94dbca7 (diff)
Adapt to package manifest requirement classes change
Diffstat (limited to 'mod/page.cxx')
-rw-r--r--mod/page.cxx34
1 files changed, 21 insertions, 13 deletions
diff --git a/mod/page.cxx b/mod/page.cxx
index fb6ba90..8d315e9 100644
--- a/mod/page.cxx
+++ b/mod/page.cxx
@@ -520,20 +520,20 @@ namespace brep
if (&ras != &requirements_[0])
s << ", ";
- if (ras.conditional)
- s << "?";
-
if (ras.buildtime)
- s << "*";
+ s << '*';
- if (ras.empty ())
+ // If this is a simple requirement without id, then print the comment
+ // first word.
+ //
+ if (ras.simple () && ras[0][0].empty ())
{
- // If there is no requirement alternatives specified, then print the
- // comment first word.
- //
const auto& c (ras.comment);
if (!c.empty ())
{
+ if (ras[0].enable)
+ s << "? ";
+
auto n (c.find (' '));
s << string (c, 0, n);
@@ -543,23 +543,31 @@ namespace brep
}
else
{
- bool mult (ras.size () > 1);
+ bool mult (ras.size () > 1 ||
+ (ras.size () == 1 && ras[0].size () > 1));
if (mult)
- s << "(";
+ s << '(';
for (const auto& ra: ras)
{
if (&ra != &ras[0])
s << " | ";
- assert (ra.size () == 1); // @@ DEP
+ for (const string& r: ra)
+ {
+ if (&r != &ra[0])
+ s << ' ';
+
+ s << r;
+ }
- s << ra[0];
+ if (ra.enable)
+ s << " ?";
}
if (mult)
- s << ")";
+ s << ')';
}
}