updated for macos support and FFI library detection

Author: cadebrown

README.md

@@ -98,14 +98,22 @@ $ make check # runs the standard tests
 
 ### On MacOS Systems
 
-Due to some library incompatibilities, the surefire way to build kscript on MacOS is:
+The simplest way is to just build like this:
 
 ```shell
-$ ./configure --with-ffi off --with-readline off
+$ ./configure
 $ make bin/ks -j16
 ```
 
-Some builds (external shared libraries, extra modules) may not work directly (TODO/WIP), but the basic functionality and the standard library should work just fine
+If you install `libffi`, you can build with FFI support like this:
+
+```shell
+$ brew install libffi
+$ export CFLAGS="-I/opt/homebrew/opt/libffi/include"
+$ export LDFLAGS="-L/opt/homebrew/opt/libffi/lib"
+$ ./configure --with-ffi on
+$ make bin/ks -j16
+```
 
 ### On Windows
 

configure

@@ -37,6 +37,7 @@ WITH_pthreads="auto"
 WITH_readline="auto"
 WITH_fftw3="auto"
 WITH_opengl="auto"
+WITH_glfw="auto"
 WITH_x="auto"
 
 #CHECKTO="/dev/null"
@@ -69,6 +70,7 @@ case $1 in
         echo "  --with-ffi V            Whether or not to use ffi from libffi (Foreign Function Interface) for C-function interop (default: auto)"
         echo "  --with-fftw3 V          Whether or not to use FFTW3 for Fast-Fourier-Transforms (default: auto)"
         echo "  --with-opengl V         Whether or not to use OpenGL for graphics acceleration (default: auto)"
+        echo "  --with-glfw V           Whether or not to use GLFW for graphics acceleration (default: auto)"
         echo "  --with-x V              Whether or not to use XLib for graphics (default: auto)"
         echo ""
         echo "Any questions, comments, or concerns can be sent to:"
@@ -275,13 +277,16 @@ check_clib() {
     with="$2"
     cflags="$3"
     ldflags="$4"
+    prog="$5"
 
     eval "HAVE_$1"=\"off\"
 
     if [ "x$2" = 'xoff' ]; then
         printf "Not searching for '%s'\n" "$1"
     else
         printf "Searching for '%s' ...\n" "$1"
+        
+        echo "$prog" > $_check_c
 
         # compile and run it
         echo $CC $CFLAGS $3 $DEFS $_check_c $LDFLAGS $4  -o $_check_o >> $CHECKTO
@@ -441,6 +446,13 @@ int main(int argc, char** argv) {
 }
 "
 
+check_clib glfw "$WITH_glfw" "" "-lglfw" "
+#include <GLFW/glfw3.h>
+
+int main(int argc, char** argv) {
+    return 0;
+}
+"
 
 echo ""
 echo " -- Structures -- "
@@ -579,6 +591,10 @@ check_func() {
  #include <glob.h>
 #endif
 
+#ifdef KS_HAVE_DIRENT_H
+ #include <dirent.h>
+#endif
+
 int main(int argc, char** argv) {
     int i = 0;
     time_t t;
@@ -606,6 +622,9 @@ int main(int argc, char** argv) {
 
     struct stat st;
     FILE* F;
+#ifdef KS_HAVE_DIRENT_H
+    DIR* D;
+#endif
 
     $assignto $1($3);
     return 0;
@@ -729,7 +748,7 @@ check_func "mkdir" "i" "s,i"
 check_func "remove" "i" "s"
 check_func "chdir" "i" "s"
 
-check_func "opendir" "i" "s,&st"
+check_func "opendir" "D" "s"
 
 check_func "glob" "i" "s, i, NULL, NULL"
 
@@ -1110,11 +1129,11 @@ for dir in src/extmodules/*; do
     printf "libksm_%s_C := \$(wildcard %s/*.c)\n" "$mn" "$dir" >> $T
     printf "libksm_%s_O := \$(patsubst %%.c,.tmp/%%.o,\$(libksm_%s_C))" "$mn" "$mn" >> $T
     echo "" >> $T
-    printf "ksm_%s%s: \$(libksm_%s_O) \$(all_H)" "$mn" "$EXTSHARED" "$mn" >> $T
+    printf "ksm_%s%s: \$(libksm_%s_O) \$(all_H) \$(libks_SHARED)" "$mn" "$EXTSHARED" "$mn" >> $T
     echo "" >> $T
     echo "	@mkdir -p \$(dir \$@)" >> $T
     echo "	\$(CC) -L./lib \\" >> $T
-    printf "		\$(libksm_%s_O) \\" "$mn" >> $T
+    printf "		\$(libksm_%s_O) -lks \\" "$mn" >> $T
     echo "" >> $T
     echo "		\$(LDFLAGS) -fPIC -shared -o \$@" >> $T
 done

examples/ffi/basic.ks

@@ -7,8 +7,38 @@
 
 import ffi
 
+
+# what paths to use
+cands = [
+    'libc.so.6',
+    '/usr/lib/libSystem.dylib',
+]
+
+func attempt_open(cand) {
+    try {
+        ret ffi.open(cand)
+    } catch {
+        ret none
+    }
+}
+
+
 # C library
-lib = ffi.open('libc.so.6')
+lib = none
+for cand in cands {
+    lib = attempt_open(cand)
+    if lib != none {
+        print("Successfully opened:", cand)
+        break
+    } else {
+        print("Failed to open:", cand)
+    }
+}
+
+if lib == none {
+    throw Error("Failed to open any of the candidates")
+}
+
 
 # Load the 'puts' function, with the given signature
 cputs = lib.load('puts', ffi.func[ffi.int, (ffi.ptr[ffi.char], )])

include/ks/ffi.h include/ks/ksffi.hinclude/ks/ffi.h renamed to include/ks/ksffi.h

@@ -1,4 +1,4 @@
-/* ks/ffi.h - header for the 'ffi' (Foreign Function Interface) module in kscript
+/* ks/ksffi.h - header for the 'ffi' (Foreign Function Interface) module in kscript
  *
  * Provides wrappers for interfacing with C functions/libraries, through Foreign Function Interface
  * 

include/ks/nuklear.h

@@ -69,7 +69,7 @@
 #include <ks/inuklear_xlib_gl3.h>
 
 
-#elif defined(HS_KAVE_glfw)
+#elif defined(KS_HAVE_glfw)
 #define KSNK_DO 1
 
 

src/inter.c

@@ -224,7 +224,9 @@ static void handle_sigint(int signum) {
 
     /* Regenerate prompt and clear text */
     rl_on_new_line();
+#ifndef __APPLE__
     rl_replace_line("", 0);
+#endif
     rl_set_prompt(prompt0->data);
     rl_redisplay();
 
@@ -274,8 +276,10 @@ bool ks_inter() {
             // don't append a space
             rl_completion_append_character = '\0';
 
+#ifndef __APPLE__
             rl_catch_signals = 0;
             rl_clear_signals();
+#endif
 
             #else
 

src/modules/ffi/dll.c

@@ -4,7 +4,7 @@
  * @author: Cade Brown <cade@kscript.org>
  */
 #include <ks/impl.h>
-#include <ks/ffi.h>
+#include <ks/ksffi.h>
 
 #define T_NAME "ffi.DLL"
 

src/modules/ffi/float.c

@@ -4,7 +4,7 @@
  * @author: Cade Brown <cade@kscript.org>
  */
 #include <ks/impl.h>
-#include <ks/ffi.h>
+#include <ks/ksffi.h>
 
 /* Type definitions */
 

src/modules/ffi/func.c

@@ -4,7 +4,7 @@
  * @author: Cade Brown <cade@kscript.org>
  */
 #include <ks/impl.h>
-#include <ks/ffi.h>
+#include <ks/ksffi.h>
 
 #define T_NAME "ffi.func"
 

src/modules/ffi/int.c

@@ -4,7 +4,7 @@
  * @author: Cade Brown <cade@kscript.org>
  */
 #include <ks/impl.h>
-#include <ks/ffi.h>
+#include <ks/ksffi.h>
 
 /* Type definitions */