One table-driven enclosing-scope and in-file test-scope walker instead of per-language copies #356

Activity

1. joyful-ii-V-I

   added

   enhancementNew feature or requestNew feature or request

   help wantedExtra attention is neededExtra attention is needed

   on Sep 28, 2026
2. gounthar commented on Oct 16, 2026

   

   gounthar

   on Oct 16, 2026

   More actions

   I'd like to take the enclosing-scope half of this (9a). The in-file test-scope half stays open for someone else.

   I have it working locally. Kotlin's walker becomes one row in a small constexpr table ({Lang, owner kinds, name kind}), read by one positional walk. The definition pass looks its language up in the table instead of testing le.lang == Lang::Kotlin, so kotlinEnclosingScopeOf goes away and the ratchet in test/langidentity/ratchet.tsv drops from 352 to 351.

   What I ran:

   • langidentitycheck.sh, main 1bcb6540 against the branch, on the Kotlin fixtures plus square/okio, with ripwire's own src/ as a C++ control: 114 argv, all SAME
   • kotlincheck.sh: passes
   • --clones on src/: both 0.82 pairs with kotlinEnclosingScopeOf are gone, and the new walk is in no other group

   I left rustEnclosingScopeOf and the generic enclosingScopeOf as they are. Rust reads type:/name: fields, has the includeModules mode for Self:: and cleans up the path text, so I don't think a positional row fits it. And once the Kotlin copy is gone, --clones doesn't pair it with the generic walker anymore. Is that fine with you, or do you want both in the same table anyway? I can try it if you prefer, I'm just not sure it would make the code smaller.

   The reason I started here: the OCaml definitions PR for #377 needs the same walk for module scopes, and with this in, OCaml is a second row instead of a new branch.