2026-07-18 18:48:23 +02:00
|
|
|
#include "error.h"
|
|
|
|
|
#include "show.h"
|
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "file.h"
|
|
|
|
|
|
|
|
|
|
bool display_source(const std::string& filename_arg)
|
|
|
|
|
{
|
|
|
|
|
if (filename_arg.empty()) {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
fs::path filename = fs::path(filename_arg).filename();
|
|
|
|
|
return sks_commands.count(filename) == 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Error::print_message(const std::string& epilog)
|
|
|
|
|
{
|
An output policy for the three commands, and @cond as a true special form
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.
2026-08-16 01:37:59 +02:00
|
|
|
// The separator is not cosmetic: the description ends with a sentence, and
|
|
|
|
|
// appending the advice straight onto it ran the two together into one word
|
|
|
|
|
// ("...for an unspecified targetkdiag loads no klammerset..."). m_desc is
|
|
|
|
|
// then justified to 80 columns, so the break has to be a blank line rather
|
|
|
|
|
// than a single newline, which justify() would fold back into the flow.
|
|
|
|
|
if (epilog != "") {
|
|
|
|
|
m_desc += "\n\n" + epilog + "\n";
|
|
|
|
|
}
|
2026-07-18 18:48:23 +02:00
|
|
|
if (m_just)
|
|
|
|
|
m_desc = justify(m_desc, 80, 0);
|
|
|
|
|
std::cerr << "\n" << red << command_name << " (" << m_type << " error)";
|
|
|
|
|
if (display_source(m_loc.m_filename)) {
|
|
|
|
|
std::cerr << ":\n " << m_loc.m_filename;
|
|
|
|
|
}
|
|
|
|
|
if (m_loc.m_line > -1) {
|
|
|
|
|
std::cerr << ", line " << m_loc.m_line;
|
|
|
|
|
}
|
|
|
|
|
if (m_loc.m_chr > -1) {
|
|
|
|
|
std::cerr << ", character " << m_loc.m_chr + 1;
|
|
|
|
|
}
|
|
|
|
|
std::cerr << ":\n\n" << m_desc << reset << "\n";
|
|
|
|
|
}
|