Andy Kopra
59c1599bc9
kdesc gains --coverage, which reports for every klammer the set of targets it can render to, and — the point of it — which klammers' coverage cannot be derived and must therefore be declared. Three rules: coverage is DERIVED where the definitions determine it (a general body of klammer calls covers the intersection of what those klammers cover, by a greatest fixpoint after loading), DECLARED where the engine cannot interpret what decides it (an @eval body, whose targets are undecidable), and UNKNOWN where nothing is written — which never means "deliberately unavailable". Two new spellings in a definition's name. A comma-separated target list, "@@table.html,tex :: ...", gives one body several targets; it is surface syntax, expanded at registration, and each member goes through the redefinition rules on its own. And "@@date.* :: ..." writes the general target out, asserting that the klammer works for EVERY target including ones not yet defined — a stronger claim than a list of the targets defined today, and the one target declaration that could be mechanically falsified. The Standard Klammer Set was swept accordingly: it now has no general definitions at all, every klammer names the targets it serves, six use ".*", and tex and pdf are at zero undecided. kdesc's flags are reorganised on two rules: a flag reached for often gets a single letter (-k klammers, -t targets, -c characters, -i input), a more specialised topic a multi-letter name (--argtypes, --katoms, --rewrite, --optionsets, --coverage, --klammerset, --font); and -v says how much to show about PROCESSING, never what the RESULT contains — so the katom regex column is "--katoms full" and the coverage detail "--coverage all". NOTE: "-k" now lists klammers (optionally filtered by a name/description search); the katom table moved to "--katoms". Fixes carried along: an option written with no value crashed the command with SIGSEGV instead of reporting the mistake; two required positional arguments never parsed; kdesc and kdiag printed an error and exited 0; and definition diagnostics counted registrations rather than what was written, so one line could be reported as two definitions and then printed twice. Four new test suites: target_list, coverage, command_option, kdesc. (from dev 46f54080bd9a)
26 lines
1.1 KiB
C++
26 lines
1.1 KiB
C++
#pragma once
|
|
|
|
#include "klammer.h"
|
|
#include "target_registry.h"
|
|
|
|
class Klammer_registry
|
|
{
|
|
public:
|
|
Klammer_registry() = default;
|
|
void add(const Argtype_registry& argtypes, const Target_registry& targets,
|
|
Option_set_registry& option_sets,
|
|
std::vector<Katom>::iterator begin, std::vector<Katom>::iterator end, std::vector<Katom>& katoms);
|
|
void rationalize(const Target_registry& targets);
|
|
void check_klammer(const std::string& name, const std::string& target, const Locator& loc) const;
|
|
const std::vector<Katom>* constant_body(const std::string& name) const;
|
|
std::string instance_list(int margin) const;
|
|
// With a search string, only the klammers whose NAME or DESCRIPTION
|
|
// contains it, case-insensitively and with whitespace collapsed on both
|
|
// sides (a description written across several lines in a ".k" file must
|
|
// still match a phrase typed on one). Empty when nothing matched, which
|
|
// is how the caller knows to say so.
|
|
std::string describe(int margin=0, const std::string& search="") const;
|
|
|
|
std::map<std::string, Klammer> m_klammers {};
|
|
};
|