Andy Kopra
240cff4278
A snapshot of the development tree. The substantial changes since the last one:
COMMAND OUTPUT POLICY. The three commands display text in exactly three cases,
and each owns a stream: LOGGING under "-v" greater than 0 and an ERROR before
termination go to STDERR; OUTPUT THE USER ASKED FOR goes to STDOUT. For ktext
that output is a document, so "ktext doc.kt -d | ..." is now safe -- logging
used to share the stream and land inside the document. A bare command prints
its usage and succeeds rather than failing. Colour is emitted only to a
terminal, per stream, and NO_COLOR is honoured.
"-v 1" reports every decision whose outcome you could not have read off your own
input: the klammerset that was loaded and from which file, a font's directory, a
":files" name's file, how "-o" was expanded. Higher levels are the trace.
The commands no longer warn and continue: an anomaly is an error, described with
its location. Two exceptions remain, each for a stated reason -- a condition
that is expected and temporary by design, and a judgment that is a heuristic
rather than exact.
@cond IS NOW A TRUE SPECIAL FORM, resolved at APPLICATION time rather than when
the file is read. Two consequences for a writer:
* a state variable reaches the predicate. "@@@state Flag :value true @@@
@cond *Flag* | T | F @" renders "T"; it used to see the literal "*Flag*" and
silently take the false branch. The document now behaves like a klammer
body, whose arguments are bound before its conditionals are decided.
* nothing in a discarded branch happens -- it is not read, not evaluated, not
expanded. An @eval in the branch not taken used to run anyway.
Its predicate relation is total and strict: true, True, 1; false, False, 0, and
empty; anything else is an error at the @cond rather than silently false.
@eval REACHING OUTSIDE. ":shell" and ":haskell" now keep the command's standard
error out of the document (it appears under "-v 1") and treat a nonzero exit as
an error naming what the command reported. A command that exits nonzero on
purpose -- "grep" finding no match -- says so with "|| true".
KLAMMER SETS. Several combine: "--klammersets a b c" loads all three in the
order given, sharing one namespace, with the definition modes deciding
collisions. "none" means none and may not be combined with other symbols. A
klammerset with symbol X is declared in a file X/X.k, which is what lets two
sets require the same third set without loading it twice.
TESTS. Four new suites: the kdiag command's interface, the @eval primitive's
contract with the outside world, and verbosity at both tiers. Three suites
that could not run on macOS at all now do.
Assembled from dev commit 6c8ee6c22fca.
82 lines
2.7 KiB
C++
82 lines
2.7 KiB
C++
#pragma once
|
|
#include <map>
|
|
#include <string>
|
|
|
|
#include "target.h"
|
|
#include "argument_set.h"
|
|
#include "katom.h"
|
|
|
|
class Target_registry
|
|
{
|
|
public:
|
|
static std::string declare_name;
|
|
static std::string general_name;
|
|
// The pseudo-target of an option set declaration (@@name.o), reserved in
|
|
// the target namespace exactly as "k" is: both declare an interface and
|
|
// document it, and neither produces output for any target.
|
|
static std::string optionset_name;
|
|
|
|
Target_registry();
|
|
|
|
void add(Target target);
|
|
void add(std::vector<Katom>::iterator begin, std::vector<Katom>::iterator end, std::vector<Katom>& katoms);
|
|
void check_for_previous_definition(const std::string& name, const Locator& loc) const;
|
|
|
|
|
|
/*
|
|
void add_transforms(std::string target_name, std::string transforms);
|
|
void add_transforms(
|
|
std::string target_name,
|
|
std::vector<std::pair<std::string, std::string>> transforms);
|
|
*/
|
|
|
|
|
|
bool has(const std::string& target_name) const;
|
|
Target get(const std::string& target_name, const Locator& loc) const;
|
|
void transform(const std::string& target_name, std::vector<Katom>& katoms) const;
|
|
|
|
std::vector<std::string> user_defined() const;
|
|
std::vector<std::string> applicable() const;
|
|
|
|
// `defined_outside`: list only targets declared in a file not in the list.
|
|
// The three pseudo-targets (k, o, *) are built in and always shown -- they
|
|
// are the language's, not any klammerset's.
|
|
std::string describe(int margin=2, bool long_format=false,
|
|
const strings_t& defined_outside = {}) const;
|
|
|
|
//Argtype_registry m_argtypes {};
|
|
std::map<std::string, Target> m_targets {};
|
|
std::vector<std::string> m_names {};
|
|
Parameter_set m_parameters {};
|
|
|
|
|
|
/*
|
|
std::string m_parameters_spec {"name | desc :after_apply :after_write :includes | transforms.rest"};
|
|
Parameter_set m_parameters =
|
|
katomize(line_split(m_parameters_spec), Locator().str());
|
|
*/
|
|
|
|
|
|
//Parameter_set m_parameters =
|
|
// Parameter_set(katomize({"name :desc | transforms.rest"}, "target_registry"));
|
|
|
|
/*
|
|
// Targets(Statevar_set& statevars);
|
|
|
|
target_ptr check_target_existence(
|
|
std::string name, Locator loc, bool should_exist);
|
|
void add(std::string name, std::string desc, std::string include,
|
|
// Statevar_set& statevars,
|
|
std::string transform,
|
|
std::string before_apply, std::string after_apply, std::string after_write,
|
|
Locator loc);
|
|
target_ptr check_target_name(
|
|
std::string target, bool allow_all, Locator loc);
|
|
|
|
std::map<std::string, target_ptr> targets {};
|
|
std::vector<std::string> names {};
|
|
void describe_suffixes();
|
|
void describe();
|
|
*/
|
|
};
|