Switch back to sagittarius

README.md

@@ -64,6 +64,7 @@ dll is included, no need to install anything.
 
 ### Build on Windows
 
+Work in progress
 In command prompt run:
 
     build.bat

chicken/include/chicken-config.h

@@ -1,179 +0,0 @@
-/* GENERATED */
-#define HAVE_DIRENT_H 1
-#define HAVE_DLFCN_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LONG_LONG 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMORY_H 1
-#define HAVE_SIGACTION 1
-#define HAVE_SIGSETJMP 1
-#define HAVE_SIGPROCMASK 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRERROR 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOQ 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SETENV 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UNSIGNED_LONG_LONG 1
-#define STDC_HEADERS 1
-#define HAVE_ALLOCA 1
-#define HAVE_ALLOCA_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_SYSEXITS_H 1
-#define C_STACK_GROWS_DOWNWARD 1
-#define C_USE_STD_FEATURE_MACROS
-#define C_CHICKEN_PROGRAM "chicken"
-#ifndef C_INSTALL_CC
-# define C_INSTALL_CC "gcc"
-#endif
-#ifndef C_INSTALL_CXX
-# define C_INSTALL_CXX "g++"
-#endif
-#ifndef C_INSTALL_POSTINSTALL_PROGRAM
-# define C_INSTALL_POSTINSTALL_PROGRAM "true"
-#endif
-#ifndef C_INSTALL_RC_COMPILER
-# define C_INSTALL_RC_COMPILER ""
-#endif
-#ifndef C_INSTALL_CFLAGS
-# define C_INSTALL_CFLAGS "-fno-strict-aliasing -fwrapv -DHAVE_CHICKEN_CONFIG_H -DC_ENABLE_PTABLES -Os -fomit-frame-pointer"
-#endif
-#ifndef C_INSTALL_LDFLAGS
-# define C_INSTALL_LDFLAGS " "
-#endif
-#ifndef C_INSTALL_PREFIX
-# define C_INSTALL_PREFIX "/usr/local"
-#endif
-#ifndef C_INSTALL_SHARE_HOME
-# define C_INSTALL_SHARE_HOME "/usr/local/share/chicken"
-#endif
-#ifndef C_INSTALL_BIN_HOME
-# define C_INSTALL_BIN_HOME "/usr/local/bin"
-#endif
-#ifndef C_INSTALL_EGG_HOME
-# define C_INSTALL_EGG_HOME "/usr/local/lib/chicken/12"
-#endif
-#ifndef C_INSTALL_LIB_HOME
-# define C_INSTALL_LIB_HOME "/usr/local/lib"
-#endif
-#ifndef C_INSTALL_LIB_NAME
-# define C_INSTALL_LIB_NAME "chicken"
-#endif
-#ifndef C_INSTALL_STATIC_LIB_HOME
-# define C_INSTALL_STATIC_LIB_HOME "/usr/local/lib"
-#endif
-#ifndef C_INSTALL_INCLUDE_HOME
-# define C_INSTALL_INCLUDE_HOME "/usr/local/include/chicken"
-#endif
-#ifndef C_INSTALL_MORE_LIBS
-# define C_INSTALL_MORE_LIBS "-lm -ldl"
-#endif
-#ifndef C_INSTALL_MORE_STATIC_LIBS
-# define C_INSTALL_MORE_STATIC_LIBS "-lm -ldl"
-#endif
-#ifndef C_STACK_GROWS_DOWNWARD
-# define C_STACK_GROWS_DOWNWARD 1
-#endif
-#ifndef C_TARGET_MORE_LIBS
-# define C_TARGET_MORE_LIBS "-lm -ldl"
-#endif
-#ifndef C_TARGET_MORE_STATIC_LIBS
-# define C_TARGET_MORE_STATIC_LIBS "-lm -ldl"
-#endif
-#ifndef C_TARGET_CC
-# define C_TARGET_CC "gcc"
-#endif
-#ifndef C_TARGET_CXX
-# define C_TARGET_CXX "g++"
-#endif
-#ifndef C_TARGET_RC_COMPILER
-# define C_TARGET_RC_COMPILER ""
-#endif
-#ifndef C_TARGET_LIBRARIAN
-# define C_TARGET_LIBRARIAN "ar"
-#endif
-#ifndef C_TARGET_INSTALL_PROGRAM
-# define C_TARGET_INSTALL_PROGRAM "install"
-#endif
-#ifndef C_TARGET_CFLAGS
-# define C_TARGET_CFLAGS "-fno-strict-aliasing -fwrapv -DHAVE_CHICKEN_CONFIG_H -DC_ENABLE_PTABLES -Os -fomit-frame-pointer"
-#endif
-#ifndef C_TARGET_LIBRARIAN_FLAGS
-# define C_TARGET_LIBRARIAN_FLAGS "cru"
-#endif
-#ifndef C_TARGET_LDFLAGS
-# define C_TARGET_LDFLAGS " "
-#endif
-#ifndef C_TARGET_INSTALL_PROGRAM_EXECUTABLE_OPTIONS
-# define C_TARGET_INSTALL_PROGRAM_EXECUTABLE_OPTIONS "-m 755"
-#endif
-#ifndef C_TARGET_INSTALL_PROGRAM_FILE_OPTIONS
-# define C_TARGET_INSTALL_PROGRAM_FILE_OPTIONS "-m 644"
-#endif
-#ifndef C_TARGET_FEATURES
-# define C_TARGET_FEATURES ""
-#endif
-#ifndef C_CROSS_CHICKEN
-# define C_CROSS_CHICKEN 0
-#endif
-#ifndef C_TARGET_PREFIX
-# define C_TARGET_PREFIX "/usr/local"
-#endif
-#ifndef C_TARGET_BIN_HOME
-# define C_TARGET_BIN_HOME "/usr/local/bin"
-#endif
-#ifndef C_TARGET_LIB_HOME
-# define C_TARGET_LIB_HOME "/usr/local/lib"
-#endif
-#ifndef C_TARGET_LIB_NAME
-# define C_TARGET_LIB_NAME "chicken"
-#endif
-#ifndef C_TARGET_RUN_LIB_HOME
-# define C_TARGET_RUN_LIB_HOME "/usr/local/lib"
-#endif
-#ifndef C_TARGET_SHARE_HOME
-# define C_TARGET_SHARE_HOME "/usr/local/share/chicken"
-#endif
-#ifndef C_TARGET_INCLUDE_HOME
-# define C_TARGET_INCLUDE_HOME "/usr/local/include/chicken"
-#endif
-#ifndef C_TARGET_STATIC_LIB_HOME
-# define C_TARGET_STATIC_LIB_HOME "/usr/local/lib"
-#endif
-#ifndef C_CHICKEN_PROGRAM
-# define C_CHICKEN_PROGRAM "chicken"
-#endif
-#ifndef C_CSC_PROGRAM
-# define C_CSC_PROGRAM "csc"
-#endif
-#ifndef C_CSI_PROGRAM
-# define C_CSI_PROGRAM "csi"
-#endif
-#ifndef C_CHICKEN_DO_PROGRAM
-# define C_CHICKEN_DO_PROGRAM "chicken-do"
-#endif
-#ifndef C_CHICKEN_INSTALL_PROGRAM
-# define C_CHICKEN_INSTALL_PROGRAM "chicken-install"
-#endif
-#ifndef C_CHICKEN_UNINSTALL_PROGRAM
-# define C_CHICKEN_UNINSTALL_PROGRAM "chicken-uninstall"
-#endif
-#ifndef C_CHICKEN_STATUS_PROGRAM
-# define C_CHICKEN_STATUS_PROGRAM "chicken-status"
-#endif
-#ifndef C_WINDOWS_SHELL
-# define C_WINDOWS_SHELL 0
-#endif
-#ifndef C_BINARY_VERSION
-# define C_BINARY_VERSION 12
-#endif
-#ifndef C_USES_SONAME
-# define C_USES_SONAME 1
-#endif
-/* END OF FILE */

chicken/src/build-version.c

@@ -1,81 +0,0 @@
-/* Generated from build-version.scm by the CHICKEN compiler
-   http://www.call-cc.org
-   Version 6.0.0pre1 ((HEAD detached at 6.0.0pre1)) (rev 05be15d4)
-   linux-unix-gnu-x86-64 [ 64bit dload ptables ]
-   command line: build-version.scm -optimize-level 2 -include-path . -include-path ./ -inline -ignore-repository -feature chicken-bootstrap -no-warnings -specialize -consult-types-file ./types.db -explicit-use -no-trace -output-file build-version.c
-   unit: build-version
-*/
-#include "chicken.h"
-
-static C_PTABLE_ENTRY *create_ptable(void);
-
-static C_word lf[7];
-static double C_possibly_force_alignment;
-static C_char li0[] C_aligned={C_lihdr(0,0,10),40,116,111,112,108,101,118,101,108,41,0,0,0,0,0,0};
-
-
-C_noret_decl(C_build_2dversion_toplevel)
-C_extern void C_ccall C_build_2dversion_toplevel(C_word c,C_word *av) C_noret;
-
-/* toplevel */
-static int toplevel_initialized=0;
-
-void C_ccall C_build_2dversion_toplevel(C_word c,C_word *av){
-C_word tmp;
-C_word t0=av[0];
-C_word t1=av[1];
-C_word t2;
-C_word t3;
-C_word t4;
-C_word t5;
-C_word t6;
-C_word *a;
-if(toplevel_initialized) {C_kontinue(t1,C_SCHEME_UNDEFINED);}
-else C_toplevel_entry(C_text("build-version"));
-C_check_nursery_minimum(C_calculate_demand(8,c,1));
-if(C_unlikely(!C_demand(C_calculate_demand(8,c,1)))){
-C_save_and_reclaim((void*)C_build_2dversion_toplevel,c,av);}
-toplevel_initialized=1;
-if(C_unlikely(!C_demand_2(28))){
-C_save(t1);
-C_rereclaim2(28*sizeof(C_word),1);
-t1=C_restore;}
-a=C_alloc(8);
-C_initialize_lf(lf,7);
-lf[0]=C_h_intern(&lf[0],13, C_text("build-version"));
-lf[1]=C_h_intern(&lf[1],14, C_text("##sys#build-id"));
-lf[2]=C_decode_literal(C_heaptop,C_text("\376\002\000\000\011\060\065\142\145\061\065\144\064\000"));
-lf[3]=C_h_intern(&lf[3],18, C_text("##sys#build-branch"));
-lf[4]=C_decode_literal(C_heaptop,C_text("\376\002\000\000\035\050\110\105\101\104\040\144\145\164\141\143\150\145\144\040\141\164\040\066\056\060\056\060\160\162\145\061\051\000"));
-lf[5]=C_h_intern(&lf[5],19, C_text("##sys#build-version"));
-lf[6]=C_decode_literal(C_heaptop,C_text("\376\002\000\000\012\066\056\060\056\060\160\162\145\061\000"));
-C_register_lf2(lf,7,create_ptable());{}
-t2=C_a_i_provide(&a,1,lf[0]);
-t3=C_mutate((C_word*)lf[1]+1 /* (set! ##sys#build-id ...) */,lf[2]);
-t4=C_mutate((C_word*)lf[3]+1 /* (set! ##sys#build-branch ...) */,lf[4]);
-t5=C_mutate((C_word*)lf[5]+1 /* (set! ##sys#build-version ...) */,lf[6]);
-t6=t1;{
-C_word *av2=av;
-av2[0]=t6;
-av2[1]=C_SCHEME_UNDEFINED;
-((C_proc)(void*)(*((C_word*)t6+1)))(2,av2);}}
-
-#ifdef C_ENABLE_PTABLES
-static C_PTABLE_ENTRY ptable[2] = {
-{C_text("toplevel:build_2dversion_2escm"),(void*)C_build_2dversion_toplevel},
-{NULL,NULL}};
-#endif
-
-static C_PTABLE_ENTRY *create_ptable(void){
-#ifdef C_ENABLE_PTABLES
-return ptable;
-#else
-return NULL;
-#endif
-}
-
-/*
-o|safe globals: (##sys#build-version ##sys#build-branch ##sys#build-id) 
-o|removed binding forms: 3 
-*/
-/* end of file */

compile-r7rs.scm

@@ -80,13 +80,13 @@
     (looper (command-line) (list))))
 
 (cond-expand
-  (windows (pffi-define-library c-libstd '("libstd.h") "ucrtbase"))
-  (else (pffi-define-library c-libstd
-                             '("libstd.h")
+  (windows (pffi-define-library c-stdlib '("stdlib.h") "ucrtbase"))
+  (else (pffi-define-library c-stdlib
+                             '("stdlib.h")
                              "c"
                              '((additional-versions ("6"))))))
 
-(pffi-define c-system c-libstd 'system 'int '(pointer))
+(pffi-define c-system c-stdlib 'system 'int '(pointer))
 
 (define search-library-files
   (lambda (directory)

libs/data.sld

@@ -1,6 +1,10 @@
 (define-library
   (libs data)
-  (import (scheme base))
+  (import (scheme base)
+          (scheme write)
+          (scheme file)
+          (libs util)
+          (srfi 170))
   (export data)
   (begin
     (define data

snow/retropikzel/pffi.sld

@@ -167,7 +167,8 @@
           pffi-define-callback)
   (cond-expand
     (chibi (include "pffi/chibi.scm"))
-    (chicken (include-relative "pffi/chicken.scm"))
+    (chicken-5 (include "pffi/chicken.scm"))
+    (chicken-6 (include-relative "pffi/chicken.scm"))
     (cyclone (include "pffi/cyclone.scm"))
     (gambit (include "pffi/gambit.scm"))
     (gauche (include "pffi/gauche.scm"))
@@ -183,7 +184,12 @@
     (tr7 (include "pffi/tr7.scm"))
     (ypsilon (include "pffi/ypsilon.scm")))
   ;(include "pffi/shared/union.scm")
-  (include "pffi/shared/main.scm")
-  (include "pffi/shared/pointer.scm")
-  (include "pffi/shared/array.scm")
-  (include "pffi/shared/struct.scm"))
+  (cond-expand
+    (chicken-6 (include-relative "pffi/shared/main.scm")
+             (include-relative "pffi/shared/pointer.scm")
+             (include-relative "pffi/shared/array.scm")
+             (include-relative "pffi/shared/struct.scm"))
+    (else (include "pffi/shared/main.scm")
+          (include "pffi/shared/pointer.scm")
+          (include "pffi/shared/array.scm")
+          (include "pffi/shared/struct.scm"))))

snow/retropikzel/pffi/shared/struct.scm

@@ -52,7 +52,7 @@
 
 (define round-to-next-modulo-of
   (lambda (to-round roundee)
-    (if (= (floor-remainder to-round roundee) 0)
+    (if (= (modulo to-round roundee) 0)
       to-round
       (round-to-next-modulo-of (+ to-round 1) roundee))))
 
@@ -67,7 +67,7 @@
                              (when (> (size-of-type type) largest-member-size)
                                (set! largest-member-size (size-of-type type)))
                              (if (or (= size 0)
-                                     (= (floor-remainder size type-alignment) 0))
+                                     (= (modulo size type-alignment) 0))
                                (begin
                                  (set! size (+ size type-alignment))
                                  (list name type (- size type-alignment)))