nendo 0.5.2 → 0.5.3

data/lib/nendo.rb

@@ -1339,6 +1339,9 @@ module Nendo
       @lexicalVars = []
       @syntaxHash = {}
       @optimize_level = 2
+      @backtrace = {}
+      @backtrace_counter = 1;
+      @displayErrorsFlag = true;
       @char_table_lisp_to_ruby = {
         # list     (! $ % & * + - . / : < = > ? @ ^ _ ~ ...)
         '!'   => '_EXMARK',
@@ -1432,7 +1435,11 @@ module Nendo
     def getOptimizeLevel
       @optimize_level
     end
-  
+
+    def setDisplayErrors( flag )
+      @displayErrorsFlag = flag
+    end
+
     def lispMethodEntry( name, _log )
       @call_depth += 1
       if @trace_debug and _log
@@ -1535,7 +1542,7 @@ module Nendo
         []
       elsif 0 < num
         if 0 == len
-          [ Nil.new ]
+          raise ArgumentError, errorMessageOf_toRubyArgument( origname, 4, num, len )
         else
           raise ArgumentError, errorMessageOf_toRubyArgument( origname, 2, num, len ) if num != len
           args
@@ -1621,6 +1628,22 @@ module Nendo
       [ :define, :set!, :"define-syntax", @core_syntax_hash[ :define ], @core_syntax_hash[ :set! ], @core_syntax_hash[ :"define-syntax" ] ].include?( sym )
     end
 
+    def embedBacktraceInfo( sourcefile, lineno )
+      @backtrace[ sprintf( "%s:%s", sourcefile, lineno ) ] = @backtrace_counter
+      @backtrace_counter += 1
+    end
+
+    def generateEmbedBacktraceInfo( sourcefile, lineno, arr )
+      if sourcefile and lineno
+        [ "begin",
+          [ sprintf( 'embedBacktraceInfo( "%s", %s ); ', sourcefile, lineno ), arr ],
+          "end"
+        ]
+      else
+        arr
+      end
+    end
+
     def optimizedFunc( origname, rubysym, args )
       case origname
       when '+', '-', '*'
@@ -1715,7 +1738,7 @@ module Nendo
               end
             end
             if result
-              result
+              generateEmbedBacktraceInfo( sourcefile, lineno, result )
             else
               _call = case execType
                       when EXEC_TYPE_NORMAL
@@ -1728,10 +1751,12 @@ module Nendo
                         [ sprintf( "delayCall( '%s', ", sym ),  ")"  ]
                       end
 
-              [sprintf( "%s '%s',", _call[0], origname ),
+              temp = [
+                sprintf( "%s '%s',", _call[0], origname ),
                 [lispSymbolReference( sym, locals, nil, sourcefile, lineno )] + [","],
                 "[", arr, "]",
                 sprintf( "             %s", _call[1] )]
+              generateEmbedBacktraceInfo( sourcefile, lineno, temp )
             end
           end
         end
@@ -2306,16 +2331,29 @@ module Nendo
     end
 
     def displayTopOfCalls( exception )
-      STDERR.puts( "\n  <<< Top of calls >>>" )
-      strs = []
-      @call_counters.each_key { |funcname|
-        if 0 < @call_counters[ funcname ]
-          strs << sprintf( "  %7d : %-20s", @call_counters[ funcname ], funcname )
-        end
-      }
-      strs.sort.reverse.each { |str|
-        STDERR.puts( str )
-      }
+      if @displayErrorsFlag
+        STDERR.puts( "\n  <<< Top of calls >>>" )
+        strs = []
+        @call_counters.each_key { |funcname|
+          if 0 < @call_counters[ funcname ]
+            strs << sprintf( "  %7d : %-20s", @call_counters[ funcname ], funcname )
+          end
+        }
+        strs.sort.reverse.each { |str|
+          STDERR.puts( str )
+        }
+      end
+    end
+
+    def displayBacktrace( exception )
+      if @displayErrorsFlag
+        STDERR.puts( "\n  <<< Backtrace of Nendo >>>" )
+        arr = @backtrace.map { |key,val| [key,val] }.sort_by { |x| x[1] }.reverse
+        arr[0...10].each { |x|
+          STDERR.printf( "        from %s \n", x[0] )
+        }
+        STDERR.puts( "          ...\n\n" )
+      end
     end
 
     def lispEval( sexp, sourcefile, lineno )
@@ -2358,6 +2396,9 @@ module Nendo
       rescue SystemStackError => e
         displayTopOfCalls( e )
         raise e
+      rescue => e
+        displayBacktrace( e )
+        raise e
       end
     end
 
@@ -2631,6 +2672,12 @@ module Nendo
         "#/" + sexp.source + "/" + (sexp.casefold? ? "i" : "")
       when LispKeyword
         ":" + sexp.key.to_s
+      when LispCoreSyntax
+        "#<Nendo::LispCoreSyntax>"
+      when LispMacro
+        "#<Nendo::LispMacro>"
+      when LispSyntax
+        "#<Nendo::LispSyntax>"
       when Nil
         "()"
       when nil
@@ -2657,7 +2704,7 @@ module Nendo
     end
 
     def self.version
-      "0.5.2"  ##NENDO-VERSION
+      "0.5.3"  ##NENDO-VERSION
     end
 
     attr_reader :evaluator
@@ -2696,7 +2743,11 @@ module Nendo
     def setOptimizeLevel( level )
       @evaluator.setOptimizeLevel( level )
     end
-  
+
+    def setDisplayErrors( flag )
+      @evaluator.setDisplayErrors( flag )
+    end
+
     def clean_compiled_code
       @evaluator._clean_MIMARKcompiled_MIMARKcode()
     end