eleetscript 0.0.3a → 0.0.4a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b389376d6b760755d71c21358f5f83ddd6d1df68
-  data.tar.gz: 237dbdbc6e4c7d828533854c89c5e6bf0b70e950
+  metadata.gz: 3cb1ebbd98b6434ccb190f60658378512af2518c
+  data.tar.gz: fef85a1f7e2f7d3ec4b981efff27d35ce24d0f1e
 SHA512:
-  metadata.gz: 50c4993924720018db462009faa0e377a8bbfac7578a8507d5b9cead320f1be75856362692eb18c90a8fe377a6f84a5ecd5bbd0f693180e8b9bd625808ce5faa
-  data.tar.gz: 80045fa7aebe6fc5bc389e08891549b47a4cc16aeeff652b932877d616d15fc27ff7f344914aefcee3f9fdf066caaf15dd4a6d349efcddc71718cf2a14f7c173
+  metadata.gz: 471e214d21923f796f4c002564eb84f2bfcefead0c2ad66f471a546262bee9e070efb4cd71a8e4b96c126d47818daceeb7dce511e25245ec1c5271a2e3f7abeb
+  data.tar.gz: 020541f88cd22b0d6fded353b322aa26e298a2a56b7c2683a3b43b075fa0e0bd09e0deabef92890307c2085a429da8a34ea4cb86d285a6da95ecb05335962735

data/lib/engine/eleet_to_ruby_wrapper.rb

@@ -5,21 +5,26 @@ module EleetScript
       @engine = engine
     end
 
-    def call(method, *args)
+    def call(method, *args, &block)
       eleet_args = args.map { |a| Values.to_eleet_value(a, @engine) }
+      eleet_args << Values.to_eleet_value(block, @engine) if block_given?
       Values.to_ruby_value(@eleet_obj.call(method, eleet_args), @engine)
     end
 
-    def method_missing(name, *args)
+    def method_missing(name, *args, &block)
       if args && args.length > 0
-        call(name, *args)
+        call(name, *args, &block)
       else
-        call(name)
+        call(name, &block)
       end
     end
 
     def raw
       @eleet_obj
     end
+
+    def to_s
+      Values.to_ruby_value(@eleet_obj.call(:to_string), @engine)
+    end
   end
 end

data/lib/engine/engine.rb

@@ -3,6 +3,9 @@ require "lang/interpreter"
 require "engine/values"
 
 module EleetScript
+  class CannotCallInstanceOrClassMethodsExcpetion < Exception
+  end
+
   class Engine
     def initialize
       @memory = Memory.new
@@ -10,12 +13,29 @@ module EleetScript
     end
 
     def execute(code)
-      to_ruby_value(@interpreter.eval(code))
+      begin
+        to_ruby_value(@interpreter.eval(code))
+        true
+      rescue Exception => e
+        false
+      end
     end
 
-    def call(method, *args)
-      # TODO: Finish
-      to_ruby_value(@interpreter.eval("#{method.to_s}"))
+    def call(method_name, *args)
+      method_name = method_name.to_s
+      if method_name =~ /\./
+        throw CannotCallInstanceOrClassMethodsException.new("You cannot call a class or instance method using EleetScript::Engine.call")
+      end
+      nesting = method_name.split("::")
+      ns = @memory.root_namespace
+      method_name = nesting.pop
+      nesting.each do |new_ns|
+        ns = ns.namespace(new_ns)
+      end
+      eleet_args = args.each do |arg|
+        to_eleet_value(arg, self)
+      end
+      to_ruby_value(ns.current_self.call(method_name, eleet_args))
     end
 
     def get(var, raw = false)

data/lib/engine/esproc.rb

@@ -0,0 +1,17 @@
+module EleetScript
+  class ESProc
+    attr_accessor :proc
+
+    def initialize(proc, engine)
+      @proc = proc
+      @engine = engine
+    end
+
+    def call(receiver, args, context)
+      ruby_args = args.map do |arg|
+        Values.to_ruby_value(arg, @engine)
+      end
+      Values.to_eleet_value(proc.call(*ruby_args), @engine)
+    end
+  end
+end

data/lib/engine/ruby_lambda.rb

@@ -0,0 +1,5 @@
+module EleetScript
+  class RubyLambda < Proc
+    attr_accessor :es_lambda
+  end
+end

data/lib/engine/ruby_to_eleet_wrapper.rb

@@ -6,7 +6,9 @@ module EleetScript
     end
 
     def call(method_name, args)
-      binding.pry
+      if method_name.to_sym == :to_string
+        method_name = :to_s
+      end
       ruby_args = args.map { |arg| Values.to_ruby_value(arg, @engine) }
       if @ruby_obj.respond_to?(method_name)
         Values.to_eleet_value(@ruby_obj.send(method_name, *ruby_args), @engine)

data/lib/engine/values.rb

@@ -1,6 +1,8 @@
 require "bigdecimal"
 require "engine/eleet_to_ruby_wrapper"
 require "engine/ruby_to_eleet_wrapper"
+require "engine/esproc"
+require "engine/ruby_lambda"
 
 module EleetScript
   module Values
@@ -21,14 +23,10 @@ module EleetScript
           memory.root_namespace["Float"].new_with_value(ruby_obj)
         elsif ruby_obj.kind_of?(BigDecimal)
           memory.root_namespace["Integer"].new_with_value(ruby_obj.to_i)
-        elsif ruby_obj.kind_of?(Array)
-          eleet_arr = ruby_obj.map { |v| to_eleet_value(v, memory) }
-          memory.root_namespace["List"].new_with_value(eleet_arr)
-        elsif ruby_obj.kind_of?(Hash)
-          eleet_arr = ruby_obj.map do |k, v|
-            memory.root_namespace["Pair"].call(:new, to_eleet_value(k, memory), to_eleet_value(v, memory))
-          end
-          memory.root_namespace["List"].new_with_value(eleet_arr)
+        elsif ruby_obj.kind_of?(Proc)
+          memory.root_namespace["Lambda"].new_with_value(ESProc.new(ruby_obj, engine))
+        elsif ruby_obj.kind_of?(RubyLambda)
+          ruby_obj.es_lambda
         elsif ruby_obj.nil?
           memory.root_namespace["nil"]
         elsif ruby_obj == true
@@ -44,6 +42,19 @@ module EleetScript
         ruby_values = ["TrueClass", "FalseClass", "NilClass", "String", "Integer", "Float"]
         if eleet_obj.kind_of?(RubyToEleetWrapper)
           eleet_obj.instance_variable_get("@ruby_obj")
+        elsif eleet_obj.class_name == "Lambda"
+          if eleet_obj.ruby_value.is_a?(ESProc)
+            eleet_obj.ruby_value.proc
+          else
+            proc = RubyLambda.new do |*args|
+              eleet_args = args.map do |arg|
+                to_eleet_value(arg, engine)
+              end
+              to_ruby_value(eleet_obj.call(:call, eleet_args), engine)
+            end
+            proc.es_lambda = eleet_obj
+            proc
+          end
         elsif ruby_values.include?(eleet_obj.class_name)
           eleet_obj.ruby_value
         else

data/lib/lang/interpreter.rb

@@ -274,7 +274,11 @@ module EleetScript
   class DefMethodNode
     def eval(context)
       method_obj = EleetScriptMethod.new(method.params, method.body)
-      context.current_class.methods[method_name] = method_obj
+      if context.is_a?(ClassContext)
+        context.current_class.methods[method_name] = method_obj
+      else
+        context.current_self.methods[method_name] = method_obj
+      end
       context.es_nil
     end
   end
@@ -373,13 +377,11 @@ module EleetScript
   class NamespaceNode
     def eval(context)
       ns_ctx = context.namespace(name)
-      if ns_ctx
-        body.eval(ns_ctx)
-      else
+      unless ns_ctx
         ns_ctx = context.new_namespace_context
         context.add_namespace(name, ns_ctx)
-        body.eval(ns_ctx)
       end
+      body.eval(ns_ctx)
     end
   end
 

data/lib/lang/runtime/class_instance.rb

@@ -1,9 +1,10 @@
 module EleetScript
   class EleetScriptClassInstance < EleetScriptClassSkeleton
-    attr_accessor :instance_vars, :runtime_class, :context
+    attr_accessor :instance_vars, :runtime_class, :context, :methods
     set_is_instance
 
     def initialize(class_context, runtime_class)
+      @methods = MethodHash.new
       @instance_vars = ProcessedKeyHash.new
       @instance_vars.set_key_preprocessor do |key|
         key[0] == "@" ? key[1..-1] : key
@@ -15,7 +16,10 @@ module EleetScript
 
     def call(method_name, arguments = [])
       # puts "Calling #{method_name} on #{self}"
-      method = @runtime_class.instance_lookup(method_name.to_s)
+      method = @methods[method_name]
+      if method.nil?
+        method = @runtime_class.instance_lookup(method_name.to_s)
+      end
       if method
         if method.arity == 3
           method.call(self, arguments, @context)

data/lib/lang/runtime/context.rb

@@ -174,7 +174,9 @@ module EleetScript
     end
 
     def new_namespace_context
-      ctx = NamespaceContext.new(@current_self, @current_class, @root_ns)
+      current_self = @root_ns["Object"].new
+      current_class = current_self.runtime_class
+      ctx = NamespaceContext.new(current_self, current_class, @root_ns)
       ctx.parent_context = self
       ctx
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eleetscript
 version: !ruby/object:Gem::Version
-  version: 0.0.3a
+  version: 0.0.4a
 platform: ruby
 authors:
 - Brandon Buck
@@ -20,6 +20,8 @@ files:
 - lib/eleetscript.rb
 - lib/engine/eleet_to_ruby_wrapper.rb
 - lib/engine/engine.rb
+- lib/engine/esproc.rb
+- lib/engine/ruby_lambda.rb
 - lib/engine/ruby_to_eleet_wrapper.rb
 - lib/engine/values.rb
 - lib/lang/grammar.y