sweet-moon 0.0.4 → 0.0.5

data/components/interpreters/51/interpreter.rb

@@ -1,23 +1,24 @@
 require_relative '../../../logic/interpreters/interpreter_51'
 
+require_relative 'function'
 require_relative 'reader'
-require_relative 'writer'
 require_relative 'table'
+require_relative 'writer'
 
 module Component
   module V51
     Interpreter = {
       version: Logic::V51::Interpreter[:version],
+      logic: Logic::V51,
 
       create_state!: ->(api) {
         state = api.luaL_newstate
-        { state: { lua: state, avoid_gc: [] },
+        { state: { lua: state, avoid_gc: [], ruby_error_info: nil },
           error: state ? nil : :MemoryAllocation }
       },
 
       open_standard_libraries!: ->(api, state) {
         api.luaL_openlibs(state[:lua])
-
         { state: state }
       },
 
@@ -41,7 +42,7 @@ module Component
       },
 
       push_value!: ->(api, state, value) {
-        Writer[:push!].(api, state, value)
+        Writer[:push!].(api, state, Component::V51, value)
         { state: state }
       },
 
@@ -59,7 +60,7 @@ module Component
         unless key.nil?
           if api.lua_typename(state[:lua],
                               api.lua_type(state[:lua], -1)).read_string == 'table'
-            Table[:read_field!].(api, state, key, -1)
+            Table[:read_field!].(api, state, Component::V51, key, -1)
           else
             api.lua_pushnil(state[:lua])
           end
@@ -74,7 +75,7 @@ module Component
       },
 
       read_and_pop!: ->(api, state, stack_index = -1, extra_pop: false) {
-        result = Component::V51::Reader[:read!].(api, state, stack_index)
+        result = Reader[:read!].(api, state, Component::V51, stack_index)
 
         api.lua_settop(state[:lua], -2) if result[:pop]
         api.lua_settop(state[:lua], -2) if extra_pop
@@ -83,7 +84,7 @@ module Component
       },
 
       read_all!: ->(api, state) {
-        result = Reader[:read_all!].(api, state)
+        result = Reader[:read_all!].(api, state, Component::V51)
 
         { state: state, output: result }
       },

data/components/interpreters/51/reader.rb

@@ -1,67 +1,7 @@
-require 'ffi'
-
-require_relative 'interpreter'
-require_relative 'function'
-require_relative 'table'
+require_relative '../54/reader'
 
 module Component
   module V51
-    Reader = {
-      read_all!: ->(api, state) {
-        (1..api.lua_gettop(state[:lua])).map do
-          Interpreter[:read_and_pop!].(api, state)[:output]
-        end.reverse
-      },
-
-      read!: ->(api, state, stack_index = -1) {
-        stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
-
-        type = api.lua_typename(state[:lua],
-                                api.lua_type(state[:lua], stack_index)).read_string
-
-        case type
-        when 'string'
-          Reader[:read_string!].(api, state, stack_index)
-        when 'number'
-          Reader[:read_number!].(api, state, stack_index)
-        when 'no value'
-          { value: nil, pop: true, type: type }
-        when 'nil'
-          { value: nil, pop: true }
-        when 'boolean'
-          Reader[:read_boolean!].(api, state, stack_index)
-        when 'table'
-          Table[:read!].(api, state, stack_index)
-        when 'function'
-          Function[:read!].(api, state, stack_index)
-        else
-          # none nil boolean lightuserdata number
-          # string table function userdata thread
-          { value:
-              "#{type}: 0x#{api.lua_topointer(state[:lua], stack_index).address}",
-            type: type, pop: true }
-        end
-      },
-
-      read_string!: ->(api, state, stack_index) {
-        { value: api.lua_tostring(state[:lua], stack_index).read_string,
-          pop: true }
-      },
-
-      read_number!: ->(api, state, stack_index) {
-        if api.respond_to?(:lua_isinteger) &&
-           api.respond_to?(:lua_tointeger) &&
-           api.lua_isinteger(state[:lua], stack_index) == 1
-
-          return { value: api.lua_tointeger(state[:lua], stack_index), pop: true }
-        end
-
-        { value: api.lua_tonumber(state[:lua], stack_index), pop: true }
-      },
-
-      read_boolean!: ->(api, state, stack_index) {
-        { value: api.lua_toboolean(state[:lua], stack_index) == 1, pop: true }
-      }
-    }
+    Reader = Component::V54::Reader
   end
 end

data/components/interpreters/51/table.rb

@@ -1,61 +1,7 @@
-require_relative '../../../logic/tables'
-
-require_relative 'writer'
-require_relative 'reader'
+require_relative '../54/table'
 
 module Component
   module V51
-    Table = {
-      push!: ->(api, state, list, stack_index = -1) {
-        stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
-
-        api.lua_createtable(state[:lua], list.size, 0)
-
-        if list.is_a? Hash
-          list.each_key do |key|
-            Writer[:push!].(api, state, key)
-            Writer[:push!].(api, state, list[key])
-            api.lua_settable(state[:lua], stack_index + 1)
-          end
-        else
-          list.each_with_index do |value, index|
-            Writer[:push!].(api, state, index + 1)
-            Writer[:push!].(api, state, value)
-            api.lua_settable(state[:lua], stack_index + 1)
-          end
-        end
-      },
-
-      read!: ->(api, state, stack_index) {
-        stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
-
-        type = api.lua_typename(state[:lua],
-                                api.lua_type(state[:lua], stack_index)).read_string
-
-        api.lua_pushnil(state[:lua])
-
-        return nil if type != 'table'
-
-        tuples = []
-
-        while api.lua_next(state[:lua], stack_index).positive?
-          value = Reader[:read!].(api, state, stack_index + 2)
-          key = Reader[:read!].(api, state, stack_index + 1)
-          api.lua_settop(state[:lua], -2) if value[:pop]
-
-          tuples << [key[:value], value[:value]]
-
-          break if value[:type] == 'no value' || key[:value].instance_of?(Proc)
-        end
-
-        { value: Logic::Tables[:to_hash_or_array].(tuples), pop: true }
-      },
-
-      read_field!: ->(api, state, expected_key, stack_index) {
-        expected_key = expected_key.to_s if expected_key.is_a? Symbol
-
-        api.lua_getfield(state[:lua], stack_index, expected_key)
-      }
-    }
+    Table = Component::V54::Table
   end
 end

data/components/interpreters/51/writer.rb

@@ -1,45 +1,7 @@
-require_relative 'function'
-require_relative 'table'
+require_relative '../54/writer'
 
 module Component
   module V51
-    Writer = {
-      push!: ->(api, state, value) {
-        case Writer[:_to_lua_type].(value)
-        when 'string'
-          api.lua_pushstring(state[:lua], value.to_s)
-        when 'number'
-          api.lua_pushnumber(state[:lua], value)
-        when 'integer'
-          if api.respond_to? :lua_pushinteger
-            api.lua_pushinteger(state[:lua], value)
-          else
-            api.lua_pushnumber(state[:lua], value)
-          end
-        when 'nil'
-          api.lua_pushnil(state[:lua])
-        when 'boolean'
-          api.lua_pushboolean(state[:lua], value ? 1 : 0)
-        when 'table'
-          Table[:push!].(api, state, value)
-        when 'function'
-          Function[:push!].(api, state, value)
-        else
-          api.lua_pushstring(
-            state[:lua], "#<#{value.class}:0x#{format('%016x', value.object_id)}>"
-          )
-        end
-      },
-
-      _to_lua_type: ->(value) {
-        return 'nil' if value.nil?
-        return 'function' if value.is_a?(Proc)
-        return 'integer' if value.is_a? Integer
-        return 'number' if value.is_a? Float
-        return 'table' if value.is_a?(Hash) || value.is_a?(Array)
-        return 'string' if value.is_a?(String) || value.instance_of?(Symbol)
-        return 'boolean' if [true, false].include? value
-      }
-    }
+    Writer = Component::V54::Writer
   end
 end

data/components/interpreters/54/function.rb

@@ -1,55 +1,111 @@
 require_relative '../../../logic/interpreters/interpreter_54'
 require_relative '../../../dsl/errors'
 
-require_relative 'writer'
+require_relative 'interpreter'
 require_relative 'reader'
+require_relative 'writer'
 
 module Component
   module V54
     Function = {
-      push!: ->(api, state, closure) {
-        handler = ->(current_state) {
-          updated_state = state.merge(lua: current_state)
-          input = Reader[:read_all!].(api, updated_state)
-          result = closure.(*input)
-          Writer[:push!].(api, updated_state, result)
-          return 1
-        }
+      push!: ->(api, state, component, closure) {
+        handler = component::Function[:build_handler!].(
+          api, state, component, closure
+        )
 
         state[:avoid_gc] << handler
 
+        lua_name = "_sweet_moon_ruby_#{handler.object_id}"
+
         api.lua_pushcclosure(state[:lua], handler, 0)
-      },
+        component::Interpreter[:pop_and_set_as!].(api, state, lua_name)
 
-      read!: ->(api, state, _stack_index) {
-        reference = api.luaL_ref(
-          state[:lua], Logic::V54::Interpreter[:LUA_REGISTRYINDEX]
+        result = component::Interpreter[:push_chunk!].(
+          api, state, component::LUA_HANDLER.sub('_ruby', lua_name)
         )
 
+        unless result[:error].nil?
+          raise SweetMoon::Errors::SweetMoonErrorHelper.for(
+            result[:error][:status]
+          ), result[:error][:value]
+        end
+
+        component::Interpreter[:call!].(api, state, 0, 1)
+      },
+
+      build_handler!: ->(api, state, component, closure) {
+        ->(current_state) {
+          updated_state = state.merge(lua: current_state)
+          input = component::Reader[:read_all!].(api, updated_state, component)
+          begin
+            result = closure.(*input)
+            component::Writer[:push!].(
+              api, updated_state, component, { error: nil, output: result }
+            )
+          rescue Exception => e
+            state[:ruby_error_info] = e
+            component::Writer[:push!].(
+              api, updated_state, component, {
+                error: true, output: "#{e.class}: #{e.message}"
+              }
+            )
+          end
+          return 1
+        }
+      },
+
+      read!: ->(api, state, component, _stack_index) {
+        lua_registry_index = component::Interpreter[:logic]::Interpreter[
+          :LUA_REGISTRYINDEX
+        ]
+
+        reference = api.luaL_ref(state[:lua], lua_registry_index)
+
         { value: ->(input = [], output = 1) {
-          api.lua_rawgeti(
-            state[:lua], Logic::V54::Interpreter[:LUA_REGISTRYINDEX], reference
-          )
+          api.lua_rawgeti(state[:lua], lua_registry_index, reference)
 
           input.each do |value|
-            Writer[:push!].(api, state, value)
+            component::Writer[:push!].(api, state, component, value)
           end
 
-          result = Interpreter[:call!].(api, state, input.size, output)
+          result = component::Interpreter[:call!].(api, state, input.size, output)
 
-          if result[:error]
-            raise SweetMoon::Errors::SweetMoonErrorHelper.for(
-              result[:error][:status]
-            ), result[:error][:value]
-          end
+          component::Function[:raise_error!].(state, result) if result[:error]
 
-          result = Reader[:read_all!].(api, state)
+          result = component::Reader[:read_all!].(api, state, component)
 
           return result.first if output == 1
 
           result
         }, pop: false }
+      },
+
+      raise_error!: ->(state, result) {
+        if state[:ruby_error_info].nil?
+          raise SweetMoon::Errors::SweetMoonErrorHelper.for(
+            result[:error][:status]
+          ), result[:error][:value]
+        else
+          ruby_error = state[:ruby_error_info]
+          state[:ruby_error_info] = nil
+
+          raise SweetMoon::Errors::SweetMoonErrorHelper.merge_traceback!(
+            ruby_error, result[:error][:value]
+          )
+        end
       }
     }
+
+    LUA_HANDLER = <<LUA
+    return function (...)
+      result = _ruby(...)
+
+      if result['error'] then
+        error(result['output'] .. ' ' .. debug.traceback())
+      else
+        return result['output']
+      end
+    end
+LUA
   end
 end

data/components/interpreters/54/interpreter.rb

@@ -1,17 +1,19 @@
 require_relative '../../../logic/interpreters/interpreter_54'
 
+require_relative 'function'
 require_relative 'reader'
-require_relative 'writer'
 require_relative 'table'
+require_relative 'writer'
 
 module Component
   module V54
     Interpreter = {
       version: Logic::V54::Interpreter[:version],
+      logic: Logic::V54,
 
       create_state!: ->(api) {
         state = api.luaL_newstate
-        { state: { lua: state, avoid_gc: [] },
+        { state: { lua: state, avoid_gc: [], ruby_error_info: nil },
           error: state ? nil : :MemoryAllocation }
       },
 
@@ -40,7 +42,7 @@ module Component
       },
 
       push_value!: ->(api, state, value) {
-        Writer[:push!].(api, state, value)
+        Writer[:push!].(api, state, Component::V54, value)
         { state: state }
       },
 
@@ -55,7 +57,7 @@ module Component
         unless key.nil?
           if api.lua_typename(state[:lua],
                               api.lua_type(state[:lua], -1)).read_string == 'table'
-            Table[:read_field!].(api, state, key, -1)
+            Table[:read_field!].(api, state, Component::V54, key, -1)
           else
             api.lua_pushnil(state[:lua])
           end
@@ -70,7 +72,8 @@ module Component
       },
 
       read_and_pop!: ->(api, state, stack_index = -1, extra_pop: false) {
-        result = Component::V54::Reader[:read!].(api, state, stack_index)
+        result = Component::V54::Reader[:read!].(api, state, Component::V54,
+                                                 stack_index)
 
         api.lua_settop(state[:lua], -2) if result[:pop]
         api.lua_settop(state[:lua], -2) if extra_pop
@@ -79,7 +82,7 @@ module Component
       },
 
       read_all!: ->(api, state) {
-        result = Reader[:read_all!].(api, state)
+        result = Reader[:read_all!].(api, state, Component::V54)
 
         { state: state, output: result }
       },

data/components/interpreters/54/reader.rb

@@ -7,33 +7,34 @@ require_relative 'table'
 module Component
   module V54
     Reader = {
-      read_all!: ->(api, state) {
+      read_all!: ->(api, state, component) {
         (1..api.lua_gettop(state[:lua])).map do
-          Interpreter[:read_and_pop!].(api, state)[:output]
+          component::Interpreter[:read_and_pop!].(api, state)[:output]
         end.reverse
       },
 
-      read!: ->(api, state, stack_index = -1) {
+      read!: ->(api, state, component, stack_index = -1) {
         stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
 
-        type = api.lua_typename(state[:lua],
-                                api.lua_type(state[:lua], stack_index)).read_string
+        type = api.lua_typename(
+          state[:lua], api.lua_type(state[:lua], stack_index)
+        ).read_string
 
         case type
         when 'string'
-          Reader[:read_string!].(api, state, stack_index)
+          component::Reader[:read_string!].(api, state, stack_index)
         when 'number'
-          Reader[:read_number!].(api, state, stack_index)
+          component::Reader[:read_number!].(api, state, stack_index)
         when 'no value'
           { value: nil, pop: true, type: type }
         when 'nil'
           { value: nil, pop: true }
         when 'boolean'
-          Reader[:read_boolean!].(api, state, stack_index)
+          component::Reader[:read_boolean!].(api, state, stack_index)
         when 'table'
-          Table[:read!].(api, state, stack_index)
+          component::Table[:read!].(api, state, component, stack_index)
         when 'function'
-          Function[:read!].(api, state, stack_index)
+          component::Function[:read!].(api, state, component, stack_index)
         else
           # none nil boolean lightuserdata number
           # string table function userdata thread

data/components/interpreters/54/table.rb

@@ -6,31 +6,36 @@ require_relative 'reader'
 module Component
   module V54
     Table = {
-      push!: ->(api, state, list, stack_index = -1) {
+      create_table!: ->(api, state, list) {
+        api.lua_createtable(state[:lua], list.size, 0)
+      },
+
+      push!: ->(api, state, component, list, stack_index = -1) {
         stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
 
-        api.lua_createtable(state[:lua], list.size, 0)
+        component::Table[:create_table!].(api, state, list)
 
         if list.is_a? Hash
           list.each_key do |key|
-            Writer[:push!].(api, state, key)
-            Writer[:push!].(api, state, list[key])
+            component::Writer[:push!].(api, state, component, key)
+            component::Writer[:push!].(api, state, component, list[key])
             api.lua_settable(state[:lua], stack_index + 1)
           end
         else
           list.each_with_index do |value, index|
-            Writer[:push!].(api, state, index + 1)
-            Writer[:push!].(api, state, value)
+            component::Writer[:push!].(api, state, component, index + 1)
+            component::Writer[:push!].(api, state, component, value)
             api.lua_settable(state[:lua], stack_index + 1)
           end
         end
       },
 
-      read!: ->(api, state, stack_index) {
+      read!: ->(api, state, component, stack_index) {
         stack_index = api.lua_gettop(state[:lua]) if stack_index == -1
 
-        type = api.lua_typename(state[:lua],
-                                api.lua_type(state[:lua], stack_index)).read_string
+        type = api.lua_typename(
+          state[:lua], api.lua_type(state[:lua], stack_index)
+        ).read_string
 
         api.lua_pushnil(state[:lua])
 
@@ -39,8 +44,8 @@ module Component
         tuples = []
 
         while api.lua_next(state[:lua], stack_index).positive?
-          value = Reader[:read!].(api, state, stack_index + 2)
-          key = Reader[:read!].(api, state, stack_index + 1)
+          value = component::Reader[:read!].(api, state, component, stack_index + 2)
+          key = component::Reader[:read!].(api, state, component, stack_index + 1)
           api.lua_settop(state[:lua], -2) if value[:pop]
 
           tuples << [key[:value], value[:value]]
@@ -51,7 +56,7 @@ module Component
         { value: Logic::Tables[:to_hash_or_array].(tuples), pop: true }
       },
 
-      read_field!: ->(api, state, expected_key, stack_index) {
+      read_field!: ->(api, state, _component, expected_key, stack_index) {
         expected_key = expected_key.to_s if expected_key.is_a? Symbol
 
         api.lua_getfield(state[:lua], stack_index, expected_key)

data/components/interpreters/54/writer.rb

@@ -4,8 +4,8 @@ require_relative 'table'
 module Component
   module V54
     Writer = {
-      push!: ->(api, state, value) {
-        case Writer[:_to_lua_type].(value)
+      push!: ->(api, state, component, value) {
+        case component::Writer[:_to_lua_type].(value)
         when 'string'
           api.lua_pushstring(state[:lua], value.to_s)
         when 'number'
@@ -21,9 +21,9 @@ module Component
         when 'boolean'
           api.lua_pushboolean(state[:lua], value ? 1 : 0)
         when 'table'
-          Table[:push!].(api, state, value)
+          component::Table[:push!].(api, state, component, value)
         when 'function'
-          Function[:push!].(api, state, value)
+          component::Function[:push!].(api, state, component, value)
         else
           api.lua_pushstring(
             state[:lua], "#<#{value.class}:0x#{format('%016x', value.object_id)}>"

data/config/tests.sample.yml

@@ -1,6 +1,6 @@
 # Available at https://github.com/gbaptista/sweet-moon-test
 
-fennel-dev: '/home/me/sweet-moon-test/fennel-dev.lua'
+fennel-dev: '/home/me/sweet-moon-test/fennel/dev/?.lua'
 
 luarocks:
   path:
@@ -12,32 +12,32 @@ luarocks:
 jit:2.0.5:
   description: 'Lua Jit 2.0.5 + Fennel 1.0.0'
   shared_object: /home/me/sweet-moon-test/libluajit.so.2.0.5
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.4.4:
   description: 'Lua 5.4.4 + Fennel 1.0.0'
   shared_object: /home/me/sweet-moon-test/liblua.so.5.4.4
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.4.2:
   description: 'Lua 5.4.2 + Fennel 1.0.0'
   shared_object: /home/me/sweet-moon-test/liblua.so.5.4.2
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.3.3:
   description: 'Lua 5.3.3'
   shared_object: /home/me/sweet-moon-test/liblua.so.5.3.3
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.2.4:
   description: 'Lua 5.2.4'
   shared_object: /home/me/sweet-moon-test/liblua.so.5.2.4
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.1.5:
   description: 'Lua 5.1.5'
   shared_object: /home/me/sweet-moon-test/liblua.so.5.1.5
-  fennel: /home/me/sweet-moon-test/fennel-100.lua
+  fennel: /home/me/sweet-moon-test/fennel/100/?.lua
 
 5.0.3:
   description: 'Lua 5.0.3'

data/controllers/state.rb

@@ -87,10 +87,20 @@ module Controller
     },
 
     _check!: ->(result) {
+      ruby_error = result[:state] && result[:state][:ruby_error_info]
+
+      result[:state][:ruby_error_info] = nil if ruby_error
+
       if result[:error]
-        raise SweetMoon::Errors::SweetMoonErrorHelper.for(
-          result[:error][:status]
-        ), result[:error][:value]
+        if ruby_error
+          raise SweetMoon::Errors::SweetMoonErrorHelper.merge_traceback!(
+            ruby_error, result[:error][:value]
+          )
+        else
+          raise SweetMoon::Errors::SweetMoonErrorHelper.for(
+            result[:error][:status]
+          ), result[:error][:value]
+        end
       end
 
       result

data/dsl/errors.rb

@@ -10,6 +10,14 @@ module SweetMoon
     class LuaFileError < LuaError; end
 
     module SweetMoonErrorHelper
+      def merge_traceback!(ruby_error, lua_traceback)
+        ruby_error.set_backtrace(
+          ruby_error.backtrace.concat(lua_traceback.split("\n"))
+        )
+
+        ruby_error
+      end
+
       def for(status)
         case status
         when :runtime           then LuaRuntimeError
@@ -22,7 +30,7 @@ module SweetMoon
         end
       end
 
-      module_function :for
+      module_function :for, :merge_traceback!
     end
   end
 end

data/dsl/fennel.rb

@@ -11,8 +11,7 @@ module DSL
         'table.insert(package.loaders or package.searchers, fennel.searcher)'
       )
 
-      # TODO: Makes sense?
-      # debug.traceback = fennel.traceback
+      @state.eval('debug.traceback = fennel.traceback')
 
       @eval = @state.get(:fennel, :eval)
       @dofile = @state.get(:fennel, :dofile)