Andy Kopra
4306dcd490
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>
68 lines
1.7 KiB
Makefile
68 lines
1.7 KiB
Makefile
# Klammertext mac/ Makefile
|
|
# Improved version with automatic header dependency tracking
|
|
|
|
K := $(KLAMMERTEXT_HOME)
|
|
KS := $(K)/sks
|
|
|
|
include $(K)/env/makefile.env
|
|
|
|
# Source files
|
|
BASENAMES := util error locator file argv character ktype katom katom_list \
|
|
log show command argument argument_set argtype argtype_registry \
|
|
state eval eval_python eval_cpp klammer klammer_registry klammerset klammerset_registry deftype \
|
|
target target_registry machine font_store check
|
|
|
|
SOURCES := $(addsuffix .cpp,$(BASENAMES))
|
|
OBJECTS := $(addsuffix .o,$(BASENAMES))
|
|
HEADERS := $(addsuffix .h,$(BASENAMES))
|
|
DEPFILES := $(addsuffix .d,$(BASENAMES))
|
|
|
|
# Shared library
|
|
LIBDIR := ../lib
|
|
LIBRARY := $(LIBDIR)/libklammertext.so
|
|
|
|
# Compiler flags for dependency generation
|
|
DEPFLAGS = -MMD -MP -MF $(@:.o=.d)
|
|
|
|
# Pattern rule for object files with automatic dependency generation
|
|
%.o : %.cpp
|
|
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(DEPFLAGS) $< -o $@
|
|
|
|
# Default target
|
|
.PHONY: all sks clean redo clang
|
|
|
|
all : $(LIBRARY)
|
|
$(MAKE) sks
|
|
|
|
# Create lib directory
|
|
$(LIBDIR):
|
|
mkdir -p $(LIBDIR)
|
|
|
|
# Build shared library
|
|
$(LIBRARY): $(OBJECTS) | $(LIBDIR)
|
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(SHARED) $(SONAME) -o $@ $(OBJECTS) $(LDLIBS)
|
|
|
|
# Build sks components
|
|
sks :
|
|
$(MAKE) -C $(KS)/kutil
|
|
$(MAKE) -C $(KS)/target
|
|
$(MAKE) -C $(KS)/document
|
|
|
|
clean :
|
|
rm -f $(OBJECTS) $(DEPFILES) $(LIBRARY) *~
|
|
|
|
redo :
|
|
ifneq ($(filter clang,$(MAKECMDGOALS)),)
|
|
@:
|
|
else
|
|
$(MAKE) clean
|
|
$(MAKE) -j all
|
|
endif
|
|
|
|
# "make clang" = incremental build; "make clang redo" = full clean rebuild
|
|
clang :
|
|
$(MAKE) $(or $(filter-out clang,$(MAKECMDGOALS)),all) COMPILER=clang
|
|
|
|
# Include generated dependency files (if they exist)
|
|
-include $(DEPFILES)
|