nendo 0.6.2 → 0.6.3

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.6.3 / 2012-02-18
+
+* Removed gem dependency for `jeweler' and `ruby-prof'.
+
+* Changed install path of library files written in nendo. like
+    *.nnd             =>  nendo/*.nnd
+    debug/*.nnd       =>  nendo/debug/*.nnd
+    nendo/*.nnd       =>  nendo/nendo/*.nnd
+    rfc/*.nnd         =>  nendo/rfc/*.nnd
+    text/*.nnd        =>  nendo/text/*.nnd
+    util/*.nnd        =>  nendo/util/*.nnd
+
+
 === 0.6.2 / 2012-02-10
 
 * Supported testable gem

data/Rakefile

@@ -39,8 +39,6 @@ begin
     gemspec.add_dependency             "rspec"
     gemspec.add_dependency             "json"
     gemspec.add_dependency             "rake"
-    gemspec.add_development_dependency "jeweler"
-    gemspec.add_development_dependency "ruby-prof"
   end
 rescue LoadError
   puts 'Jeweler not available. If you want to build a gemfile, please install with "sudo gem install jeweler"'
@@ -99,7 +97,7 @@ end
 
 task :compile do
   # Replace Version Number
-  targetFile = "./lib/ruby/core.rb"
+  targetFile = "./lib/nendo/ruby/core.rb"
   vh = Jeweler::VersionHelper.new "."
   (original, modified) = open( targetFile ) {|f|
     lines = f.readlines
@@ -120,21 +118,22 @@ task :compile do
   end
 
   # Compile
-  sh "/bin/rm -f ./lib/*.nndc* ./lib/**/*.nndc*"
+  sh "/bin/rm -f ./lib/nendo/*.nndc* ./lib/nendo/**/*.nndc*"
+  sh "ruby -rrbconfig -e 'p RbConfig::CONFIG[ \"vendor_dir\" ]'"
   files = []
-  files << "./lib/init.nnd"
-  files << "./lib/srfi-1.nnd"
-  files << "./lib/srfi-2.nnd"
-  files << "./lib/srfi-26.nnd"
-  files << "./lib/util/list.nnd"
-  files << "./lib/text/html-lite.nnd"
-  files << "./lib/text/tree.nnd"
-  files << "./lib/debug/syslog.nnd"
-  files << "./lib/nendo/test.nnd"
-  files << "./lib/rfc/json.nnd"
-  files << "./lib/util/match.nnd"
-  files << "./lib/util/combinations.nnd"
-  files << "./lib/nendo/experimental.nnd"
+  files << "./lib/nendo/init.nnd"
+  files << "./lib/nendo/srfi-1.nnd"
+  files << "./lib/nendo/srfi-2.nnd"
+  files << "./lib/nendo/srfi-26.nnd"
+  files << "./lib/nendo/util/list.nnd"
+  files << "./lib/nendo/text/html-lite.nnd"
+  files << "./lib/nendo/text/tree.nnd"
+  files << "./lib/nendo/debug/syslog.nnd"
+  files << "./lib/nendo/nendo/test.nnd"
+  files << "./lib/nendo/rfc/json.nnd"
+  files << "./lib/nendo/util/match.nnd"
+  files << "./lib/nendo/util/combinations.nnd"
+  files << "./lib/nendo/nendo/experimental.nnd"
   files.each {|fn|
     sh sprintf( "time ruby -I ./lib ./bin/nendo -c %s > %s", fn, fn + "c" )
   }
@@ -147,7 +146,7 @@ task :bench do
 end
 
 task :clean_nndc do
-  sh "/bin/rm -f ./lib/*.nndc* ./lib/**/*.nndc*"
+  sh "/bin/rm -f ./lib/**/*.nndc* ./lib/**/**/*.nndc*"
 end
 
 task :condition_clean do
@@ -157,5 +156,5 @@ task :condition_clean do
 end
 
 task :repl do
-  sh "ruby -I ./lib ./bin/nendo"
+  sh "ruby -I ./lib -I ./lib/nendo  ./bin/nendo"
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 6
-:patch: 2
+:patch: 3

data/lib/{debug → nendo/debug}/syslog.nndc

@@ -5,13 +5,13 @@
 
 trampCall( 
   begin
-    embedBacktraceInfo( "./lib/debug/syslog.nnd", 37 ); 
+    embedBacktraceInfo( "./lib/nendo/debug/syslog.nnd", 37 ); 
       delayCall( '_require',  'require',
           begin
             if @global_lisp_binding.has_key?('_require') then
               trampCall(@_require)
             else raise NameError.new( "Error: undefined variable _require", "_require" ) end
-            rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:37"] + __e.backtrace ) ; raise __e
+            rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:37"] + __e.backtrace ) ; raise __e
           end        ,
       [
           "syslog"
@@ -31,32 +31,32 @@ trampCall(
               begin
                   trampCall(Syslog).open(
                     )
-                rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:40"] + __e.backtrace ) ; raise __e
+                rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:40"] + __e.backtrace ) ; raise __e
               end
               begin
                   trampCall(Syslog).log(
                         begin
                             trampCall(Syslog::LOG_WARNING)
-                          rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
+                          rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
                         end                      ,
                       "%s"                      ,
                         begin
-                          embedBacktraceInfo( "./lib/debug/syslog.nnd", 41 ); 
+                          embedBacktraceInfo( "./lib/nendo/debug/syslog.nnd", 41 ); 
                             __PLMARK_ARGS2(
                               "Nendo: "                              ,
                                 begin
                                     trampCall(_str)
-                                  rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
+                                  rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
                                 end
                             )
                         end
                     )
-                rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
+                rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:41"] + __e.backtrace ) ; raise __e
               end
               begin
                   trampCall(Syslog).close(
                     )
-                rescue => __e ; __e.set_backtrace( ["./lib/debug/syslog.nnd:42"] + __e.backtrace ) ; raise __e
+                rescue => __e ; __e.set_backtrace( ["./lib/nendo/debug/syslog.nnd:42"] + __e.backtrace ) ; raise __e
               end
           }
     )

data/lib/{init.nnd → nendo/init.nnd}

@@ -1168,22 +1168,24 @@
 (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))))))))))
+      (let1 lp (append (map (lambda (x) (+ x "/nendo")) *load-path*)
+                       *load-path*)
+        (let loop ((load-path lp))
+          (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*