Eu2C: Reorganise the syntax modules so that syntax-0 corresponds to l…

…evel-0
Henry · Oct 6, 2010 · 5ad7206 · 5ad7206
1 parent 9120391
commit 5ad7206
Show file tree

Hide file tree

Showing 50 changed files with 103 additions and 154 deletions.
diff --git a/Eu2C/EuLispModules/collection-aux.em b/Eu2C/EuLispModules/collection-aux.em
@@ -64,7 +64,7 @@
                  c-string-interface))
    syntax (tail
            apply
-           syntax-0
+           syntax-i
            setf)
    export (reverse-list
            test-range-indizes

diff --git a/Eu2C/EuLispModules/collection-convert.em b/Eu2C/EuLispModules/collection-convert.em
@@ -54,7 +54,7 @@
            convert)
    syntax (tail
            apply
-           syntax-0
+           syntax-i
            setf)
    export (converter
            convert))

diff --git a/Eu2C/EuLispModules/collection-generic.em b/Eu2C/EuLispModules/collection-generic.em
@@ -27,7 +27,7 @@
   (import (tail
            standard-generic-function)
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (accumulate
            accumulate1
            any?

diff --git a/Eu2C/EuLispModules/collection-i.em b/Eu2C/EuLispModules/collection-i.em
@@ -39,7 +39,7 @@
                  c-string-interface))
    syntax (tail
            apply
-           syntax-0
+           syntax-i
            setf)
    export (primitive-setter-string-ref
            primitive-string-size

diff --git a/Eu2C/EuLispModules/collection-list.em b/Eu2C/EuLispModules/collection-list.em
@@ -41,7 +41,7 @@
            collection-generic
            collection-aux)
    syntax (tail
-           syntax-0
+           syntax-i
            setf)
    export (accumulate
            accumulate1

diff --git a/Eu2C/EuLispModules/collection-string.em b/Eu2C/EuLispModules/collection-string.em
@@ -57,7 +57,7 @@
                   string-ref-u)
                  collection-i))
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (accumulate
            accumulate1
            any?

diff --git a/Eu2C/EuLispModules/collection-table.em b/Eu2C/EuLispModules/collection-table.em
@@ -58,7 +58,7 @@
            collection-aux
            table)
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (<table>
            make-table
            setter-table-ref

diff --git a/Eu2C/EuLispModules/collection-vector.em b/Eu2C/EuLispModules/collection-vector.em
@@ -40,7 +40,7 @@
            collection-generic
            collection-aux)
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (accumulate
            accumulate1
            any?

diff --git a/Eu2C/EuLispModules/compare.em b/Eu2C/EuLispModules/compare.em
@@ -58,7 +58,7 @@
    syntax (eulisp-kernel
            (only (and
                   cond)
-                 syntax-0))
+                 syntax-i))
    expose (compare-generic)
    export (eq
            eql

diff --git a/Eu2C/EuLispModules/condition-i.em b/Eu2C/EuLispModules/condition-i.em
@@ -51,7 +51,7 @@
            basic-condition
            condition-ii)
    syntax (tail
-           syntax-0
+           syntax-i
            condition-ii)
    c-import (<stdlib.h>
              <stdio.h>

diff --git a/Eu2C/EuLispModules/double-float.em b/Eu2C/EuLispModules/double-float.em
@@ -39,7 +39,7 @@
    c-import (<float.h>)
    syntax (eulisp-kernel
            (only (and)
-                 syntax-0))
+                 syntax-i))
    export (<double-float>
            double-float?
            most-positive-double-float

diff --git a/Eu2C/EuLispModules/eulisp-kernel.em b/Eu2C/EuLispModules/eulisp-kernel.em
@@ -27,7 +27,7 @@
   (import (tail
            function
            standard-generic-function)
-   syntax (syntax-0
+   syntax (syntax-i
            standard-generic-function)
    expose (function
            tail

diff --git a/Eu2C/EuLispModules/event-i.em b/Eu2C/EuLispModules/event-i.em
@@ -51,7 +51,7 @@
                  timer))
    syntax ((only (when
                   unless)
-                 syntax-0))
+                 syntax-i))
    export (wait
            get-timer
            timeout-expired

diff --git a/Eu2C/EuLispModules/int.em b/Eu2C/EuLispModules/int.em
@@ -49,7 +49,7 @@
                  compare-generic))
    syntax (eulisp-kernel
            (only (and)
-                 syntax-0))
+                 syntax-i))
    export (binary+
            binary-
            binary/

diff --git a/Eu2C/EuLispModules/level-0.em b/Eu2C/EuLispModules/level-0.em
@@ -47,7 +47,7 @@
            stream
            string
            symbol
-           syntax-0
+           syntax-i
            table
            ;;***HGW thread ; For thread support
            vector)
@@ -73,7 +73,7 @@
            stream
            string
            symbol
-           syntax-0
+           syntax-i
            table
            ;;***HGW thread ; For thread support
            vector))

diff --git a/Eu2C/EuLispModules/level-0x.em b/Eu2C/EuLispModules/level-0x.em
@@ -20,15 +20,15 @@
 ;;;-----------------------------------------------------------------------------
 ;;; Title: Level 0 of EuLisp extended for interaction with C
 ;;;  Description:
-;;    This is intended as a basic system which provides level 0 of EuLisp and
-;;    some additional things needed for interaction with C
+;;    This is intended as a basic system which provides EuLisp level-0 and
+;;    some additional functionality needed for interaction with C.
 ;;;  Authors: Ingo Mohr
 ;;;  Maintainer: Henry G. Weller
 ;;;-----------------------------------------------------------------------------
 
 (defmodule level-0x
   (import (level-0)
-   syntax (level-0)
+   syntax (syntax-0)
    expose (level-0
            unix-interface
            c-interface))

diff --git a/Eu2C/EuLispModules/list.em b/Eu2C/EuLispModules/list.em
@@ -38,7 +38,7 @@
                  compare-generic))
    syntax (tail
            (only (and)
-                 syntax-0))
+                 syntax-i))
    expose ((only (<null>
                   <cons>
                   <list>

diff --git a/Eu2C/EuLispModules/object-0-i.em b/Eu2C/EuLispModules/object-0-i.em
@@ -28,7 +28,7 @@
            tail
            option-lists)
    syntax (eulisp-kernel
-           syntax-0
+           syntax-i
            tail)
    export (<object>
            make

diff --git a/Eu2C/EuLispModules/option-lists.em b/Eu2C/EuLispModules/option-lists.em
@@ -31,7 +31,7 @@
            (only (cond
                    and
                    when)
-                 syntax-0))
+                 syntax-i))
    export (find-option
            get-option
            check-options))

diff --git a/Eu2C/EuLispModules/pair.em b/Eu2C/EuLispModules/pair.em
@@ -36,7 +36,7 @@
                  eulisp-kernel))
    syntax (tail
            (only (cond)
-                 syntax-0))
+                 syntax-i))
    export (atom?
            cons?
            copy-alist

diff --git a/Eu2C/EuLispModules/small-table.em b/Eu2C/EuLispModules/small-table.em
@@ -25,7 +25,7 @@
 (defmodule small-table
   (import (tail)
    syntax (tail
-            syntax-0)
+            syntax-i)
    export (<small-table>
             make-small-table
             small-table-ref

diff --git a/Eu2C/EuLispModules/stream-i.em b/Eu2C/EuLispModules/stream-i.em
@@ -109,7 +109,7 @@
    syntax (tail
            (only (when
                   unless)
-                 syntax-0)
+                 syntax-i)
            condition-ii)
    export (<stream>
            <file-stream>

diff --git a/Eu2C/EuLispModules/string.em b/Eu2C/EuLispModules/string.em
@@ -25,7 +25,7 @@
 
 (defmodule string
   (import (tail
-           syntax-0
+           syntax-i
            string-ii
            convert
            symbol
@@ -50,7 +50,7 @@
                   shallow-copy)
                  copy))
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (<string>
            string?
            make-string

diff --git a/Eu2C/EuLispModules/symbol.em b/Eu2C/EuLispModules/symbol.em
@@ -40,7 +40,7 @@
            (only (sprintf-3)
                  c-stdio))
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (<symbol>
            symbol?
            gensym

diff --git a/Eu2C/EuLispModules/syntax-0.em b/Eu2C/EuLispModules/syntax-0.em
@@ -1,71 +1,3 @@
-;;; Copyright 1994-2010 Fraunhofer ISST
-;;; Copyright 2010 Henry G. Weller
-;;;-----------------------------------------------------------------------------
-;;  This file is part of
-;;; ---                           EuLisp System 'Eu2C'
-;;;-----------------------------------------------------------------------------
-;;
-;;  Eu2C is free software: you can redistribute it and/or modify it under the
-;;  terms of the GNU General Public License version 2 as published by the Free
-;;  Software Foundation.
-;;
-;;  Eu2C 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
-;;  this program.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;;-----------------------------------------------------------------------------
-;;; Title: Level-0 syntax
-;;;  Authors: Ingo Mohr
-;;;  Maintainer: Henry G. Weller
-;;;-----------------------------------------------------------------------------
-
 (defmodule syntax-0
-  (import (tail
-           basic-list
-           basic-syntax)
-   syntax (tail)
-   expose (basic-list
-           basic-compare
-           basic-syntax))
-
-;;;-----------------------------------------------------------------------------
-;;; cond
-;;;-----------------------------------------------------------------------------
-(defmacro cond clauses
-  (if (null? clauses) ()
-    (if (null? (cdr (car clauses))) `(or ,(car (car clauses))
-                                        (cond ,@(cdr clauses)))
-      (if (eq (car (car clauses)) 't) `(progn ,@(cdr (car clauses)))
-        `(if ,(car (car clauses))
-             (progn ,@(cdr (car clauses)))
-           (cond ,@(cdr clauses)))))))
-
-(defmacro and forms
-  (if (null? forms) 't
-    (if (null? (cdr forms)) (car forms)
-      `(if ,(car forms)
-           (and ,@(cdr forms))
-         ()))))
-
-(defmacro when (cond . forms)
-  (if (null? forms) ()
-    `(if ,cond (progn ,@forms) () )))
-
-(defmacro unless (cond . forms)
-  (if (null? forms) ()
-    `(if ,cond () (progn ,@forms) )))
-
-(defmacro block (identifier . forms)
-  (if (null? forms) ()
-    `(let/cc ,identifier ,@forms)))
-
-(defmacro return-from (identifier . form)
-  `(,identifier ,(if (null? form) () (car form))))
-
-;;;-----------------------------------------------------------------------------
-)  ;; End of module syntax-0
-;;;-----------------------------------------------------------------------------
+  (expose (syntax-i
+           object-0)))
diff --git a/Eu2C/EuLispModules/table-aux.em b/Eu2C/EuLispModules/table-aux.em
@@ -44,7 +44,7 @@
            (only (<character> convert-char-int character?)
                  character))
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (mapc
            hash
            assoc

diff --git a/Eu2C/EuLispModules/table.em b/Eu2C/EuLispModules/table.em
@@ -36,7 +36,7 @@
                  basic-list-0)
            table-aux)
    syntax (tail
-           syntax-0
+           syntax-i
            setf)
    export (<table>
            table?

diff --git a/Eu2C/EuLispModules/thread-i.em b/Eu2C/EuLispModules/thread-i.em
@@ -52,7 +52,7 @@
                  tail))
    syntax ((only (when
                   unless)
-                 syntax-0))
+                 syntax-i))
    export (TL-empty
            TL-single
            TL-on-top

diff --git a/Eu2C/EuLispModules/thread-ii.em b/Eu2C/EuLispModules/thread-ii.em
@@ -55,7 +55,7 @@
                  letcc))
    syntax ((only (when
                   unless)
-                 syntax-0))
+                 syntax-i))
    export (<thread>
            thread?
            make-thread

diff --git a/Eu2C/EuLispModules/thread.em b/Eu2C/EuLispModules/thread.em
@@ -64,7 +64,7 @@
    syntax ((only (unless
                   when
                   cond)
-                 syntax-0)
+                 syntax-i)
            (only (with-handler)
                  condition))
    export (<thread>

diff --git a/Eu2C/EuLispModules/vector.em b/Eu2C/EuLispModules/vector.em
@@ -38,7 +38,7 @@
            (only (equal)
                  compare-generic))
    syntax (tail
-           syntax-0)
+           syntax-i)
    export (<vector>
            vector?
            vector-size