From 3855f2351ee5c12041d320951487c5c28b59759d Mon Sep 17 00:00:00 2001
From: agra <alex@swipelab.co>
Date: Tue, 19 May 2026 11:54:36 +0300
Subject: [PATCH] ffi: move test-companion .c/.h next to their .sx (drop
 vendors/ namespace)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

vendors/ is a third-party namespace (stb_image, kb_text_shape, etc.);
test fixtures don't belong there. The .c/.h companion files for the
Phase-0 FFI baselines now sit alongside the .sx that drives them in
examples/, with matching basenames:

  examples/ffi-01-primitives.{sx,c,h}    <- was vendors/ffi_primitives/
  examples/ffi-02-small-struct.{sx,c,h}  <- was vendors/ffi_structs/
  examples/ffi-03-large-struct.{sx,c,h}  <- was vendors/ffi_large_struct/
  examples/ffi-04-fp-struct.{sx,c,h}     <- was vendors/ffi_fp_struct/
  examples/ffi-05-string-args.{sx,c,h}   <- was vendors/ffi_strings/
  examples/ffi-06-callback.{sx,c,h}      <- was vendors/ffi_callback/
  examples/101-ffi-medium-struct.{sx,c}  <- was vendors/ffi_medium_struct/

`#source` / `#include` paths in the .sx files become bare filenames
(no prefix) since imports.zig's base_dir resolution finds them
relative to the importing .sx file's directory.

`library/vendors/sx_ffi_resolve_test/` stays put — that one's the
whole point: regression coverage for the stdlib-search branch of
the resolution chain, so it must live where ONLY that branch can
find it.

94/94 regression tests pass.
---
 .../ffi_medium_struct.c => examples/101-ffi-medium-struct.c   | 0
 examples/101-ffi-medium-struct.sx                             | 2 +-
 .../ffi_primitives.c => examples/ffi-01-primitives.c          | 2 +-
 .../ffi_primitives.h => examples/ffi-01-primitives.h          | 0
 examples/ffi-01-primitives.sx                                 | 4 ++--
 .../ffi_structs.c => examples/ffi-02-small-struct.c           | 2 +-
 .../ffi_structs.h => examples/ffi-02-small-struct.h           | 0
 examples/ffi-02-small-struct.sx                               | 2 +-
 .../ffi_large_struct.c => examples/ffi-03-large-struct.c      | 2 +-
 .../ffi_large_struct.h => examples/ffi-03-large-struct.h      | 0
 examples/ffi-03-large-struct.sx                               | 2 +-
 .../ffi_fp_struct.c => examples/ffi-04-fp-struct.c            | 2 +-
 .../ffi_fp_struct.h => examples/ffi-04-fp-struct.h            | 0
 examples/ffi-04-fp-struct.sx                                  | 2 +-
 .../ffi_strings.c => examples/ffi-05-string-args.c            | 2 +-
 .../ffi_strings.h => examples/ffi-05-string-args.h            | 0
 examples/ffi-05-string-args.sx                                | 2 +-
 .../ffi_callback/ffi_callback.c => examples/ffi-06-callback.c | 2 +-
 .../ffi_callback/ffi_callback.h => examples/ffi-06-callback.h | 0
 examples/ffi-06-callback.sx                                   | 2 +-
 20 files changed, 14 insertions(+), 14 deletions(-)
 rename vendors/ffi_medium_struct/ffi_medium_struct.c => examples/101-ffi-medium-struct.c (100%)
 rename vendors/ffi_primitives/ffi_primitives.c => examples/ffi-01-primitives.c (96%)
 rename vendors/ffi_primitives/ffi_primitives.h => examples/ffi-01-primitives.h (100%)
 rename vendors/ffi_structs/ffi_structs.c => examples/ffi-02-small-struct.c (96%)
 rename vendors/ffi_structs/ffi_structs.h => examples/ffi-02-small-struct.h (100%)
 rename vendors/ffi_large_struct/ffi_large_struct.c => examples/ffi-03-large-struct.c (94%)
 rename vendors/ffi_large_struct/ffi_large_struct.h => examples/ffi-03-large-struct.h (100%)
 rename vendors/ffi_fp_struct/ffi_fp_struct.c => examples/ffi-04-fp-struct.c (94%)
 rename vendors/ffi_fp_struct/ffi_fp_struct.h => examples/ffi-04-fp-struct.h (100%)
 rename vendors/ffi_strings/ffi_strings.c => examples/ffi-05-string-args.c (93%)
 rename vendors/ffi_strings/ffi_strings.h => examples/ffi-05-string-args.h (100%)
 rename vendors/ffi_callback/ffi_callback.c => examples/ffi-06-callback.c (85%)
 rename vendors/ffi_callback/ffi_callback.h => examples/ffi-06-callback.h (100%)

diff --git a/vendors/ffi_medium_struct/ffi_medium_struct.c b/examples/101-ffi-medium-struct.c
similarity index 100%
rename from vendors/ffi_medium_struct/ffi_medium_struct.c
rename to examples/101-ffi-medium-struct.c
diff --git a/examples/101-ffi-medium-struct.sx b/examples/101-ffi-medium-struct.sx
index 00ccce2..73a34be 100644
--- a/examples/101-ffi-medium-struct.sx
+++ b/examples/101-ffi-medium-struct.sx
@@ -17,7 +17,7 @@
 #import "modules/std.sx";
 
 #import c {
-    #source "vendors/ffi_medium_struct/ffi_medium_struct.c";
+    #source "101-ffi-medium-struct.c";
 };
 
 Pair64 :: struct { a: s64; b: s64; }
diff --git a/vendors/ffi_primitives/ffi_primitives.c b/examples/ffi-01-primitives.c
similarity index 96%
rename from vendors/ffi_primitives/ffi_primitives.c
rename to examples/ffi-01-primitives.c
index fd35710..d4b16ba 100644
--- a/vendors/ffi_primitives/ffi_primitives.c
+++ b/examples/ffi-01-primitives.c
@@ -1,4 +1,4 @@
-#include "ffi_primitives.h"
+#include "ffi-01-primitives.h"
 
 int                ffi_id_int   (int                v) { return v; }
 unsigned int       ffi_id_uint  (unsigned int       v) { return v; }
diff --git a/vendors/ffi_primitives/ffi_primitives.h b/examples/ffi-01-primitives.h
similarity index 100%
rename from vendors/ffi_primitives/ffi_primitives.h
rename to examples/ffi-01-primitives.h
diff --git a/examples/ffi-01-primitives.sx b/examples/ffi-01-primitives.sx
index cfbdad7..04cef93 100644
--- a/examples/ffi-01-primitives.sx
+++ b/examples/ffi-01-primitives.sx
@@ -10,8 +10,8 @@
 #import "modules/std.sx";
 
 #import c {
-    #include "vendors/ffi_primitives/ffi_primitives.h";
-    #source "vendors/ffi_primitives/ffi_primitives.c";
+    #include "ffi-01-primitives.h";
+    #source "ffi-01-primitives.c";
 };
 
 main :: () -> s32 {
diff --git a/vendors/ffi_structs/ffi_structs.c b/examples/ffi-02-small-struct.c
similarity index 96%
rename from vendors/ffi_structs/ffi_structs.c
rename to examples/ffi-02-small-struct.c
index a5d5610..2615d9e 100644
--- a/vendors/ffi_structs/ffi_structs.c
+++ b/examples/ffi-02-small-struct.c
@@ -1,4 +1,4 @@
-#include "ffi_structs.h"
+#include "ffi-02-small-struct.h"
 
 Vec2 ffi_vec2_make(float x, float y) {
     Vec2 r = { x, y };
diff --git a/vendors/ffi_structs/ffi_structs.h b/examples/ffi-02-small-struct.h
similarity index 100%
rename from vendors/ffi_structs/ffi_structs.h
rename to examples/ffi-02-small-struct.h
diff --git a/examples/ffi-02-small-struct.sx b/examples/ffi-02-small-struct.sx
index fa05994..6103789 100644
--- a/examples/ffi-02-small-struct.sx
+++ b/examples/ffi-02-small-struct.sx
@@ -18,7 +18,7 @@
 // by-value ABI. The hand-written #foreign decls below keep sx's
 // struct types end-to-end.
 #import c {
-    #source "vendors/ffi_structs/ffi_structs.c";
+    #source "ffi-02-small-struct.c";
 };
 
 Vec2   :: struct { x: f32; y: f32; }
diff --git a/vendors/ffi_large_struct/ffi_large_struct.c b/examples/ffi-03-large-struct.c
similarity index 94%
rename from vendors/ffi_large_struct/ffi_large_struct.c
rename to examples/ffi-03-large-struct.c
index 552066b..d7eadc7 100644
--- a/vendors/ffi_large_struct/ffi_large_struct.c
+++ b/examples/ffi-03-large-struct.c
@@ -1,4 +1,4 @@
-#include "ffi_large_struct.h"
+#include "ffi-03-large-struct.h"
 
 Big24 ffi_big24_make(long long a, long long b, long long c) {
     Big24 r = { a, b, c };
diff --git a/vendors/ffi_large_struct/ffi_large_struct.h b/examples/ffi-03-large-struct.h
similarity index 100%
rename from vendors/ffi_large_struct/ffi_large_struct.h
rename to examples/ffi-03-large-struct.h
diff --git a/examples/ffi-03-large-struct.sx b/examples/ffi-03-large-struct.sx
index bdc2c90..e5d308a 100644
--- a/examples/ffi-03-large-struct.sx
+++ b/examples/ffi-03-large-struct.sx
@@ -16,7 +16,7 @@
 #import "modules/std.sx";
 
 #import c {
-    #source "vendors/ffi_large_struct/ffi_large_struct.c";
+    #source "ffi-03-large-struct.c";
 };
 
 Big24 :: struct { a: s64; b: s64; c: s64; }
diff --git a/vendors/ffi_fp_struct/ffi_fp_struct.c b/examples/ffi-04-fp-struct.c
similarity index 94%
rename from vendors/ffi_fp_struct/ffi_fp_struct.c
rename to examples/ffi-04-fp-struct.c
index 125a5f7..e02b4f5 100644
--- a/vendors/ffi_fp_struct/ffi_fp_struct.c
+++ b/examples/ffi-04-fp-struct.c
@@ -1,4 +1,4 @@
-#include "ffi_fp_struct.h"
+#include "ffi-04-fp-struct.h"
 
 FQuad ffi_fquad_make(float a, float b, float c, float d) {
     FQuad r = { a, b, c, d };
diff --git a/vendors/ffi_fp_struct/ffi_fp_struct.h b/examples/ffi-04-fp-struct.h
similarity index 100%
rename from vendors/ffi_fp_struct/ffi_fp_struct.h
rename to examples/ffi-04-fp-struct.h
diff --git a/examples/ffi-04-fp-struct.sx b/examples/ffi-04-fp-struct.sx
index 67f5499..70523e8 100644
--- a/examples/ffi-04-fp-struct.sx
+++ b/examples/ffi-04-fp-struct.sx
@@ -16,7 +16,7 @@
 #import "modules/std.sx";
 
 #import c {
-    #source "vendors/ffi_fp_struct/ffi_fp_struct.c";
+    #source "ffi-04-fp-struct.c";
 };
 
 FQuad :: struct { a: f32; b: f32; c: f32; d: f32; }
diff --git a/vendors/ffi_strings/ffi_strings.c b/examples/ffi-05-string-args.c
similarity index 93%
rename from vendors/ffi_strings/ffi_strings.c
rename to examples/ffi-05-string-args.c
index 5140c43..5f1713d 100644
--- a/vendors/ffi_strings/ffi_strings.c
+++ b/examples/ffi-05-string-args.c
@@ -1,4 +1,4 @@
-#include "ffi_strings.h"
+#include "ffi-05-string-args.h"
 
 int ffi_strlen(const char *s) {
     int n = 0;
diff --git a/vendors/ffi_strings/ffi_strings.h b/examples/ffi-05-string-args.h
similarity index 100%
rename from vendors/ffi_strings/ffi_strings.h
rename to examples/ffi-05-string-args.h
diff --git a/examples/ffi-05-string-args.sx b/examples/ffi-05-string-args.sx
index ef30e93..8722868 100644
--- a/examples/ffi-05-string-args.sx
+++ b/examples/ffi-05-string-args.sx
@@ -11,7 +11,7 @@
 #import "modules/std.sx";
 
 #import c {
-    #source "vendors/ffi_strings/ffi_strings.c";
+    #source "ffi-05-string-args.c";
 };
 
 ffi_strlen          :: (s: [:0]u8)                    -> s32 #foreign;
diff --git a/vendors/ffi_callback/ffi_callback.c b/examples/ffi-06-callback.c
similarity index 85%
rename from vendors/ffi_callback/ffi_callback.c
rename to examples/ffi-06-callback.c
index 605b43f..31bb9bd 100644
--- a/vendors/ffi_callback/ffi_callback.c
+++ b/examples/ffi-06-callback.c
@@ -1,4 +1,4 @@
-#include "ffi_callback.h"
+#include "ffi-06-callback.h"
 
 int ffi_apply_callback(int (*cb)(int), int value) {
     return cb(value);
diff --git a/vendors/ffi_callback/ffi_callback.h b/examples/ffi-06-callback.h
similarity index 100%
rename from vendors/ffi_callback/ffi_callback.h
rename to examples/ffi-06-callback.h
diff --git a/examples/ffi-06-callback.sx b/examples/ffi-06-callback.sx
index 712fa28..16a6535 100644
--- a/examples/ffi-06-callback.sx
+++ b/examples/ffi-06-callback.sx
@@ -13,7 +13,7 @@
 #import "modules/std.sx";
 
 #import c {
-    #source "vendors/ffi_callback/ffi_callback.c";
+    #source "ffi-06-callback.c";
 };
 
 ffi_apply_callback  :: (cb: (s32) -> s32, value: s32) -> s32 #foreign;