From 0d0c7a415b79c0c1cfcd93157cf429a595bee3ae Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 14 Apr 2018 22:06:28 +0200 Subject: [PATCH] mes: Move base-0.mes int boot-0.scm. * module/mes/boot-02.scm: New file, rename from boot-0.scm. * module/mes/boot-0.scm: Add base-0.mes. * module/mes/base-0.mes: Remove. --- guile/mes-0.scm | 10 +-- make.scm | 4 +- module/mes/base-0.mes | 142 ----------------------------------------- module/mes/boot-0.scm | 114 ++++++++++++++++++++++++++++++++- module/mes/boot-00.scm | 1 - module/mes/boot-01.scm | 1 - module/mes/boot-02.scm | 119 ++++++++++++++++++++++++++++++++++ module/mes/posix.mes | 1 - module/mes/test.mes | 17 ++++- scripts/mescc.mes | 2 +- scripts/repl.mes | 5 +- src/mes.c | 9 ++- tests/base.test | 20 +++--- tests/boot.test | 4 +- tests/catch.test | 4 +- tests/closure.test | 4 +- tests/cwv.test | 4 +- tests/display.test | 4 +- tests/fluids.test | 4 +- tests/getopt-long.test | 4 +- tests/guile.test | 4 +- tests/let-syntax.test | 4 +- tests/let.test | 4 +- tests/match.test | 4 +- tests/math.test | 4 +- tests/module.test | 6 +- tests/optargs.test | 4 +- tests/peg.test | 6 +- tests/pmatch.test | 4 +- tests/psyntax.test | 4 +- tests/quasiquote.test | 3 +- tests/read.test | 4 +- tests/record.test | 4 +- tests/scm.test | 4 +- tests/srfi-1.test | 4 +- tests/srfi-13.test | 4 +- tests/srfi-14.test | 4 +- tests/srfi-16.test | 4 +- tests/syntax.test | 4 +- tests/vector.test | 4 +- 40 files changed, 326 insertions(+), 230 deletions(-) delete mode 100644 module/mes/base-0.mes create mode 100644 module/mes/boot-02.scm diff --git a/guile/mes-0.scm b/guile/mes-0.scm index 5d71ff13..e6714572 100644 --- a/guile/mes-0.scm +++ b/guile/mes-0.scm @@ -27,10 +27,10 @@ (define-macro (mes-use-module . rest) #t) (define builtin? procedure?) ; not strictly true, but ok for tests/*.test -(define mes? (pair? (current-module))) -(define guile? (not (pair? (current-module)))) -(define guile-1.8? (equal? (effective-version) "1.8")) -(define guile-2? (and (not mes?) (not guile-1.8?))) -(if guile-1.8? (use-modules (ice-9 syncase))) +(cond-expand + (mes) + (guile-2) + (guile + (use-modules (ice-9 syncase)))) (define EOF (if #f #f)) (define append2 append) diff --git a/make.scm b/make.scm index fc51f1f7..2c5b7fc8 100755 --- a/make.scm +++ b/make.scm @@ -520,7 +520,7 @@ exec ${GUILE-guile} --no-auto-compile -L . -L guile -C . -C guile -s "$0" ${1+"$ (define* ((install-dir #:key dir) name) (add-target (install name #:dir (string-append dir "/" (dirname name))))) -(add-target (install "module/mes/base-0.mes" #:dir (string-append %moduledir "/mes") #:substitutes #t)) +(add-target (install "module/mes/boot-0.scm" #:dir (string-append %moduledir "/mes") #:substitutes #t)) (add-target (install "module/language/c99/compiler.mes" #:dir (string-append %moduledir "/language/c99") #:substitutes #t)) (define %module-dir "share/mes") @@ -538,11 +538,11 @@ exec ${GUILE-guile} --no-auto-compile -L . -L guile -C . -C guile -s "$0" ${1+"$ "module/mes/as-i386.scm" "module/mes/as.mes" "module/mes/as.scm" - ;;"module/mes/base-0.mes" "module/mes/base.mes" "module/mes/boot-0.scm" "module/mes/boot-00.scm" "module/mes/boot-01.scm" + "module/mes/boot-02.scm" "module/mes/bytevectors.mes" "module/mes/bytevectors.scm" "module/mes/catch.mes" diff --git a/module/mes/base-0.mes b/module/mes/base-0.mes deleted file mode 100644 index 02e2d521..00000000 --- a/module/mes/base-0.mes +++ /dev/null @@ -1,142 +0,0 @@ -;;; -*-scheme-*- - -;;; Mes --- Maxwell Equations of Software -;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen -;;; -;;; This file is part of Mes. -;;; -;;; Mes is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; Mes is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with Mes. If not, see . - -;;; Commentary: - -;;; base-0.mes is the first file being loaded from the Mes core. It -;;; provides primitives that use Mes internals to create the illusion -;;; of compatibility with Guile. It is not safe to be run by Guile. - -;;; Code: - -(define mes? #t) -(define guile? #f) -(define guile-1.8? #f) -(define guile-2? #f) - -(define (primitive-eval e) (core:eval e (current-module))) -(define eval core:eval) - -(define (current-output-port) 1) -(define (current-error-port) 2) -(define (port-filename port) "") -(define (port-line port) 0) -(define (port-column port) 0) -(define (ftell port) 0) -(define (false-if-exception x) x) - -(define (cons* . rest) - (if (null? (cdr rest)) (car rest) - (cons (car rest) (core:apply cons* (cdr rest) (current-module))))) - -(define (apply f h . t) - (if (null? t) (core:apply f h (current-module)) - (apply f (apply cons* (cons h t))))) - -(define-macro (cond . clauses) - (list 'if (pair? clauses) - (list (cons - 'lambda - (cons - '(test) - (list (list 'if 'test - (if (pair? (cdr (car clauses))) - (if (eq? (car (cdr (car clauses))) '=>) - (append2 (cdr (cdr (car clauses))) '(test)) - (list (cons 'lambda (cons '() (cons 'test (cdr (car clauses))))))) - (list (cons 'lambda (cons '() (cons 'test (cdr (car clauses))))))) - (if (pair? (cdr clauses)) - (cons 'cond (cdr clauses))))))) - (car (car clauses))))) - -(define else #t) - -(define-macro (load file) - (list 'begin - (list 'if (list getenv "MES_DEBUG") - (list 'begin - (list core:display-error ";;; read ") - (list core:display-error file) - (list core:display-error "\n"))) - (list 'primitive-load file))) - -(define-macro (include file) (list 'load file)) - -(define (append . rest) - (if (null? rest) '() - (if (null? (cdr rest)) (car rest) - (append2 (car rest) (apply append (cdr rest)))))) - -(define (string->list s) - (core:car s)) - -(define %prefix (getenv "MES_PREFIX")) -(define %moduledir - (if (not %prefix) "module/" - (list->string - (append (string->list %prefix) - (string->list "/module") ; `module/' gets replaced upon install - (string->list "/"))))) - -;;(primitive-load "module/mes/type-0.mes") -(include (list->string - (append2 (string->list %moduledir) (string->list "/mes/type-0.mes")))) - -(define (symbol->string s) - (apply string (symbol->list s))) - -(define (string-append . rest) - (apply string (apply append (map1 string->list rest)))) - -(define %version (if (eq? (car (string->list "@VERSION@")) #\@) "git" - "@VERSION@")) -(define (effective-version) %version) - -(if (getenv "MES_DEBUG") - (begin - (core:display-error ";;; %moduledir=") - (core:display-error %moduledir) - (core:display-error "\n"))) - -(define-macro (include-from-path file) - (list 'load (list string-append %moduledir file))) - -(define (string-join lst infix) - (if (null? (cdr lst)) (car lst) - (string-append (car lst) infix (string-join (cdr lst) infix)))) - -(include-from-path "mes/module.mes") - -(mes-use-module (mes base-0)) - -(mes-use-module (mes base)) -;; (mes-use-module (srfi srfi-0)) -(mes-use-module (mes quasiquote)) -(mes-use-module (mes let)) - -(mes-use-module (mes scm)) - -(mes-use-module (srfi srfi-1)) ;; FIXME: module read order -(mes-use-module (srfi srfi-13)) - -(mes-use-module (mes fluids)) ;; FIXME: module read order -(mes-use-module (mes catch)) - -(mes-use-module (mes posix)) diff --git a/module/mes/boot-0.scm b/module/mes/boot-0.scm index 95c1d0f6..9c37976b 100644 --- a/module/mes/boot-0.scm +++ b/module/mes/boot-0.scm @@ -93,6 +93,7 @@ (append2 (car rest) (apply append (cdr rest)))))) ;; end boot-01.scm +;; boot-02.scm (define-macro (and . x) (if (null? x) #t (if (null? (cdr x)) (car x) @@ -113,7 +114,116 @@ (define-macro (mes-use-module module) #t) +;; end boot-02.scm + +;; boot-0.scm +(define (primitive-eval e) (core:eval e (current-module))) +(define eval core:eval) + +(define (current-output-port) 1) +(define (current-error-port) 2) +(define (port-filename port) "") +(define (port-line port) 0) +(define (port-column port) 0) +(define (ftell port) 0) +(define (false-if-exception x) x) + +(define (cons* . rest) + (if (null? (cdr rest)) (car rest) + (cons (car rest) (core:apply cons* (cdr rest) (current-module))))) + +(define (apply f h . t) + (if (null? t) (core:apply f h (current-module)) + (apply f (apply cons* (cons h t))))) + +(define-macro (cond . clauses) + (list 'if (pair? clauses) + (list (cons + 'lambda + (cons + '(test) + (list (list 'if 'test + (if (pair? (cdr (car clauses))) + (if (eq? (car (cdr (car clauses))) '=>) + (append2 (cdr (cdr (car clauses))) '(test)) + (list (cons 'lambda (cons '() (cons 'test (cdr (car clauses))))))) + (list (cons 'lambda (cons '() (cons 'test (cdr (car clauses))))))) + (if (pair? (cdr clauses)) + (cons 'cond (cdr clauses))))))) + (car (car clauses))))) + +(define else #t) + +(define-macro (load file) + (list 'begin + (list 'if (list getenv "MES_DEBUG") + (list 'begin + (list core:display-error ";;; read ") + (list core:display-error file) + (list core:display-error "\n"))) + (list 'primitive-load file))) + +(define-macro (include file) (list 'load file)) + +(define (append . rest) + (if (null? rest) '() + (if (null? (cdr rest)) (car rest) + (append2 (car rest) (apply append (cdr rest)))))) + +(define (string->list s) + (core:car s)) + +(define %prefix (getenv "MES_PREFIX")) +(define %moduledir + (if (not %prefix) "module/" + (list->string + (append (string->list %prefix) + (string->list "/module") ; `module/' gets replaced upon install + (string->list "/"))))) + +(include (list->string + (append2 (string->list %moduledir) (string->list "/mes/type-0.mes")))) + +(define (symbol->string s) + (apply string (symbol->list s))) + +(define (string-append . rest) + (apply string (apply append (map1 string->list rest)))) + +(define %version (if (eq? (car (string->list "@VERSION@")) #\@) "git" + "@VERSION@")) +(define (effective-version) %version) + +(if (getenv "MES_DEBUG") + (begin + (core:display-error ";;; %moduledir=") + (core:display-error %moduledir) + (core:display-error "\n"))) + +(define-macro (include-from-path file) + (list 'load (list string-append %moduledir file))) + +(define (string-join lst infix) + (if (null? (cdr lst)) (car lst) + (string-append (car lst) infix (string-join (cdr lst) infix)))) + +(include-from-path "mes/module.mes") + +(mes-use-module (mes base)) +;; ;; (mes-use-module (srfi srfi-0)) +(mes-use-module (mes quasiquote)) +(mes-use-module (mes let)) + +(mes-use-module (mes scm)) + +(mes-use-module (srfi srfi-1)) ;; FIXME: module read order +(mes-use-module (srfi srfi-13)) + +(mes-use-module (mes fluids)) ;; FIXME: module read order +(mes-use-module (mes catch)) + +(mes-use-module (mes posix)) +;; ;; end boot-0.scm -;;((lambda (*program*) *program*) (primitive-load 0)) (primitive-load 0) - +(primitive-load 0) diff --git a/module/mes/boot-00.scm b/module/mes/boot-00.scm index 324852be..977a9ed7 100644 --- a/module/mes/boot-00.scm +++ b/module/mes/boot-00.scm @@ -31,5 +31,4 @@ (cons 'begin (cond-expand-expander clauses))) ;; end boot-00.scm -;;((lambda (*program*) *program*) (primitive-load 0)) (primitive-load 0) diff --git a/module/mes/boot-01.scm b/module/mes/boot-01.scm index 33ed4bbe..e2cc1c65 100644 --- a/module/mes/boot-01.scm +++ b/module/mes/boot-01.scm @@ -81,5 +81,4 @@ (append2 (car rest) (apply append (cdr rest)))))) ;; end boot-01.scm -;;((lambda (*program*) *program*) (primitive-load 0)) (primitive-load 0) diff --git a/module/mes/boot-02.scm b/module/mes/boot-02.scm new file mode 100644 index 00000000..b2d00297 --- /dev/null +++ b/module/mes/boot-02.scm @@ -0,0 +1,119 @@ +;;; -*-scheme-*- + +;;; Mes --- Maxwell Equations of Software +;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen +;;; +;;; This file is part of Mes. +;;; +;;; Mes is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; Mes is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with Mes. If not, see . + +;;; Commentary: + +;;; read-0.mes - bootstrap reader. This file is read by a minimal +;;; core reader. It only supports s-exps and line-comments; quotes, +;;; character literals, string literals cannot be used here. + +;;; Code: + +;; boot-00.scm +(define mes %version) + +(define (defined? x) + (assq x (current-module))) + +(define (cond-expand-expander clauses) + (if (defined? (car (car clauses))) + (cdr (car clauses)) + (cond-expand-expander (cdr clauses)))) + +(define-macro (cond-expand . clauses) + (cons 'begin (cond-expand-expander clauses))) +;; end boot-00.scm + +;; boot-01.scm +(define 0) +(define 7) +(define 10) + +(define (pair? x) (eq? (core:type x) )) +(define (not x) (if x #f #t)) + +(define (display x . rest) + (if (null? rest) (core:display x) + (core:display-port x (car rest)))) + +(define (write x . rest) + (if (null? rest) (core:write x) + (core:write-port x (car rest)))) + +(define (list->string lst) + (core:make-cell lst 0)) + +(define (integer->char x) + (core:make-cell 0 x)) + +(define (newline . rest) + (core:display (list->string (list (integer->char 10))))) + +(define (string->list s) + (core:car s)) + +(define (cadr x) (car (cdr x))) + +(define (map1 f lst) + (if (null? lst) (list) + (cons (f (car lst)) (map1 f (cdr lst))))) + +(define (map f lst) + (if (null? lst) (list) + (cons (f (car lst)) (map f (cdr lst))))) + +(define (cons* . rest) + (if (null? (cdr rest)) (car rest) + (cons (car rest) (core:apply cons* (cdr rest) (current-module))))) + +(define (apply f h . t) + (if (null? t) (core:apply f h (current-module)) + (apply f (apply cons* (cons h t))))) + +(define (append . rest) + (if (null? rest) '() + (if (null? (cdr rest)) (car rest) + (append2 (car rest) (apply append (cdr rest)))))) +;; end boot-01.scm + +;; boot-02.scm +(define-macro (and . x) + (if (null? x) #t + (if (null? (cdr x)) (car x) + (list (quote if) (car x) (cons (quote and) (cdr x)) + #f)))) + +(define-macro (or . x) + (if (null? x) #f + (if (null? (cdr x)) (car x) + (list (list (quote lambda) (list (quote r)) + (list (quote if) (quote r) (quote r) + (cons (quote or) (cdr x)))) + (car x))))) + +(define-macro (module-define! module name value) + ;;(list 'define name value) + #t) + +(define-macro (mes-use-module module) + #t) +;; end boot-02.scm + +(primitive-load 0) diff --git a/module/mes/posix.mes b/module/mes/posix.mes index a8c8a285..85a85983 100644 --- a/module/mes/posix.mes +++ b/module/mes/posix.mes @@ -24,4 +24,3 @@ (define R_OK 0) (define S_IRWXU #o700) - diff --git a/module/mes/test.mes b/module/mes/test.mes index e6eb57d5..97c6e601 100644 --- a/module/mes/test.mes +++ b/module/mes/test.mes @@ -26,7 +26,22 @@ ;;; Code: (mes-use-module (mes base)) -(define guile? (not (pair? (current-module)))) +(cond-expand + (mes + (define mes? #t) + (define guile? #f) + (define guile-2? #f) + (define guile-1.8? #f)) + (guile-2 + (define mes? #f) + (define guile? #t) + (define guile-2? #t) + (define guile-1.8? #f)) + (guile + (define mes? #f) + (define guile? #f) + (define guile-2? #f) + (define guile-1.8? #t))) (define result ((lambda (pass fail) diff --git a/scripts/mescc.mes b/scripts/mescc.mes index 2e6639c5..993e8565 100755 --- a/scripts/mescc.mes +++ b/scripts/mescc.mes @@ -10,7 +10,7 @@ then fi MES_MODULEDIR=${MES_MODULEDIR-$MES_PREFIX/"module"} export MES_MODULEDIR -echo '()' | cat $MES_MODULEDIR/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS -- "$@" +$MES $MES_FLAGS -- "$@" < $0 #paredit:|| exit $? !# diff --git a/scripts/repl.mes b/scripts/repl.mes index 15d6b439..ed8f256b 100755 --- a/scripts/repl.mes +++ b/scripts/repl.mes @@ -1,10 +1,9 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/mes} -#MES_ARENA=${MES_ARENA-30000000} -#export MES_ARENA +export MES_ARENA=${MES_ARENA-40000} prefix=module/ -cat $prefix/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS -- "$@" +cat $0 /dev/stdin | $MES $MES_FLAGS -- "$@" #paredit:| exit $? !# diff --git a/src/mes.c b/src/mes.c index 77b7d63d..893ffb85 100644 --- a/src/mes.c +++ b/src/mes.c @@ -24,9 +24,12 @@ #include #include -int ARENA_SIZE = 20000000; // 32B: 100 MiB, 64b: 200 MiB -#if 1 //__MESC__ -int MAX_ARENA_SIZE = 172100000; // 32b: ~ 2GiB +// minimal for boot-0.scm +// int ARENA_SIZE = 100000; // 32b: 1MiB, 64b: 2 MiB +// take a bit more to run all tests +int ARENA_SIZE = 400000; // 32b: 1MiB, 64b: 2 MiB +#if !_POSIX_SOURCE +int MAX_ARENA_SIZE = 166600000; // 32b: ~ 2GiB #else int MAX_ARENA_SIZE = 200000000; // 32b: 2.3GiB, 64b: 4.6GiB #endif diff --git a/tests/base.test b/tests/base.test index 4ee116f9..dcd5ee8b 100755 --- a/tests/base.test +++ b/tests/base.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# @@ -33,10 +33,6 @@ exit $? (pass-if "lambda" (symbol? 'lambda)) -(cond-expand - (guile (define append2 append)) - (mes)) - (pass-if-equal "append" '(0 1) (append2 '(0) '(1))) (pass-if-equal "append 2" '(0) (append2 '(0) '())) (pass-if-equal "append 3" '(0 1 2) (append '(0) '(1) '(2))) @@ -99,9 +95,9 @@ exit $? (pass-if-equal "primitive-load" 42 (primitive-load "tests/data/load.scm") the-answer) (cond-expand - (guile) (mes - (pass-if-equal "include" 42 (include "tests/data/load.scm") the-answer))) + (pass-if-equal "include" 42 (include "tests/data/load.scm") the-answer)) + (else)) (pass-if-eq "call/cc" 0 @@ -112,9 +108,11 @@ exit $? (cont 2)))) #f #f)) -(if (not guile?) - (pass-if-not "#" - (char? (integer->char -1)))) +(cond-expand + (mes + (pass-if-not "#" + (char? (integer->char -1)))) + (else)) (pass-if-equal "setenv, getenv" "bar" diff --git a/tests/boot.test b/tests/boot.test index 4b627638..455c598f 100755 --- a/tests/boot.test +++ b/tests/boot.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +export MES_BOOT=boot-02.scm +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/catch.test b/tests/catch.test index efacab33..8b6a258a 100755 --- a/tests/catch.test +++ b/tests/catch.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/closure.test b/tests/closure.test index 3dc56e6d..dbbea982 100755 --- a/tests/closure.test +++ b/tests/closure.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/cwv.test b/tests/cwv.test index 8a0f606e..742e7cbd 100755 --- a/tests/cwv.test +++ b/tests/cwv.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/display.test b/tests/display.test index 4434a048..c645c1fd 100755 --- a/tests/display.test +++ b/tests/display.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/fluids.test b/tests/fluids.test index 4aefd81c..b405d089 100755 --- a/tests/fluids.test +++ b/tests/fluids.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/getopt-long.test b/tests/getopt-long.test index e9b9bb33..ae4ef740 100755 --- a/tests/getopt-long.test +++ b/tests/getopt-long.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/guile.test b/tests/guile.test index 1a1ec6b1..ff74e087 100755 --- a/tests/guile.test +++ b/tests/guile.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/let-syntax.test b/tests/let-syntax.test index ddf6f0ae..3eaf9d5d 100755 --- a/tests/let-syntax.test +++ b/tests/let-syntax.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/let.test b/tests/let.test index ce4b8456..0431e9d4 100755 --- a/tests/let.test +++ b/tests/let.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/match.test b/tests/match.test index c096c1a3..76bead2a 100755 --- a/tests/match.test +++ b/tests/match.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/math.test b/tests/math.test index c01137da..7f2af71e 100755 --- a/tests/math.test +++ b/tests/math.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/module.test b/tests/module.test index 4bfc5720..fc88879f 100755 --- a/tests/module.test +++ b/tests/module.test @@ -1,10 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -#echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES "$@" -#paredit:|| -cat module/mes/base-0.mes $0 | $MES "$@" -#paredit:| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/optargs.test b/tests/optargs.test index bd86546b..52094640 100755 --- a/tests/optargs.test +++ b/tests/optargs.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/peg.test b/tests/peg.test index f0728f7f..575aeaac 100755 --- a/tests/peg.test +++ b/tests/peg.test @@ -1,10 +1,8 @@ #! /bin/sh # -*-scheme-*- -MES_ARENA=${MES_ARENA-10000000} -export MES_ARENA MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS $MES_FLAGS"$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-166000000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/pmatch.test b/tests/pmatch.test index 6989fce4..596b6d9a 100755 --- a/tests/pmatch.test +++ b/tests/pmatch.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/psyntax.test b/tests/psyntax.test index 41221619..d0d3c2fe 100755 --- a/tests/psyntax.test +++ b/tests/psyntax.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/quasiquote.test b/tests/quasiquote.test index c86ac4f0..b339fba1 100755 --- a/tests/quasiquote.test +++ b/tests/quasiquote.test @@ -1,7 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 #paredit:|| exit $? !# diff --git a/tests/read.test b/tests/read.test index 29ef19fd..d99568fd 100755 --- a/tests/read.test +++ b/tests/read.test @@ -2,8 +2,8 @@ # -*-scheme-*- # ***REMOVE THIS BLOCK COMMENT INITIALLY*** MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/record.test b/tests/record.test index deb7e928..295b5862 100755 --- a/tests/record.test +++ b/tests/record.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/scm.test b/tests/scm.test index 853a4501..7e86e33f 100755 --- a/tests/scm.test +++ b/tests/scm.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/srfi-1.test b/tests/srfi-1.test index 8d386c75..14eb6e2f 100755 --- a/tests/srfi-1.test +++ b/tests/srfi-1.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/srfi-13.test b/tests/srfi-13.test index 1f51fe2e..39e7224a 100755 --- a/tests/srfi-13.test +++ b/tests/srfi-13.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/srfi-14.test b/tests/srfi-14.test index 82941dc7..195def2a 100755 --- a/tests/srfi-14.test +++ b/tests/srfi-14.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/srfi-16.test b/tests/srfi-16.test index 061d721c..a250e8a8 100755 --- a/tests/srfi-16.test +++ b/tests/srfi-16.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/syntax.test b/tests/syntax.test index 0ebf6305..96363ea7 100755 --- a/tests/syntax.test +++ b/tests/syntax.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !# diff --git a/tests/vector.test b/tests/vector.test index 1e590361..74290bd4 100755 --- a/tests/vector.test +++ b/tests/vector.test @@ -1,8 +1,8 @@ #! /bin/sh # -*-scheme-*- MES=${MES-$(dirname $0)/../src/mes} -echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@" -#paredit:|| +#export MES_ARENA=${MES_ARENA-40000} +$MES $MES_FLAGS "$@" < $0 exit $? !#