Skip to content

express: support modern Lemon allocator callbacks #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starseeker merged 2 commits into from
Aug 2, 2026
Merged

express: support modern Lemon allocator callbacks #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b950dd
cmake: declare target link interfaces explicitly
starseeker Aug 2, 2026
7a19e69
express: support modern Lemon allocator callbacks
starseeker Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cmake/SC_Targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ macro(SC_ADDEXEC execname)
message(SEND_ERROR "SC_ADDEXEC usage error - expected STATIC LINK_LIBRARIES targets (${_lib})")
endif()
endif()
# Executables consume their dependencies but do not publish an
# interface to downstream targets.
target_link_libraries(${execname} PRIVATE ${_lib})
endforeach()
target_link_libraries(${execname} PRIVATE ${${_arg_prefix}_LINK_LIBRARIES})
endif()
Expand Down Expand Up @@ -74,6 +77,11 @@ macro(SC_ADDLIB _addlib_target)
message(SEND_ERROR "SC_ADDLIB usage error - expected (static) LINK_LIBRARIES targets (${_lib})")
endif()
endif()
# Schema libraries are consumed directly by generated test programs.
# Publish their link requirements explicitly; the legacy unscoped
# signature does not reliably provide a transitive interface with
# current CMake versions.
target_link_libraries(${_addlib_target} PUBLIC ${_lib})
endforeach()
target_link_libraries(${_addlib_target} ${_lib})
endif()
Expand All @@ -93,4 +101,3 @@ endmacro()
# indent-tabs-mode: t
# End:
# ex: shiftwidth=2 tabstop=8

21 changes: 21 additions & 0 deletions src/express/expparse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
/** Lemon grammar for Express parser, based on SCL's expparse.y. */
%include {
#include <assert.h>
#include <stdlib.h>
#include "token_type.h"
#include "parse_data.h"

/* Wrapper functions for modern lemon compatibility
* Modern lemon from starseeker/lemon uses a 3-parameter signature for memory
* allocation functions: void* realloc(void*, size_t, void*) and void free(void*, void*)
* The third parameter is a context pointer for custom allocators.
* These wrappers adapt the standard C library malloc/free/realloc to this signature
* by ignoring the context parameter. Error handling (NULL checks) is performed by
* the generated lemon code, not in these wrappers.
*/
static void *exp_realloc(void *ptr, size_t size, void *ctx) {
(void)ctx; /* unused - no custom allocator context needed */
return realloc(ptr, size);
}

static void exp_free(void *ptr, void *ctx) {
(void)ctx; /* unused - no custom allocator context needed */
free(ptr);
}

int yyerrstatus = 0;
#define yyerrok (yyerrstatus = 0)

Expand Down Expand Up @@ -120,6 +139,8 @@ void parserInitState( void )
} /* include */

%extra_argument { parse_data_t parseData }
%realloc exp_realloc
%free exp_free

%destructor statement_list {
if (parseData.scanner == NULL) {
Expand Down
Loading