diff options
Diffstat (limited to 'libbuild2/functions-builtin.cxx')
| -rw-r--r-- | libbuild2/functions-builtin.cxx | 221 |
1 files changed, 95 insertions, 126 deletions
diff --git a/libbuild2/functions-builtin.cxx b/libbuild2/functions-builtin.cxx index 7000f16..e24ff8e 100644 --- a/libbuild2/functions-builtin.cxx +++ b/libbuild2/functions-builtin.cxx @@ -26,72 +26,28 @@ namespace build2 if (s == "dedup") r = true; else - throw invalid_argument ("invalid flag '" + s + "'"); + throw invalid_argument ("invalid flag '" + s + '\''); } } return r; }; - static const char hex_digits[] = "0123456789abcdef"; - - static string - to_string (uint64_t i, optional<value> base, optional<value> width) - { - uint64_t b (base ? convert<uint64_t> (move (*base)) : 10); - size_t w (width - ? static_cast<size_t> (convert<uint64_t> (move (*width))) - : 0); - - // One day we can switch to C++17 std::to_chars(). - // - string r; - switch (b) - { - case 10: - { - r = to_string (i); - if (w > r.size ()) - r.insert (0, w - r.size (), '0'); - break; - } - case 16: - { - r.reserve (18); - r += "0x"; - - for (size_t j (64); j != 0; ) - { - j -= 4; - size_t d ((i >> j) & 0x0f); - - // Omit leading zeros but watch out for the i==0 corner case. - // - if (d != 0 || r.size () != 2 || j == 0) - r += hex_digits[d]; - } - - if (w > r.size () - 2) - r.insert (2, w - (r.size () - 2), '0'); - - break; - } - default: - throw invalid_argument ("unsupported base"); - } - - return r; - } - void builtin_functions (function_map& m) { function_family f (m, "builtin"); - // Note that we may want to extend the scope argument to a more general - // notion of "lookup context" (scope, target, prerequisite). + // $defined(<variable>) + // + // Return true if the specified variable is defined in the calling scope or + // any outer scopes. // // Note that this function is not pure. // + + // Note that we may want to extend the scope argument to a more general + // notion of "lookup context" (scope, target, prerequisite). + // f.insert ("defined", false) += [](const scope* s, names name) { if (s == nullptr) @@ -100,7 +56,17 @@ namespace build2 return (*s)[convert<string> (move (name))].defined (); }; - // Return variable visibility if it has been entered and NULL otherwise. + // $visibility(<variable>) + // + // Return variable visibility if it is known and `null` otherwise. + // + // Possible visibility value are: + // + // global -- all outer scopes + // project -- this project (no outer projects) + // scope -- this scope (no outer scopes) + // target -- target and target type/pattern-specific + // prereq -- prerequisite-specific // // Note that this function is not pure. // @@ -110,70 +76,108 @@ namespace build2 fail << "visibility() called out of scope" << endf; const variable* var ( - s->ctx.var_pool.find (convert<string> (move (name)))); + s->var_pool ().find (convert<string> (move (name)))); return (var != nullptr ? optional<string> (to_string (var->visibility)) : nullopt); }; + // $type(<value>) + // + // Return the type name of the value or empty string if untyped. + // f["type"] += [](value* v) {return v->type != nullptr ? v->type->name : "";}; + + // $null(<value>) + // + // Return true if the value is `null`. + // f["null"] += [](value* v) {return v->null;}; + + // $empty(<value>) + // + // Return true if the value is empty. + // f["empty"] += [](value* v) {return v->null || v->empty ();}; - f["identity"] += [](value* v) {return move (*v);}; - // $integer_sequence(<begin>, <end>[, <step>]) - // - // Return the list of uint64 integers starting from <begin> (including) to - // <end> (excluding) with the specified <step> or 1 if unspecified. If - // <begin> is greater than <end>, empty list is returned. + // $first(<value>[, <not_pair>]) + // $second(<value>[, <not_pair>]) // - // Note that currently negative numbers are not supported but this could - // be handled if required (e.g., by returning int64s in this case). + // Return the first or the second half of a pair, respectively. If a value + // is not a pair, then return `null` unless the <not_pair> argument is + // `true`, in which case return the non-pair value. // - // Note also that we could improve this by adding a shortcut to get the - // indexes of a list (for example, $indexes(<list>) plus potentially a - // similar $keys() function for maps). + // If multiple pairs are specified, then return the list of first/second + // halfs. If an element is not a pair, then omit it from the resulting + // list unless the <not_pair> argument is `true`, in which case add the + // non-pair element to the list. // - f["integer_sequence"] += [](value begin, value end, optional<value> step) + f["first"] += [] (names ns, optional<value> not_pair) { - uint64_t b (convert<uint64_t> (move (begin))); - uint64_t e (convert<uint64_t> (move (end))); - uint64_t s (step ? convert<uint64_t> (move (*step)) : 1); + // @@ TODO: would be nice to return typed half if passed typed value. - uint64s r; - if (b < e) + bool np (not_pair && convert<bool> (move (*not_pair))); + + names r; + for (auto i (ns.begin ()), e (ns.end ()); i != e; ) { - r.reserve (static_cast<size_t> ((e - b) / s + 1)); + name& f (*i++); + name* s (f.pair ? &*i++ : nullptr); - for (; b < e; b += s) - r.push_back (static_cast<size_t> (b)); + if (s != nullptr || np) + { + f.pair = '\0'; + r.push_back (move (f)); + } + else if (ns.size () == 1) + return value (nullptr); // Single non-pair. } - return r; + return value (move (r)); }; - // string - // - f["string"] += [](bool b) {return b ? "true" : "false";}; - f["string"] += [](int64_t i) {return to_string (i);}; - f["string"] += [](uint64_t i, optional<value> base, optional<value> width) + f["second"] += [] (names ns, optional<value> not_pair) { - return to_string (i, move (base), move (width)); + bool np (not_pair && convert<bool> (move (*not_pair))); + + names r; + for (auto i (ns.begin ()), e (ns.end ()); i != e; ) + { + name& f (*i++); + name* s (f.pair ? &*i++ : nullptr); + + if (s != nullptr) + r.push_back (move (*s)); + else if (np) + r.push_back (move (f)); + else if (ns.size () == 1) + return value (nullptr); // Single non-pair. + } + + return value (move (r)); }; - // Quote a value returning its string representation. If escape is true, - // then also escape (with a backslash) the quote characters being added - // (this is useful if the result will be re-parsed, for example as a - // Testscript command line). + // Leave this one undocumented for now since it's unclear why would anyone + // want to use it currently (we don't yet have any function composition + // facilities). + // + f["identity"] += [](value* v) {return move (*v);}; + + // $quote(<value>[, <escape>]) + // + // Quote the value returning its string representation. If <escape> is + // `true`, then also escape (with a backslash) the quote characters being + // added (this is useful if the result will be re-parsed, for example as a + // script command line). // f["quote"] += [](value* v, optional<value> escape) { if (v->null) return string (); - untypify (*v); // Reverse to names. + untypify (*v, true /* reduce */); // Reverse to names. ostringstream os; to_stream (os, @@ -184,48 +188,13 @@ namespace build2 return os.str (); }; - // $size(<ints>) - // - // Return the number of elements in the sequence. - // - f["size"] += [] (int64s v) {return v.size ();}; - f["size"] += [] (uint64s v) {return v.size ();}; - - // $sort(<ints> [, <flags>]) - // - // Sort integers in ascending order. - // - // The following flags are supported: - // - // dedup - in addition to sorting also remove duplicates - // - f["sort"] += [](int64s v, optional<names> fs) - { - sort (v.begin (), v.end ()); - - if (functions_sort_flags (move (fs))) - v.erase (unique (v.begin(), v.end()), v.end ()); - - return v; - }; - - f["sort"] += [](uint64s v, optional<names> fs) - { - sort (v.begin (), v.end ()); - - if (functions_sort_flags (move (fs))) - v.erase (unique (v.begin(), v.end()), v.end ()); - - return v; - }; - - // getenv + // $getenv(<name>) // - // Return NULL if the environment variable is not set, untyped value - // otherwise. + // Get the value of the environment variable. Return `null` if the + // environment variable is not set. // // Note that if the build result can be affected by the variable being - // queried, then it should be reported with the config.environment + // queried, then it should be reported with the `config.environment` // directive. // // Note that this function is not pure. |