Skip to content

switch coord and coord2d to use templates #905

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
ab9rf merged 2 commits into from
Sep 1, 2026
Merged

switch coord and coord2d to use templates #905

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
cb12682
switch `coord` and `coord2d` to use templates
ab9rf Sep 1, 2026
f9f9a78
add lua dependency
ab9rf Sep 1, 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
17 changes: 6 additions & 11 deletions df.dfhack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,15 +576,13 @@
</enum-type>

<struct-type type-name='coord2d' custom-methods='true' comment='not a real structure'>
<!-- these are not actually used by codegen and are here only for reference -->
<int16_t name='x' init-value='-30000'/>
<int16_t name='y' init-value='-30000'/>

<custom-methods>
<cmethod name='isValid'/>
<cmethod name='clear'/>
</custom-methods>

<extra-include filename="CoordTemplate.h"/>
<code-helper name='describe'>(fmt "(~A,~A)" $.x $.y)</code-helper>
<codegen-override template="DFHack::Coord2d" using="int16_t" no-constructor="true" no-identity="true"/>
</struct-type>

<struct-type type-name='coord2d_path' custom-methods='true' comment='not a real structure'>
Expand All @@ -605,17 +603,14 @@
</struct-type>

<struct-type type-name='coord' custom-methods='true' comment='not a real structure'>
<!-- these are not actually used by codegen and are here only for reference -->
<int16_t name='x' init-value='-30000'/>
<int16_t name='y' init-value='-30000'/>
<int16_t name='z' init-value='-30000'/>

<extra-include type-name='coord2d'/>
<custom-methods>
<cmethod name='isValid'/>
<cmethod name='clear'/>
</custom-methods>

<extra-include filename="CoordTemplate.h"/>
<code-helper name='describe'>(fmt "(~A,~A,~A)" $.x $.y $.z)</code-helper>
<codegen-override template="DFHack::Coord3d" using="int16_t" no-constructor="true" no-identity="true"/>
</struct-type>

<struct-type type-name='coord_path' custom-methods='true' comment='not a real structure'>
Expand Down
2 changes: 1 addition & 1 deletion tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if(BUILD_XMLDUMP)
add_executable(xml-dump-type-sizes dump-type-sizes.cpp)
add_dependencies(xml-dump-type-sizes generate_headers)
target_include_directories(xml-dump-type-sizes PRIVATE ${dfapi_SOURCE_DIR}/include)
target_link_libraries(xml-dump-type-sizes PRIVATE ${FMTLIB})
target_link_libraries(xml-dump-type-sizes PRIVATE lua ${FMTLIB})
if(INSTALL_XMLDUMP)
install(TARGETS xml-dump-type-sizes DESTINATION .)
endif()
Expand Down
Loading