Match one-line MEOS-C definitions when attaching @csqlfn#30
Merged
estebanzimanyi merged 1 commit intoJul 8, 2026
Merged
Conversation
`_FNDEF` located the MEOS-C definition following a `@csqlfn` doxygen block only when the return type was on its own line (`bool\nname(`). A one-line definition (`bool tpcbox_eq(const TPCBox *box1, ...)`, the pointcloud predicate style) was not matched, so the tag attached to the next matchable definition instead — collapsing several wrappers onto one MEOS function and leaving the skipped functions with no SQL name. Allow an optional same-line return-type prefix before the name. Regenerating the catalog restores the SQL name of ten functions that were previously dropped from every binding (the `tpcbox_eq..ge` comparison operators, the `hasX/hasZ/hasT` accessors and `pcpatch_get_pcid`) with no other change.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
attach_sqlfn_maplinks each MEOS-C function to its SQL name by finding the function definition that follows a@csqlfndoxygen block._FNDEFmatched that definition only when the return type sat on its own line (bool\nname(). A one-line definition —bool tpcbox_eq(const TPCBox *box1, ...), the pointcloud predicate style — was not matched, so the tag attached to the next matchable definition instead. Several wrappers then collapsed onto one MEOS function, and the skipped functions were left with no SQL name.The regex now also accepts an optional same-line return-type prefix (word/space/
*) before the name, so both layouts resolve.Regenerating the catalog against master restores the SQL name of ten functions that were previously dropped from every binding — the
tpcbox_eq,tpcbox_ne,tpcbox_lt,tpcbox_le,tpcbox_gt,tpcbox_gecomparison operators, thetpcbox_hasx/tpcbox_hasz/tpcbox_hastaccessors, andpcpatch_get_pcid— and changes nothing else (thirteen catalog entries move, all corrections; the test suite is green: 147 passed, 14 skipped).