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.
165 lines
6.5 KiB
C++
165 lines
6.5 KiB
C++
#pragma once
|
|
|
|
#include <string>
|
|
|
|
// #include "source.h"
|
|
#include "katom_list.h"
|
|
#include "klammer_registry.h"
|
|
#include "klammerset_registry.h"
|
|
#include "option_set_registry.h"
|
|
#include "target_registry.h"
|
|
#include "argtype_registry.h"
|
|
#include "state.h"
|
|
|
|
#include "error.h"
|
|
|
|
class Machine
|
|
{
|
|
public:
|
|
using input_sources_t =
|
|
std::vector<std::variant<fs::path, std::string>>;
|
|
|
|
Machine();
|
|
|
|
// Copy constructor
|
|
Machine(const Machine& other)
|
|
: m_argtypes(other.m_argtypes)
|
|
, m_state(other.m_state)
|
|
, m_targets(other.m_targets)
|
|
, m_klammers(other.m_klammers)
|
|
, m_klammersets(other.m_klammersets)
|
|
, m_option_sets(other.m_option_sets)
|
|
, m_result(other.m_result)
|
|
{}
|
|
|
|
// Copy assignment operator
|
|
Machine& operator=(const Machine& other) {
|
|
if (this != &other) {
|
|
m_argtypes = other.m_argtypes;
|
|
m_state = other.m_state;
|
|
m_targets = other.m_targets;
|
|
m_klammers = other.m_klammers;
|
|
m_klammersets = other.m_klammersets;
|
|
m_option_sets = other.m_option_sets;
|
|
m_result = other.m_result;
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
// @cond is resolved at APPLICATION time, not read time (Andy, 2026-08-15,
|
|
// deciding notes/Klammertext_improvements.md §4.2). mark_cond_content()
|
|
// runs during process_katoms and makes every branch inert;
|
|
// resolve_cond_katoms() runs inside the apply fold, selects a branch, and
|
|
// processes only that one. The document then behaves like a klammer body:
|
|
// its state variables are bound before its conditionals are decided.
|
|
void mark_cond_content(std::vector<Katom>& katoms);
|
|
int resolve_cond_katoms(std::vector<Katom>& katoms, const std::string& target);
|
|
void process_eval_katoms(std::vector<Katom>& katoms);
|
|
void mark_literal_klammer_content(std::vector<Katom>& katoms);
|
|
void escape_target_characters(const Target& target, std::vector<Katom>& katoms);
|
|
|
|
// std::vector<Katom>
|
|
void process_katoms(
|
|
std::vector<Katom>& katoms, const std::string& source,
|
|
bool nonascii=true, bool literal=true, bool ignore=true, bool whitespace=true,
|
|
bool klammers=true, bool eval=true, bool cond=true, bool read=true);
|
|
|
|
std::vector<Katom> process(
|
|
std::string text, const std::string& source,
|
|
bool nonascii=true, bool literal=true, bool ignore=true, bool whitespace=true,
|
|
bool klammers=true, bool eval=true, bool cond=true, bool read=true);
|
|
|
|
void read(const fs::path& pathname);
|
|
void read(const std::string& s);
|
|
|
|
void expand_read_katoms(
|
|
std::vector<Katom>& katoms, std::string source_filename,
|
|
bool nonascii=true, bool literal=true, bool ignore=true, bool ws=true,
|
|
bool klammers=true, bool eval=true, bool cond=true, bool read=true);
|
|
|
|
void expand_constant_klammers(katom_list& katoms, const Katom& op, const Katom& cl);
|
|
void add_definition(katom_list& katoms, const Katom& op, const Katom& cl);
|
|
void load_klammerset_files(const Klammerset& klammerset, katom_iter insert_at);
|
|
// `tolerant` is for kdiag ONLY. It dissects the structure and typing of
|
|
// the katom list, and allows modes of processing that would be errors in
|
|
// ktext: run one definition tier without the other and a definition may
|
|
// be unregisterable (a klammer names a target that "--system" would have
|
|
// registered). Tolerant then SKIPS that definition instead of throwing,
|
|
// leaving its katoms unconsumed and therefore visible -- which is the
|
|
// report. ktext must keep throwing: there, a document naming an
|
|
// undefined target is a genuine error, and skipping it silently would
|
|
// render a wrong document.
|
|
void add_machine_definition(const std::string& name, katom_iter begin,
|
|
katom_iter end, bool& rescan);
|
|
void extract_machine_definitions(bool tolerant = false);
|
|
void extract_klammer_definitions(bool tolerant = false);
|
|
void extract_klammer_definitions(katom_list katoms);
|
|
void update_state(const std::map<std::string, std::string>& arg_map);
|
|
|
|
katom_list apply_klammer(Klammer& klammer, const std::string& target, katom_iter arguments_begin, katom_iter arguments_end);
|
|
|
|
void apply_klammer_registry(Klammer_registry& klammer_registry,
|
|
katom_list& katoms, const std::string& target, katom_iter begin, katom_iter end);
|
|
|
|
// Returns the number of klammers applied in this pass. The top-level
|
|
// fixed point loops while that count is nonzero: reduction is detected by
|
|
// a redex having been reduced, not by the katom list having grown.
|
|
int apply(Klammer_registry& klammer_registry, katom_list& katoms, const std::string& target);
|
|
|
|
std::string run_phase_functions();
|
|
std::string apply(const std::string& target_name, bool final_processing=true, bool escape_characters=true);
|
|
|
|
Argtype_registry m_argtypes {};
|
|
State m_state {};
|
|
Target_registry m_targets {};
|
|
Klammer_registry m_klammers {};
|
|
Klammerset_registry m_klammersets {};
|
|
Option_set_registry m_option_sets {};
|
|
input_sources_t m_sources {};
|
|
std::string m_result {};
|
|
std::vector<Katom> m_katoms {};
|
|
// False on the sub-Machine that re-reads an @eval result (Eval::eval):
|
|
// result text is machine-generated -- a renderer's raw target markup
|
|
// (e.g. a LaTeX column spec "@{}...") legitimately fails katom parsing
|
|
// and must not produce "Word not parsed" warnings.
|
|
bool m_warn_unparsed = true;
|
|
};
|
|
|
|
/*
|
|
class Machine {
|
|
private:
|
|
std::string m_name;
|
|
int m_id;
|
|
std::vector<std::string> m_sources;
|
|
bool m_active;
|
|
double m_value;
|
|
|
|
public:
|
|
// Default constructor
|
|
Machine() : m_name(""), m_id(0), m_sources(), m_active(false), m_value(0.0) {}
|
|
|
|
// Copy constructor
|
|
Machine(const Machine& other)
|
|
: m_name(other.m_name) // Copy name
|
|
, m_id(other.m_id) // Copy id
|
|
, m_sources() // Initialize m_sources as empty
|
|
, m_active(other.m_active) // Copy active status
|
|
, m_value(other.m_value) // Copy value
|
|
{
|
|
// m_sources is now empty, ready for new initialization
|
|
}
|
|
|
|
// Assignment operator (if needed)
|
|
Machine& operator=(const Machine& other) {
|
|
if (this != &other) {
|
|
m_name = other.m_name;
|
|
m_id = other.m_id;
|
|
m_sources.clear(); // Clear and leave empty
|
|
m_active = other.m_active;
|
|
m_value = other.m_value;
|
|
}
|
|
return *this;
|
|
}
|
|
};
|
|
*/
|