From fa5f630fa514e94922387eec8c3656cd4624eca5 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Tue, 11 Aug 2020 11:53:20 -0400 Subject: [PATCH] Refactoring --- examples/callbacks/Makefile | 16 ++++++++-------- ...mited-scm-call-from-c.scm => basic-no-gc.scm} | 2 +- examples/callbacks/{sys.c => basic.c} | 2 +- examples/callbacks/{sys.h => basic.h} | 0 .../{complex-scm-call.scm => full-with-gc.scm} | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename examples/callbacks/{limited-scm-call-from-c.scm => basic-no-gc.scm} (96%) rename examples/callbacks/{sys.c => basic.c} (99%) rename examples/callbacks/{sys.h => basic.h} (100%) rename examples/callbacks/{complex-scm-call.scm => full-with-gc.scm} (97%) diff --git a/examples/callbacks/Makefile b/examples/callbacks/Makefile index 5224feec..81b4cb72 100644 --- a/examples/callbacks/Makefile +++ b/examples/callbacks/Makefile @@ -1,14 +1,14 @@ -all: limited-scm-call-from-c complex-scm-call +all: basic-no-gc full-with-gc -sys.o: sys.c - cc -g -c sys.c +basic.o: basic.c + cc -g -c basic.c -limited-scm-call-from-c: limited-scm-call-from-c.scm sys.o - cyclone -CLNK sys.o limited-scm-call-from-c.scm +basic-no-gc: basic-no-gc.scm basic.o + cyclone -CLNK basic.o basic-no-gc.scm -complex-scm-call: complex-scm-call.scm sys.o - cyclone -CLNK sys.o complex-scm-call.scm +full-with-gc: full-with-gc.scm basic.o + cyclone -CLNK basic.o full-with-gc.scm .PHONY: clean clean: - rm -f *.o limited-scm-call-from-c.c limited-scm-call-from-c complex-scm-call.c complex-scm-call + rm -f *.o basic-no-gc.c basic-no-gc full-with-gc.c full-with-gc diff --git a/examples/callbacks/limited-scm-call-from-c.scm b/examples/callbacks/basic-no-gc.scm similarity index 96% rename from examples/callbacks/limited-scm-call-from-c.scm rename to examples/callbacks/basic-no-gc.scm index c7c268f0..27d0c354 100644 --- a/examples/callbacks/limited-scm-call-from-c.scm +++ b/examples/callbacks/basic-no-gc.scm @@ -2,7 +2,7 @@ (scheme write) (srfi 18)) -(include-c-header "sys.h") +(include-c-header "basic.h") (define lock (make-mutex)) (define *done* #f) diff --git a/examples/callbacks/sys.c b/examples/callbacks/basic.c similarity index 99% rename from examples/callbacks/sys.c rename to examples/callbacks/basic.c index b25a5337..95ebc90b 100644 --- a/examples/callbacks/sys.c +++ b/examples/callbacks/basic.c @@ -1,6 +1,6 @@ #include "cyclone/types.h" #include "cyclone/runtime.h" -#include "sys.h" +#include "basic.h" #include /** diff --git a/examples/callbacks/sys.h b/examples/callbacks/basic.h similarity index 100% rename from examples/callbacks/sys.h rename to examples/callbacks/basic.h diff --git a/examples/callbacks/complex-scm-call.scm b/examples/callbacks/full-with-gc.scm similarity index 97% rename from examples/callbacks/complex-scm-call.scm rename to examples/callbacks/full-with-gc.scm index 064247f4..e0f0bb38 100644 --- a/examples/callbacks/complex-scm-call.scm +++ b/examples/callbacks/full-with-gc.scm @@ -3,7 +3,7 @@ (srfi 1) (srfi 18)) -(include-c-header "sys.h") +(include-c-header "basic.h") (define lock (make-mutex)) (define *done* #f)