2026-07-18 18:48:23 +02:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
#include "locator.h"
|
|
|
|
|
|
|
|
|
|
inline std::string command_name { "Command executed on the command line" };
|
|
|
|
|
inline std::string command_pathname { "Pathname of command executed on the command line" };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Error : std::exception {
|
|
|
|
|
public:
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
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)
2026-07-30 23:50:07 +02:00
|
|
|
Error(const std::string& error_type, const std::string& description,
|
|
|
|
|
const Locator& locator = Locator(), bool do_justify = true)
|
2026-07-18 18:48:23 +02:00
|
|
|
: m_type(error_type)
|
|
|
|
|
, m_desc(description)
|
|
|
|
|
, m_loc(locator)
|
|
|
|
|
, m_just(do_justify)
|
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
void print_message(const std::string& epilog="");
|
|
|
|
|
|
|
|
|
|
std::string m_type {};
|
|
|
|
|
std::string m_desc {};
|
|
|
|
|
Locator m_loc; // {};
|
|
|
|
|
bool m_just { true };
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Parsing_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Parsing_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("parsing", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class File_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit File_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("file", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Target_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Target_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("target", description, locator, do_justify) {};
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
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)
2026-07-30 23:50:07 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Klammerset_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Klammerset_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("klammerset", description, locator, do_justify) {};
|
2026-07-18 18:48:23 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Definition_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Definition_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("definition", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Argument_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Argument_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("argument", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Environment_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Environment_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("environment", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
Recursion guard and static klammer checking
A klammer that reaches itself, directly or through a cycle, expanded
until the C++ stack was exhausted: the process died from SIGSEGV with no
message and no location. The former limit guarded only the top-level
fixed-point iteration, never the descent through klammer application. A
depth guard now raises a recursion error naming the klammer and where it
was applied. The same loop's termination test moves from "the katom list
stopped growing" to "a pass applied no klammer", since a klammer whose
body expands to nothing is a reduction that adds no katoms; exceeding the
round limit is now an error rather than a message followed by rendering a
document with live klammers still in it.
ktext --check locates every klammer application written in a document or
in a klammer body and checks name existence, argument count, option
names, and target coverage without applying anything, reporting all
problems at once. This is possible because Klammertext has no catcodes:
katom structure is fixed when a file is read, so a klammer body has a
determinate shape before it is expanded. The check therefore reaches what
the engine cannot -- the branch of a @cond that is not selected, and
bodies a given render never enters.
@cond's set of truth values is an open language question, so its meaning
is unchanged here; an unrecognized predicate now warns, giving its value
and location.
tst/ gains recursion_test.sh (7 cases) and check_test.sh (19 cases), and
this snapshot's test Makefile is generated from the shipped suite list so
the two cannot drift apart.
(from dev c27e63802406)
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-01 15:41:43 +02:00
|
|
|
// Klammer application nested deeper than the engine's limit. Raised by the
|
|
|
|
|
// depth guard in Machine::apply_klammer(); without it a klammer that applies
|
|
|
|
|
// itself (directly or through a cycle) exhausts the C++ stack and the process
|
|
|
|
|
// dies with SIGSEGV and no diagnostic at all.
|
|
|
|
|
class Recursion_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Recursion_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("recursion", description, locator, do_justify) {};
|
|
|
|
|
};
|
|
|
|
|
|
2026-07-18 18:48:23 +02:00
|
|
|
class Internal_error : public Error {
|
|
|
|
|
public:
|
|
|
|
|
explicit Internal_error(
|
|
|
|
|
const std::string& description, const Locator& locator=Locator(), bool do_justify=true)
|
|
|
|
|
: Error("internal", description, locator, do_justify) {};
|
|
|
|
|
};
|