diff --git a/ase/configure b/ase/configure index e69f5d05..20e08a5e 100755 --- a/ase/configure +++ b/ase/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.43 . +# From configure.ac Revision: 1.44 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for xpkit deb-0.1.0. # @@ -9799,7 +9799,7 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile xp/awk/Makefile xp/lisp/Makefile xp/mp/Makefile xp/lnx/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile xp/test/stx/Makefile xp/test/awk/Makefile xp/test/lisp/Makefile xp/test/lnx/Makefile xpp/bas/Makefile xpp/net/Makefile xpp/sys/Makefile xpp/utl/Makefile xpp/test/bas/Makefile xpp/test/net/Makefile xpp/test/sys/Makefile xpp/test/utl/Makefile" + ac_config_files="$ac_config_files Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile xp/sce/Makefile xp/lsp/Makefile xp/mp/Makefile xp/lnx/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile xp/test/stx/Makefile xp/test/sce/Makefile xp/test/lsp/Makefile xp/test/lnx/Makefile xpp/bas/Makefile xpp/net/Makefile xpp/sys/Makefile xpp/utl/Makefile xpp/test/bas/Makefile xpp/test/net/Makefile xpp/test/sys/Makefile xpp/test/utl/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10332,16 +10332,16 @@ do "xp/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/net/Makefile" ;; "xp/utl/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/utl/Makefile" ;; "xp/stx/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/stx/Makefile" ;; - "xp/awk/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/awk/Makefile" ;; - "xp/lisp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/lisp/Makefile" ;; + "xp/sce/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/sce/Makefile" ;; + "xp/lsp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/lsp/Makefile" ;; "xp/mp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/mp/Makefile" ;; "xp/lnx/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/lnx/Makefile" ;; "xp/test/bas/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/bas/Makefile" ;; "xp/test/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/net/Makefile" ;; "xp/test/utl/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/utl/Makefile" ;; "xp/test/stx/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/stx/Makefile" ;; - "xp/test/awk/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/awk/Makefile" ;; - "xp/test/lisp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/lisp/Makefile" ;; + "xp/test/sce/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/sce/Makefile" ;; + "xp/test/lsp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/lsp/Makefile" ;; "xp/test/lnx/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/lnx/Makefile" ;; "xpp/bas/Makefile" ) CONFIG_FILES="$CONFIG_FILES xpp/bas/Makefile" ;; "xpp/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES xpp/net/Makefile" ;; diff --git a/ase/configure.ac b/ase/configure.ac index 91ddbb9b..1380dbda 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) AC_INIT([xpkit], [deb-0.1.0]) -AC_REVISION([$Revision: 1.44 $]) +AC_REVISION([$Revision: 1.45 $]) AC_CONFIG_HEADER([xp/config.h]) # Checks for programs. @@ -73,9 +73,9 @@ fi AC_CONFIG_FILES([ Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile - xp/awk/Makefile xp/lisp/Makefile xp/mp/Makefile xp/lnx/Makefile + xp/sce/Makefile xp/lsp/Makefile xp/mp/Makefile xp/lnx/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile - xp/test/stx/Makefile xp/test/awk/Makefile xp/test/lisp/Makefile + xp/test/stx/Makefile xp/test/sce/Makefile xp/test/lsp/Makefile xp/test/lnx/Makefile xpp/bas/Makefile xpp/net/Makefile xpp/sys/Makefile xpp/utl/Makefile xpp/test/bas/Makefile xpp/test/net/Makefile diff --git a/ase/lsp/lisp.c b/ase/lsp/lisp.c index 0a308132..7719b825 100644 --- a/ase/lsp/lisp.c +++ b/ase/lsp/lisp.c @@ -1,5 +1,5 @@ /* - * $Id: lisp.c,v 1.9 2005-05-28 13:34:26 bacon Exp $ + * $Id: lisp.c,v 1.10 2005-05-30 07:15:35 bacon Exp $ */ #include @@ -23,7 +23,7 @@ xp_lisp_t* xp_lisp_new (xp_size_t mem_ubound, xp_size_t mem_ubound_inc) //lsp->opt_undef_symbol = 1; lsp->opt_undef_symbol = 0; - lsp->curc = XP_EOF; + lsp->curc = XP_CHAR_EOF; lsp->creader = XP_NULL; lsp->creader_extra = XP_NULL; lsp->creader_just_set = 0; diff --git a/ase/lsp/read.c b/ase/lsp/read.c index 7eb5dca2..97d16846 100644 --- a/ase/lsp/read.c +++ b/ase/lsp/read.c @@ -1,5 +1,5 @@ /* - * $Id: read.c,v 1.8 2005-04-24 07:48:16 bacon Exp $ + * $Id: read.c,v 1.9 2005-05-30 07:15:35 bacon Exp $ */ #include @@ -269,12 +269,12 @@ static int read_token (xp_lisp_t* lsp) if (lsp->curc == XP_CHAR(';')) { do { NEXT_CHAR (lsp); - } while (lsp->curc != XP_CHAR('\n') && lsp->curc != XP_EOF); + } while (lsp->curc != XP_CHAR('\n') && lsp->curc != XP_CHAR_EOF); } else break; } - if (lsp->curc == XP_EOF) { + if (lsp->curc == XP_CHAR_EOF) { TOKEN_TYPE(lsp) = TOKEN_END; return 0; } @@ -360,7 +360,7 @@ static int read_string (xp_lisp_t* lsp) xp_cint_t code = 0; do { - if (lsp->curc == XP_EOF) { + if (lsp->curc == XP_CHAR_EOF) { TOKEN_TYPE(lsp) = TOKEN_UNTERM_STRING; return 0; } diff --git a/ase/makefile.in b/ase/makefile.in index 43dfb7d0..fa81b263 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -1,4 +1,4 @@ -SUBDIRS=bas net utl awk lsp +SUBDIRS=bas net utl stx sce lsp all: @for i in $(SUBDIRS); \ diff --git a/ase/stx/kernel.st b/ase/stx/kernel.st deleted file mode 100644 index c50ff22d..00000000 --- a/ase/stx/kernel.st +++ /dev/null @@ -1,24 +0,0 @@ -nil subclass: #Object - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: ''. - -Object subclass: #Behavior - instanceVariableNames: 'name instanceSpec methods superclass variables classVariables poolDictionaries category' - classVariableNames: '' - poolDictionaries: ''. - -Behavior subclass: #Class - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: ''. - -Behavior subclass: #Metaclass - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: ''. - -Object subclass: #Block - instanceVariableNames: 'context argCount argLoc bytePointer' - classVariableNames: '' - poolDictionaries; ''. diff --git a/ase/test/lsp/lisp.c b/ase/test/lsp/lisp.c index 0f096f05..7acddd15 100644 --- a/ase/test/lsp/lisp.c +++ b/ase/test/lsp/lisp.c @@ -12,9 +12,9 @@ static int get_char (xp_cint_t* ch, void* arg) xp_cint_t c; c = xp_fgetc(xp_stdin); - if (c == XP_EOF) { + if (c == XP_CHAR_EOF) { if (xp_ferror(xp_stdin)) return -1; - c = XP_EOF; + c = XP_CHAR_EOF; } *ch = c;