nendo 0.6.5 → 0.6.6

data/lib/nendo/ruby/evaluator.rb

@@ -41,6 +41,8 @@ module Nendo
     EXEC_TYPE_ANONYMOUS = 2
     EXEC_TYPE_TAILCALL  = 3
 
+    attr_accessor :runtimeCheck
+
     def initialize( core, debug = false )
       @core    = core
       @indent  = "  "
@@ -50,8 +52,9 @@ module Nendo
       @lexicalVars = []
       @syntaxHash = {}
       @optimize_level = 2
-      @backtrace = {}
-      @backtrace_counter = 1;
+      @runtimeCheck = true
+      @backtrace = []
+      @backtrace_last = ""
       @displayErrorsFlag = true;
       @char_table_lisp_to_ruby = {
         # list     (! $ % & * + - . / : < = > ? @ ^ _ ~ ...)
@@ -340,14 +343,25 @@ module Nendo
     end
 
     def embedBacktraceInfo( sourcefile, lineno )
-      @backtrace[ sprintf( "%s:%s", sourcefile, lineno ) ] = @backtrace_counter
-      @backtrace_counter += 1
+      str = sourcefile + ":" + lineno.to_s
+      if @backtrace_last != str
+        @backtrace << str
+        if ( 10 < @backtrace.size )
+          @backtrace.shift
+        end
+        #p @backtrace
+      end
+      @backtrace_last = str
     end
 
     def generateEmbedBacktraceInfo( sourcefile, lineno, arr )
       if sourcefile and lineno
         [ "begin",
-          [ sprintf( 'embedBacktraceInfo( "%s", %s ); ', sourcefile, lineno ), arr ],
+          if @runtimeCheck
+            [ sprintf( 'embedBacktraceInfo( "%s", %s ); ', sourcefile, lineno ), arr ]
+          else
+            [arr]
+          end,
           "end"
         ]
       else
@@ -689,15 +703,23 @@ module Nendo
                    end
       if global_cap
         ["begin",
-         [sprintf( "if @global_lisp_binding.has_key?('%s') then", variable_sym ),
-          expression,
-          sprintf( 'else raise NameError.new( "Error: undefined variable %s", "%s" ) end', variable_sym, variable_sym ),
-          sprintf( 'rescue => __e ; __e.set_backtrace( ["%s:%d"] + __e.backtrace ) ; raise __e',  sourcefile, lineno  )],
+         if @runtimeCheck
+           [sprintf( "if @global_lisp_binding.has_key?('%s') then", variable_sym ),
+            expression,
+            sprintf( 'else raise NameError.new( "Error: undefined variable %s", "%s" ) end', variable_sym, variable_sym ),
+            sprintf( 'rescue => __e ; __e.set_backtrace( ["%s:%d"] + __e.backtrace ) ; raise __e',  sourcefile, lineno  )]
+         else
+           [expression]
+         end,
          "end"]
       else
         ["begin",
-         [expression,
-          sprintf( 'rescue => __e ; __e.set_backtrace( ["%s:%d"] + __e.backtrace ) ; raise __e', sourcefile, lineno )],
+         if @runtimeCheck         
+           [expression,
+            sprintf( 'rescue => __e ; __e.set_backtrace( ["%s:%d"] + __e.backtrace ) ; raise __e', sourcefile, lineno )]
+         else
+           [expression]
+         end,
          "end"]
       end
     end
@@ -1073,9 +1095,8 @@ module Nendo
     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] )
+        @backtrace.reverse.each { |x|
+          STDERR.printf( "        from %s \n", x )
         }
         STDERR.puts( "          ...\n\n" )
       end