Commit c65752a0 authored by Erick's avatar Erick

.

parents 20082d48 ab38efbc
......@@ -2,7 +2,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
# Last file update: 26-Sep-2009 00:31 (eg)
# Last file update: 26-Sep-2009 00:59 (eg)
EXTRA_DIST =
SUBDIRS = @PCRE@ @GC@ @GMP@ @LIBFFI@ src utils lib \
......
......@@ -19,7 +19,11 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
<<<<<<< local
# Last file update: 26-Sep-2009 00:31 (eg)
=======
# Last file update: 25-Sep-2009 23:28 (eg)
>>>>>>> other
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
......@@ -232,7 +236,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST =
SUBDIRS = @PCRE@ @GC@ @GMP@ @LIBFFI@ src utils lib \
<<<<<<< local
examples pkgman tests doc
=======
@EXAMPLES@ pkgman tests doc
>>>>>>> other
VERSION_TAG = @PACKAGE@-@VERSION@
VERSION_BETA = $(VERSION_TAG)-beta
......
This file contains a set of informations for compiling STklos on various
architectures.
This file contains a set of informations for compiling STklos on
various architectures.
If you experience a new port or confirm/infirm/add informations which
are specified here please send a mail to Erick Gallesio 'eg(at)essi.fr'
are specified here please send a mail to Erick Gallesio
'eg(at)unice.fr'
For each entry below, you'll find the OS and the version of the C
compiler used for building the system. The entry Gtklos, tells if the
......
......@@ -604,6 +604,10 @@ PCRETARGET
LDAP_LIB
HAVE_LDAP
HAVE_GNOME
<<<<<<< local
=======
EXAMPLES
>>>>>>> other
STACK_DIRECTION
COMPSRC
COMPOBJ
......@@ -4987,7 +4991,11 @@ fi
# HAVE_LDAP="undef" && LDAP_LIB="")
<<<<<<< local
#1.0
=======
>>>>>>> other
#1.0 dnl
#1.0 dnl GTK support
#1.0 dnl
......@@ -5005,7 +5013,10 @@ fi
#1.0 USE_GTK=no
#1.0 fi
#1.0
<<<<<<< local
#1.0
=======
>>>>>>> other
#1.0 dnl
#1.0 dnl GNOME support
#1.0 dnl
......@@ -5650,10 +5661,14 @@ fi
<<<<<<< local
#1.0 AC_SUBST(GTKLOS)
#1.0 AC_SUBST(GTK_CONFIG_LIBS)
#1.0 AC_SUBST(GTK_CONFIG_CFLAGS)
#1.0 AC_SUBST(EXAMPLES)
=======
>>>>>>> other
......@@ -7147,7 +7162,11 @@ echo " Compilation flags: " $CFLAGS
echo " Bignum library: " $biglib
echo " Regexp library: " $pcrelib
echo " GC library: " $gclib
<<<<<<< local
#1.0 echo " LDAP support: " $USE_LDAP
=======
echo " LDAP support: " $USE_LDAP
>>>>>>> other
#1.0 echo " GTK+ support: " $USE_GTK
#1.0 echo " GNOME support: " $USE_GNOME
echo " FFI support: " $FFI
......
......@@ -2,7 +2,7 @@ dnl configure.in for STklos
dnl
dnl Author: Erick Gallesio [eg@unice.fr]
dnl Creation date: 28-Dec-1999 21:19 (eg)
dnl Last file update: 26-Sep-2009 00:32 (eg)
dnl Last file update: 26-Sep-2009 01:01 (eg)
AC_INIT(src/stklos.c)
......@@ -228,7 +228,6 @@ fi
# HAVE_LDAP="undef" && LDAP_LIB="")
#1.0
#1.0 dnl
#1.0 dnl GTK support
#1.0 dnl
......@@ -246,7 +245,6 @@ fi
#1.0 USE_GTK=no
#1.0 fi
#1.0
#1.0
#1.0 dnl
#1.0 dnl GNOME support
#1.0 dnl
......
schemedemodir = $(prefix)/share/@PACKAGE@/@VERSION@/Demos.d
schemedemo_DATA = fork-test.stk hello.stk secho.stk \
<<<<<<< local
socket-server.stk socket-client.stk
=======
socket-server.stk socket-client.stk \
threads.stk
>>>>>>> other
schemedemo_SCRIPTS = fork-test hello secho \
<<<<<<< local
socket-server socket-client
=======
socket-server socket-client \
threads
>>>>>>> other
SUFFIXES = .stk
......
......@@ -197,10 +197,20 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
schemedemodir = $(prefix)/share/@PACKAGE@/@VERSION@/Demos.d
schemedemo_DATA = fork-test.stk hello.stk secho.stk \
<<<<<<< local
socket-server.stk socket-client.stk
=======
socket-server.stk socket-client.stk \
threads.stk
>>>>>>> other
schemedemo_SCRIPTS = fork-test hello secho \
<<<<<<< local
socket-server socket-client
=======
socket-server socket-client \
threads
>>>>>>> other
SUFFIXES = .stk
all: all-am
......
;;;;
;;;; checkbutton.stk -- GTklos Checkbutton Demo
;;;; secho.stk -- a simple /bin/echo in Scheme
;;;;
;;;; Copyright © 2001 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
;;;; Copyright © 2009 Erick Gallesio - Polytech'Nice-Sophia <eg@unice.fr>
;;;;
;;;;
;;;; This program is free software; you can redistribute it and/or modify
......@@ -20,24 +20,35 @@
;;;; USA.
;;;;
;;;; Author: Erick Gallesio [eg@unice.fr]
;;;; Creation date: 25-Jul-2001 21:29 (eg)
;;;; Last file update: 26-Nov-2001 22:16 (eg)
;;;; Creation date: 4-May-2009 10:56 (eg)
;;;; Last file update: 9-May-2009 00:41 (eg)
;;;;
(include "gtklos-demo.stk")
(define (main args)
(let* ((win (make <demo-window> :title "Check Button Demo" :x 100 :y 100
:border-width 10 :file "checkbutton"
:message "
This is a demo showing a check button.
Nothing special here
"))
(b (make <check-button>
:parent win
:text "A Check Button"
:border-width 20
:command (lambda (e)
(format #t "Check butoon state => ~S\n"
(value (event-widget e)))))))
(define *version* "1.0")
(define (main argv)
(let ((output-nl #t)
(out (current-output-port)))
'done))
(parse-arguments argv
"Usage: secho [options] [parameter ...]"
"Available options"
(("no-newline" :alternate "n" :help "do not output the trailing newline")
(set! output-nl #f))
(("error-port" :alternate "2" :help "Use the error port for the outputs")
(set! out (current-error-port)))
"Other options"
(("help" :alternate "h" :help "display this help and exit")
(arg-usage (current-error-port))
(exit 1))
(("version" :alternate "V" :help "output version information and exit")
(printf "~a version ~a\n" (program-name) *version*)
(exit 0))
(else
(for-each (lambda (x)
(display x out)
(display #\space out))
other-arguments)
(when output-nl
(newline out))))))
......@@ -4,7 +4,7 @@
;;;;
;;;; Author: Erick Gallesio using code from Aubrey Jaffer
;;;; Creation date: 8-Mar-2005
;;;; Last file update: 26-Sep-2009 00:25 (eg)
;;;; Last file update: 26-Sep-2009 01:03 (eg)
;;;;
(unless (provided? "STklos.init")
......@@ -84,4 +84,4 @@
(substring pathname 0 (+ i 1)))
(else (loop (- i 1))))))
)
(provide "srfi-59")
\ No newline at end of file
(provide "srfi-59")
This diff is collapsed.
This diff is collapsed.
/*
* ffi.c -- FFI support dor STklos
*
* Copyright 2007-2008 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>
* Copyright 2007-2009 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>
*
*
* This program is free software; you can redistribute it and/or modify
......@@ -21,10 +21,11 @@
*
* Author: Erick Gallesio [eg@essi.fr]
* Creation date: 14-Jun-2007 09:19 (eg)
* Last file update: 3-May-2008 22:39 (eg)
* Last file update: 10-May-2009 23:06 (eg)
*/
#include <stklos.h>
#include <math.h>
#ifdef HAVE_FFI
# include <ffi.h>
......@@ -177,8 +178,8 @@ static void scheme2c(SCM obj, int type_needed, union any *res, int index)
{
double d = STk_number2double(obj);
if (d != STk_NaN) {
if (type_needed == 7)
if (!isnan(d)) {
if (type_needed == 10)
res->fvalue = (float) d;
else
res->dvalue = d;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment