Merge pull request #16 from chclock/master

完善部分功能

Author: evilbinary

packages/c/c-ffi.ss

@@ -206,9 +206,9 @@
  (define lib-name
   (case (machine-type)
    ((arm32le) "libc.so")
-   ((a6nt i3nt) "libc.dll")
-   ((a6osx i3osx)  "libc.so")
-   ((a6le i3le) "libc.so")))
+   ((a6nt i3nt ta6nt ti3nt) "libc.dll")
+   ((a6osx i3osx ta6osx ti3osx)  "libc.so")
+   ((a6le i3le ta6le ti3le) "libc.so")))
  (define lib (load-librarys  lib-name ))
 
 ;;long c_a64l(char* )

packages/irregex/error.scm

@@ -0,0 +1,7 @@
+
+(define (error msg . args)
+  (display msg)
+  (for-each (lambda (x) (display " ") (write x)) args)
+  (newline)
+  (0))
+

packages/irregex/irregex-r6rs.scm

@@ -0,0 +1,157 @@
+* chez-json
+
+fork from <https://github.com/aconchillo/guile-json>
+
+--------------------------------------------------------------
+
+* guile-json
+
+guile-json is a JSON module for Guile. It supports parsing and
+building JSON documents according to the http://json.org
+specification. These are the main features:
+
+- Strictly complies to http://json.org specification.
+
+- Build JSON documents programmatically via macros.
+
+- Basic unicode support for strings.
+
+- Allows JSON pretty printing.
+
+
+* Installation
+
+guile-json is freely available for download under the terms of the GNU
+Lesser General Public License version 3 (LGPLv3+).
+
+Download the latest tarball and untar it:
+
+- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-0.5.0.tar.gz][guile-json-0.5.0.tar.gz]]
+
+Then, run the typical sequence:
+
+    : $ ./configure --prefix=<guile-prefix>
+    : $ make
+    : $ sudo make install
+
+Where <guile-prefix> should preferably be the same as your system Guile
+installation directory (e.g. /usr).
+
+If everything installed successfully you should be up and running:
+
+    : $ guile
+    : scheme@(guile-user)> (use-modules (json))
+    : scheme@(guile-user)> (scm->json (json (array 1 2 3)))
+    : [1, 2, 3]
+
+It might be that you installed guile-json somewhere differently than
+your system's Guile. If so, you need to indicate Guile where to find
+guile-json, for example:
+
+    : $ GUILE_LOAD_PATH=/usr/local/share/guile/site guile
+
+A pkg-list.scm file is also provided for users of the
+Guildhall/Dorodango packaging system.
+
+
+* Usage
+
+guile-json provides a few procedures to parse and build a JSON
+document. A JSON document is transformed into or from native Guile
+values according to the following table:
+
+| JSON   | Guile      |
+|--------+------------|
+| string | string     |
+| number | number     |
+| object | hash-table |
+| array  | list       |
+| true   | #t         |
+| false  | #f         |
+| null   | #nil       |
+
+To start using guile-json procedures and macros you first need to load
+the module:
+
+    : scheme@(guile-user)> (use-modules (json))
+
+
+** Procedures
+
+- (*json->scm* #:optional port) : Reads a JSON document from the given
+  port, or from the current input port if none is given.
+
+  - /port/ : is optional, it defaults to the current input port.
+
+- (*json-string->scm* str) : Reads a JSON document from the given
+  string.
+
+- (*scm->json* native #:optional port #:key escape pretty) : Creates a
+  JSON document from the given native Guile value. The JSON document is
+  written into the given port, or to the current output port if non is
+  given.
+
+  - /port/ : it defaults to the current output port.
+  - /escape/ : if true, the slash (/ solidus) character will be escaped.
+  - /pretty/ : if true, the JSON document will be pretty printed.
+
+- (*scm->json-string* native #:key escape pretty) : Creates a JSON
+  document from the given native Guile value into a string.
+
+  - /escape/ : if true, the slash (/ solidus) character will be escaped.
+  - /pretty/ : if true, the JSON document will be pretty printed.
+
+
+** Exceptions
+
+A /json-invalid/ exception is thrown if an error is found during the
+JSON parsing. Since version 0.2.0, the /json-invalid/ exception has a
+single parser argument (see predicate and accessors below). The line or
+column where the error occured can be easily obtained from the parser
+port (calling /port-line/ or /port-column/ on the port).
+
+- (*json-parser?* parser) : Tells whether the given argument is a JSON
+  parser record type.
+
+- (*json-parser-port* parser) : Get the port that the parser was reading
+  from.
+
+
+** Macros
+
+It is also possible to build JSON documents programmatically using the
+main /json/ macro (and /object/ and /array/). Here are some examples:
+
+- Build the string "hello world":
+
+    : scheme@(guile-user)> (scm->json (json "hello world"))
+    : "hello world"
+
+- Build the [1, 2, 3] array:
+
+    : scheme@(guile-user)> (scm->json (json (array 1 2 3)))
+    : [1, 2, 3]
+
+- Build the [1, 2, 3, 4] array using unquote-splicing:
+
+    : scheme@(guile-user)> (define values '(2 3))
+    : scheme@(guile-user)> (scm->json (json (array 1 ,@values 4)))
+    : [1, 2, 3, 4]
+
+- Build the object { "project" : "foo", "author" : "bar" }:
+
+    : scheme@(guile-user)> (scm->json (json (object ("project" "foo")
+    :                                               ("author" "bar"))))
+    : {"author" : "bar", "project" : "foo"}
+
+- Build the object { "values" : [ 234, 98.56 ] }:
+
+    : scheme@(guile-user)> (scm->json (json (object ("values" (array 234 98.56)))))
+    : {"values" : [234, 98.56]}
+
+- Build the object { "values" : [ 234, 98.56 ] } again, this time using
+  a variable:
+
+    : scheme@(guile-user)> (define values '(234 98.56))
+    : scheme@(guile-user)> (scm->json (json (object ("values" ,values))))
+    : {"values" : [1, 2, 3]}

packages/json/README

@@ -168,9 +168,9 @@
     (build-newline port pretty)
     (format port "~A}" (indent-string pretty level)))
 
-  (define (hashtable->list hashtable)
-      (map (lambda (k) (cons k (hashtable-ref hashtable k #f))) 
-           (vector->list (hashtable-keys hashtable))))
+  (define (hash-table->list hash-table)
+    (hash-table-map hash-table (lambda (k v)
+                                 (cons k v))))
 
   (define (json-build scm port escape pretty level)
     (cond
@@ -181,8 +181,8 @@
      ((string? scm) (json-build-string scm port escape))
      ((json-alist? scm) (json-build-object scm port escape pretty level))
      ((list? scm) (json-build-array scm port escape pretty level))
-     ((hashtable? scm)
-      (json-build-object (hashtable->list scm) port escape pretty level))
+     ((hash-table? scm)
+      (json-build-object (hash-table->list scm) port escape pretty level))
      (else (error 'json-invalid "json invalid"))))
 
   ;;

packages/json/builder.scm

@@ -26,8 +26,27 @@
 ;;; Code:
 
 (library (json json)
-  (export scm->json
-          scm->json-string)
-  (import (json builder)))
+  (export json
+          scm->json
+          scm->json-string
+          json->scm
+          json-string->scm
+          json-parser?
+          json-parser-port)
+  (import (json builder)
+          (json parser)
+          (json syntax)))
+
+  ;(define-syntax re-export-modules
+  ;  (syntax-rules ()
+  ;    ((_ (mod ...) ...)
+  ;     (begin
+  ;       (module-use! (module-public-interface (current-module))
+  ;                    (resolve-interface '(mod ...)))
+  ;       ...))))
+  ;
+  ;(re-export-modules (json builder)
+  ;                   (json parser)
+  ;                   (json syntax)))
 
 ;;; (json) ends here