Skip to content

Commit bedb221

Browse files
committed
fix(nim): resolve keyword conflicts and qualified names; sync global CI
1 parent 485dfd4 commit bedb221

4 files changed

Lines changed: 3 additions & 26 deletions

File tree

.hypatia-ignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
# Exempting legitimate Java/Kotlin bindings from language policy
3-
=======
41
# Exempting legitimate Java/Kotlin/Go bindings from language policy
5-
>>>>>>> main
62
bindings/java/** cicd_rules/banned_language_file
73
bindings/kotlin/** cicd_rules/banned_language_file
84
bindings/gql/neo4j/** cicd_rules/banned_language_file

Justfile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -180,24 +180,6 @@ chapel-test: build-ffi
180180
chapel-clean:
181181
just -d bindings/chapel --justfile bindings/chapel/Justfile clean
182182

183-
<<<<<<< HEAD
184-
# --- Nim Binding (Tier 1 Detachable Harness) ---
185-
# These recipes are THIN FORWARDERS into bindings/nim/.
186-
nim-check: build-ffi
187-
PROVEN_LIB_PATH="$(pwd)/ffi/zig/zig-out/lib" \
188-
just -d bindings/nim --justfile bindings/nim/Justfile nim-check
189-
190-
nim-build: build-ffi
191-
PROVEN_LIB_PATH="$(pwd)/ffi/zig/zig-out/lib" \
192-
just -d bindings/nim --justfile bindings/nim/Justfile build
193-
194-
nim-test: build-ffi
195-
PROVEN_LIB_PATH="$(pwd)/ffi/zig/zig-out/lib" \
196-
just -d bindings/nim --justfile bindings/nim/Justfile test
197-
198-
nim-clean:
199-
just -d bindings/nim --justfile bindings/nim/Justfile clean
200-
=======
201183
# --- OCaml Binding (Tier 1 Detachable Harness) ---
202184
# These recipes are THIN FORWARDERS into bindings/ocaml/.
203185
ocaml-check: build-ffi
@@ -214,7 +196,6 @@ ocaml-test: build-ffi
214196

215197
ocaml-clean:
216198
just -d bindings/ocaml --justfile bindings/ocaml/Justfile clean
217-
>>>>>>> main
218199

219200
# ---------------------------------------------------------------------------
220201
# Cleaning

bindings/nim/src/proven.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ export safe_unit
5454

5555
proc libraryVersion*(): string =
5656
## Return the library version string.
57-
$provenVersion()
57+
$lib_proven.provenVersion()
5858

5959
proc buildInfo*(): string =
6060
## Return detailed build information.
61-
$provenBuildInfo()
61+
$lib_proven.provenBuildInfo()

bindings/nim/src/proven/lib_proven.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ type
334334

335335
proc provenBufferCreate*(capacity: csize_t): BufferResult {.importc: "proven_buffer_create", dynlib: ProvenDynlib.}
336336
proc provenBufferAppend*(buffer: ptr ProvenBoundedBuffer, p: pointer, len: csize_t): int32 {.importc: "proven_buffer_append", dynlib: ProvenDynlib.}
337-
proc provenBufferGet*(buffer: ptr ProvenBoundedBuffer, out_ptr: ptr pointer, out_len: ptr csize_t): int32 {.importc: "proven_buffer_get", dynlib: ProvenDynlib.}
337+
proc provenBufferGet*(buffer: ptr ProvenBoundedBuffer, out_p: ptr pointer, out_l: ptr csize_t): int32 {.importc: "proven_buffer_get", dynlib: ProvenDynlib.}
338338
proc provenBufferFree*(buffer: ptr ProvenBoundedBuffer) {.importc: "proven_buffer_free", dynlib: ProvenDynlib.}
339339

340340
# ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)