From 052c10245a523aa714489bda59e18a6c1a4f473e Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Mon, 31 Oct 2005 23:26:24 +0000
Subject: Installed Autoconf/Automake machinery.  Fixed a few things.

* src/guile/skribilo/evaluator.scm (skribe-load): Search through
  `%load-path' and try with a `.scm' extension (rather than the `.skr'
  one provided by the user).
  (skribe-include): Added a few debugging statements.

* src/guile/skribilo/lib.scm (fix-rest-arg): Handle the dot notation for
  rest arguments.

* src/guile/skribilo/reader/skribe.scm (%make-skribe-reader): Use
  SQUARE-BRACKET-FREE-SYMBOL-MISC-CHARS.

* src/guile/skribilo/skribe/index.scm: Use `define-public' instead of
  `define'.

* src/guile/skribilo/packages/*.scm: Moved to `skribilo/package'.

* LICENSE: Removed.

* COPYING: New.

* AUTHORS: New.

* NEWS: New.

* ChangeLog: New.

* configure.ac: New.

* Makefile.am: New.  In various directories.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-10
---
 src/guile/skribilo/reader/Makefile.am |  2 ++
 src/guile/skribilo/reader/skribe.scm  | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 src/guile/skribilo/reader/Makefile.am

(limited to 'src/guile/skribilo/reader')

diff --git a/src/guile/skribilo/reader/Makefile.am b/src/guile/skribilo/reader/Makefile.am
new file mode 100644
index 0000000..a1c58fb
--- /dev/null
+++ b/src/guile/skribilo/reader/Makefile.am
@@ -0,0 +1,2 @@
+guilemoduledir = $(GUILE_SITE)/skribilo/reader
+dist_guilemodule_DATA = skribe.scm
diff --git a/src/guile/skribilo/reader/skribe.scm b/src/guile/skribilo/reader/skribe.scm
index 78f1814..714f19e 100644
--- a/src/guile/skribilo/reader/skribe.scm
+++ b/src/guile/skribilo/reader/skribe.scm
@@ -54,6 +54,7 @@ the Skribe syntax."
          (sharp-reader (r:make-reader (cons dsssl-keyword-reader
                                             (map r:standard-token-reader
                                                  '(character srfi-4
+						   vector
                                                    number+radix
                                                    boolean)))
 				      #f ;; use default fault handler
@@ -61,16 +62,25 @@ the Skribe syntax."
 	 (colon-keywords ;; keywords à la `:key' fashion
 	  (r:make-token-reader #\:
 			       (r:token-reader-procedure
-				(r:standard-token-reader 'keyword)))))
+				(r:standard-token-reader 'keyword))))
+	 (square-bracket-free-symbol-misc-chars
+	  (let* ((tr (r:standard-token-reader 'guile-symbol-misc-chars))
+		 (tr-spec (r:token-reader-specification tr))
+		 (tr-proc (r:token-reader-procedure tr)))
+	  (r:make-token-reader (filter (lambda (chr)
+					 (not (or (eq? chr #\[)
+						  (eq? chr #\]))))
+				       tr-spec)
+			       tr-proc))))
 
     (r:make-reader (cons* (r:make-token-reader #\# sharp-reader)
 			  colon-keywords
+			  square-bracket-free-symbol-misc-chars
 			  (map r:standard-token-reader
 			       `(whitespace
-				 sexp string number
-				 symbol-lower-case
-				 symbol-upper-case
-				 symbol-misc-chars
+				 sexp string guile-number
+				 guile-symbol-lower-case
+				 guile-symbol-upper-case
 				 quote-quasiquote-unquote
 				 semicolon-comment
 				 skribe-exp)))
-- 
cgit v1.2.3