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;