ack/klammertext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Klammerset: the @@@klammerset construct, its search path, and const correctness

Browse Source 
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).

(from dev 64b1abf23e56)
This commit is contained in:
Andy Kopra
2026-07-30 23:50:07 +02:00
parent c42981f7e2
commit ef77f03584
83 changed files with 1429 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mac/state.h
View File

@@ -14,9 +14,9 @@ class Var
{
public:
Var() = default;
Var(std::string name, std::string value=klammerstate::no_value,
std::string delim=":", std::string desc="", Locator loc=Locator(),
Argtype argtype=Argtype())
Var(const std::string& name, const std::string& value=klammerstate::no_value,
const std::string& delim=":", const std::string& desc="", const Locator& loc=Locator(),
const Argtype& argtype=Argtype())
: m_name(name)
, m_value(value)
, m_delim(delim)
@@ -24,7 +24,7 @@ public:
, m_loc(loc)
, m_argtype(argtype)
{};
bool defined();
bool defined() const;
std::string m_name {};
std::string m_value {};
@@ -41,15 +41,15 @@ inline std::string shell_environment_name = "Shell environment";
class Frame
{
public:
Frame(std::string name)
Frame(const std::string& name)
: m_name(name)
{};
std::vector<std::string> names() const;
void set(std::string name, std::string value,
std::string delim=":", std::string desc="", Locator loc=Locator(),
Argtype argtype=Argtype());
std::pair<Var, bool> get(std::string name);
void set(const std::string& name, const std::string& value,
const std::string& delim=":", const std::string& desc="", const Locator& loc=Locator(),
const Argtype& argtype=Argtype());
std::pair<Var, bool> get(const std::string& name) const;
std::string m_name {};
std::map<std::string, Var> m_vars {};
@@ -59,24 +59,24 @@ class State
{
public:
static int class_id;
void open_frame(std::string name);
void open_frame(const std::string& name);
void close_frame();
void set(std::string name, std::string value, bool update=false,
std::string delim=" ", std::string desc="", Locator loc=Locator(),
Argtype argtype=Argtype());
void set(std::map<std::string, std::string> varmap);
void set(const std::string& name, const std::string& value, bool update=false,
const std::string& delim=" ", const std::string& desc="", const Locator& loc=Locator(),
const Argtype& argtype=Argtype());
void set(const std::map<std::string, std::string>& varmap);
void set(const std::map<std::string, std::string>& varmap,
const Parameter_set& parameters);
void replace(std::string name, std::string value, bool error_if_not_defined=true);
void replace(const std::string& name, const std::string& value, bool error_if_not_defined=true);
void add_environment_frame();
Var get(std::string name, bool error_if_not_defined=false, Locator loc=Locator());
std::string value(std::string name, bool error_if_not_defined=true, Locator loc=Locator());
Var get(const std::string& name, bool error_if_not_defined=false, const Locator& loc=Locator()) const;
std::string value(const std::string& name, bool error_if_not_defined=true, const Locator& loc=Locator()) const;
std::string subst(std::string text, bool quote_values=false);
std::string subst(const std::string& text, bool quote_values=false) const;
void subst(std::vector<Katom>::iterator begin, std::vector<Katom>::iterator end);
void parse_state_katoms(std::vector<Katom>::iterator begin, std::vector<Katom>::iterator end, katom_list katoms);
std::vector<std::string> all_names();
void parse_state_katoms(std::vector<Katom>::iterator begin, std::vector<Katom>::iterator end, katom_list& katoms);
std::vector<std::string> all_names() const;
void add_search_dir(const std::string& dir);
std::string python_code();
std::string describe(bool show_environment=false, int margin_size=2) const;