nendo 0.3.4 → 0.3.5

data/lib/nendo.rb

@@ -38,7 +38,6 @@
 module Nendo
   require 'stringio'
   require 'digest/sha1'
-  #require 'profile'
   
   class Nil
     include Enumerable
@@ -232,12 +231,13 @@ module Nendo
   end
   
   class DelayedCallPacket
-    def initialize( _origname, _pred, _args )
+    def initialize( _origname, _rubysym, _pred, _args )
       @origname = _origname
+      @rubysym  = _rubysym
       @pred     = _pred
       @args     = _args
     end
-    attr_reader :origname, :pred, :args
+    attr_reader :origname, :rubysym, :pred, :args
   end
 
   class Token
@@ -821,7 +821,9 @@ module Nendo
     end
     
     def _equal_QUMARK( a, b )
-      if a.class != b.class
+      if a.is_a? String  and  b.is_a? String
+        a === b
+      elsif a.class != b.class
         false
       elsif a.class == Cell
         if a.isNull and b.isNull
@@ -845,7 +847,8 @@ module Nendo
         __assertFlat( arr )
         arr.each { |x| 
           if not (_number_QUMARK(x) or _string_QUMARK(x))
-            raise TypeError
+            ##arr.each { |v| STDERR.printf( "__PLMARK: %s\n", v ) }
+            raise TypeError, sprintf( "Error: arg %s is [%s] type",x ,x.class )
           end
         }
         case args[0].length
@@ -1029,7 +1032,6 @@ module Nendo
     def __GTMARK_EQMARK(      a,b ) a >=  b end
     def __LTMARK(      a,b )        a <   b end
     def __LTMARK_EQMARK(      a,b ) a <=  b end
-    def _eqv_QUMARK(     a,b )      a === b end
     def _eq_QUMARK(      a,b )      a ==  b end
     def _gt_QUMARK(      a,b )      a >   b end
     def _ge_QUMARK(      a,b )      a >=  b end
@@ -1063,7 +1065,7 @@ module Nendo
     end
     def _integer_QUMARK(   arg )   arg.is_a? Integer   end
     def _number_QUMARK(   arg )    arg.is_a? Numeric   end
-    def _string_QUMARK(   arg )    String == arg.class end
+    def _string_QUMARK(   arg )    arg.is_a? String    end
     def _macroexpand_MIMARK1( arg )
       if _pair_QUMARK( arg )
         macroexpandInit( 1 )
@@ -1106,7 +1108,7 @@ module Nendo
       arr = args[0].to_arr
       if 0 < arr.length
         if not arr[0].is_a? String
-          raise TypeError, "Error string-join's expects delimitter as String."
+          raise TypeError, "Error: string-join's expects delimitter as String."
         else
           lst.to_a.map{ |x| x.car }.join( arr[0] )
         end
@@ -1118,6 +1120,16 @@ module Nendo
       require( arg )
       false
     end
+    def _read_MIMARKfrom_MIMARKstring( str )
+      if not str.is_a? String
+        raise TypeError, "Error: read-from-string expects sexp as String."
+      else
+        sio       = StringIO.open( str )
+        reader    = Reader.new( sio, "(string)", false )
+        s = reader._read
+        s[0]
+      end
+    end
     def _read( *args )
       lst = args[0].to_arr
       io = if 0 == lst.length
@@ -1139,7 +1151,7 @@ module Nendo
     end
   
     def _apply1( first, arg )
-      trampCall( callProcedure( "(apply1 genereate func)", first, arg ))
+      trampCall( callProcedure( "(apply1 genereate func)", first, arg.to_arr ))
     end
   
     def _global_MIMARKvariables
@@ -1418,11 +1430,11 @@ module Nendo
         raise ArgumentError, argument_error_message if 0 != args.length
         []
       elsif 0 < num
-        if args.isNull
+        if 0 == args.length
           [ Nil.new ]
         else
           raise ArgumentError, argument_error_message if num != args.length
-          args.map { |x|  x.car }
+          args
         end
       else
         num = num.abs( )-1
@@ -1431,9 +1443,9 @@ module Nendo
         rest = []
         args.each_with_index { |x,i|
           if i < num
-            params << x.car
+            params << x
           else
-            rest   << x.car
+            rest   << x
           end
         }
         result = []
@@ -1451,17 +1463,15 @@ module Nendo
   
     def trampCall( result )
       while result.is_a? DelayedCallPacket
-        method_name = toRubySymbol( result.origname ) + "_METHOD"
         @tmp_origname = result.origname
         @tmp_pred     = result.pred
         @tmp_args     = result.args
-        result = eval( sprintf( "self.%s( @tmp_origname, @tmp_pred, @tmp_args )", method_name ), @binding )
+        result = eval( sprintf( "self.%s( @tmp_origname, @tmp_pred, @tmp_args )", result.rubysym + "_METHOD" ), @binding )
       end
       result
     end
 
     def method_missing( name, *args )
-      sym = toRubySymbol( name )
       if @global_lisp_binding[name].is_a? Proc
         @global_lisp_binding[name].call( args[0], args[1], args[2] )
       else
@@ -1469,12 +1479,12 @@ module Nendo
       end
     end
     
-    def delayCall( origname, pred, args )
+    def delayCall( rubysym, origname, pred, args )
       case @optimize_level
       when 0 # no optimize
         callProcedure( origname, pred, args )
       else # tail call optimization
-        DelayedCallPacket.new( origname, pred, args )
+        DelayedCallPacket.new( origname, rubysym, pred, args )
       end
     end
     
@@ -1537,17 +1547,12 @@ module Nendo
           lispSymbolReference( toRubySymbol( funcname ), locals, translatedArr, sourcefile, lineno )
         else
           # Nendo function
-          if 0 == args.length
-            arr = [ "Cell.new(" ]
-          else
-            arr = separateWith( args.map.with_index { |x,i| x.car }, ",Cell.new(" )
-            arr[0].unshift( "Cell.new(" )
-          end
+          arr = separateWith( args.map { |x| x.car }, "," )
           if EXEC_TYPE_ANONYMOUS == execType
             [sprintf( "trampCall( callProcedure( 'anonymouse', " ),
              [ funcname ] + [ "," ],
-             arr,
-             sprintf( "             ))" ) + arr.map { |n| ")" }.join]
+             "[", arr, "]",
+             "          ))"]
           else
             origname = funcname.to_s
             funcname = funcname.to_s
@@ -1555,17 +1560,17 @@ module Nendo
             _call = case execType
                     when EXEC_TYPE_NORMAL
                       if locals.flatten.include?( sym )
-                        [ sprintf( "trampCall( callProcedure(  ", sym ), "))" ] # local function
+                        [          "trampCall( callProcedure(  ",        "))" ] # local function
                       else
                         [ sprintf( "trampCall( self.%s_METHOD( ", sym ), "))" ] # toplevel function
                       end
                     when EXEC_TYPE_TAILCALL
-                      [ "delayCall(",    ")"  ]
+                      [ sprintf( "delayCall( '%s', ", sym ),    ")"  ]
                     end
             [sprintf( "%s '%s',", _call[0], origname ), 
              [lispSymbolReference( sym, locals, nil, sourcefile, lineno )] + [","], 
-             arr,
-             sprintf( "             %s", _call[1] ) + arr.map { |n| ")" }.join]
+             "[", arr, "]",
+             sprintf( "             %s", _call[1] )]
           end
         end
       end
@@ -1730,6 +1735,8 @@ module Nendo
         str += sprintf( "LispKeyword.new( \"%s\" )", sexp.key.to_s )
       when TrueClass, FalseClass, NilClass  # reserved symbols
         str += toRubyValue( sexp )
+      when Nil
+        str += "Cell.new()"
       else
         str += sprintf( "%s", sexp )
       end
@@ -1774,7 +1781,7 @@ module Nendo
          "end"]
       end
     end
-  
+      
     # Lisp->Ruby translater
     #    - locals is array of closure's local variable list
     #      when S-expression is 
@@ -1923,7 +1930,7 @@ module Nendo
             sexp
           elsif sexp.car.class == Symbol and eval( sprintf( "(defined? @%s and LispMacro == @%s.class)", sym,sym ), @binding )
             eval( sprintf( "@__macro = @%s", sym ), @binding )
-            newSexp = trampCall( callProcedure( sym, @__macro, sexp.cdr ))
+            newSexp = trampCall( callProcedure( sym, @__macro, sexp.cdr.to_arr ))
           end
           if _equal_QUMARK( newSexp, sexp )
             sexp.map { |x|
@@ -1988,7 +1995,7 @@ module Nendo
       sym = toRubySymbol( "%compile-phase" )
       if ( eval( sprintf( "(defined? @%s and Proc == @%s.class)", sym,sym ), @binding ))
         eval( sprintf( "@___tmp = @%s", sym ), @binding )
-        sexp = trampCall( callProcedure( sym, @___tmp, Cell.new( sexp )))
+        sexp = trampCall( callProcedure( sym, @___tmp, [ sexp ]))
         if @debug
           printf( "\n          compiled=<<< %s >>>\n", (Printer.new())._print(sexp))
         end
@@ -2107,7 +2114,7 @@ module Nendo
 
       argsStr = (1..(pred.arity)).map { |n| "arg" + n.to_s }.join( "," )
       str = [ "def self." + origname + "(" + argsStr + ")",
-              sprintf( "  trampCall( callProcedure( '%s', @_%s, [ " + argsStr + " ].to_list )) ",
+              sprintf( "  trampCall( callProcedure( '%s', @_%s, [ " + argsStr + " ] )) ",
                        origname, origname ),
               "end ;",
               "def @core." + origname + "(" + argsStr + ")",