nendo 0.3.5 → 0.4.0

data/bin/nendo

@@ -48,6 +48,8 @@ def userOptionEater
       i += 1
     when '-c'
       i += 1
+    when '-V'
+      i += 1
     when '-l'
       i += 2
     when '-O'
@@ -76,6 +78,7 @@ def main
                         [ '-h', GetoptLong::NO_ARGUMENT ],
                         [ '-q', GetoptLong::NO_ARGUMENT ],
                         [ '-c', GetoptLong::NO_ARGUMENT ],
+                        [ '-V', GetoptLong::NO_ARGUMENT ],
                         [ '-l', GetoptLong::REQUIRED_ARGUMENT ],
                         [ '-O', GetoptLong::REQUIRED_ARGUMENT ]
                         ).each { |opt, arg|
@@ -91,6 +94,9 @@ def main
       -q:
         Does not read the default initialization file.
 
+      -V:
+        show version
+
       -l file:
         load nendo script files. ( can specify n times like   -l a.nnd -l b.nnd  )
 
@@ -102,6 +108,9 @@ def main
 
       EOF
       exit 0
+    when '-V'
+      printf( "Nendo %s\n", Nendo::Core.version )
+      exit( 1 )
     when '-q'
       loadInit = false
       conflict += 1

data/example/KyotoCabinet/kcsample.nnd

@@ -0,0 +1,24 @@
+#!/bin/sh
+:; #-*- mode: nendo; syntax: scheme -*-;;
+:; exec /usr/local/bin/nendo $0 $*
+(require "kyotocabinet")
+
+(let1 db (KyotoCabinet::DB.new)
+  ;; データベースを開く
+  (unless (db.open
+           "sample.kch"
+           (+ KyotoCabinet::DB::OWRITER KyotoCabinet::DB::OCREATE))
+    (printf "open error: %s\n" db.error))
+
+
+  ;; 書きこみ
+  (db.set "key1" "value1")
+  (db.set "key2" "value2")
+  (db.set "key3" "value3")
+
+  ;; 内容確認
+  (db.each
+   (&block (key value)
+     (printf "key=[%s] value=[%s]\n" key value)))
+
+  (db.close))

data/example/KyotoCabinet/kcsample.rb

@@ -0,0 +1,24 @@
+#!/usr/local/bin/ruby
+# -*- coding: utf-8 -*-
+
+require 'kyotocabinet'
+
+db = KyotoCabinet::DB.new
+# データベースを開く
+unless db.open(
+               'sample.kch',
+               KyotoCabinet::DB::OWRITER | KyotoCabinet::DB::OCREATE)
+  printf("open error: %s\n", db.error)
+end
+
+# 書きこみ
+db.set( 'key1', 'value1' )
+db.set( 'key2', 'value2' )
+db.set( 'key3', 'value3' )
+
+# 内容確認
+db.each { |key, value|
+  printf( "key=[%s] value=[%s]\n", key,value )
+}
+
+db.close

data/example/html-lite-sample.nnd

@@ -2,8 +2,8 @@
 :; #-*- mode: nendo; syntax: scheme -*-;;
 :; exec /usr/local/bin/nendo $0 $*
 
-(load-library "text/html-lite")
-(load-library "text/tree")
+(load "text/html-lite")
+(load "text/tree")
 
 (define (page-sample)
   `(

data/lib/init.nnd

@@ -859,41 +859,6 @@
       (apply hash-table alist)))
 
 
-;; ----------------------------------------
-;; Ruby interop librarys
-;; ----------------------------------------
-;; export Nendo's function to the Ruby world
-(define export-to-ruby
-  (macro (funcname)
-    `(%export-to-ruby ,funcname.to_s ,funcname)))
-
-(define (load-library name)
-  (let* ((home (get-nendo-home))
-         (path (+ home "/" name)))
-    (cond
-     ((File.exist? (+ path ".nndc"))
-      (load-compiled-code (+ path ".nndc")))
-     ((File.exist? (+ path ".nnd"))
-      (load (+ path ".nnd")))
-     (else
-      (errorf "Error: can't load library file [%s]\n" path )))))
-
-;; use macro like Gauche
-(define use
-  (macro (sym)
-    (if (symbol? sym)
-        (let*
-            ((str      (symbol->string sym))
-             (pathname (str.gsub "." "/")))
-          `(load-library ,pathname))
-        (errorf "Error: use macro requires a symbol argument."))))
-
-;; exporting a symbol in the module. (I will implement in the future...)
-(define export
-  (macro (name)
-    `(define ,name nil)))
-
-
 ;; ----------------------------------------
 ;; Vector Library
 ;; ----------------------------------------
@@ -1083,6 +1048,59 @@
           #f))))
 
 
+
+;; ----------------------------------------
+;; Ruby interop librarys
+;; ----------------------------------------
+;; export Nendo's function to the Ruby world
+(define export-to-ruby
+  (macro (funcname)
+    `(%export-to-ruby ,funcname.to_s ,funcname)))
+
+(define (load path)
+  (if (rxmatch #/^([.]\/|[.][.]\/|\/)/ path)
+      (%load path)
+      (let loop ((load-path *load-path*))
+        (cond ((null? load-path)
+               (errorf "Error: can't load file [%s]\n" path))
+              (else
+               (let1 full-path (+ (car load-path) "/" path)
+                 (cond
+                  ((File.exist? full-path)
+                   (if (rxmatch #/[.]nndc$/ full-path)
+                       (%load-compiled-code full-path)
+                       (%load               full-path)))
+                  ((File.exist? (+ full-path ".nndc"))
+                   (%load-compiled-code (+ full-path ".nndc")))
+                  ((File.exist? (+ full-path ".nnd"))
+                   (%load (+ full-path ".nnd")))
+                  (else
+                   (loop (cdr load-path))))))))))
+
+(define (add-load-path path . afterp)
+  (set! *load-path*
+        (if (get-optional afterp #f)
+            (append *load-path* (list path))
+            (cons path *load-path*)))
+  *load-path*)
+
+;; use macro like Gauche
+(define use
+  (macro (sym)
+    (if (symbol? sym)
+        (let*
+            ((str      (symbol->string sym))
+             (pathname (str.gsub "." "/")))
+          `(load ,pathname))
+        (errorf "Error: use macro requires a symbol argument."))))
+
+;; exporting a symbol in the module. (I will implement in the future...)
+(define export
+  (macro (name)
+    `(define ,name nil)))
+
+
+
 ;; ----------------------------------------
 ;; global variables bind checker
 ;; ----------------------------------------
@@ -1321,9 +1339,4 @@
        setup-tailcall-mark
        ))
 
-;; ----------------------------------------
-;; global variables
-;; ----------------------------------------
-(define *nendo-version*
-  "0.3.5"  ;;NENDO-VERSION
-  )
+;;[EOS]