eleetscript 0.0.24 → 0.0.30

data/lib/lang/runtime/class.rb

@@ -31,16 +31,7 @@ module EleetScript
 
     def call(method_name, arguments = [])
       method = lookup(method_name.to_s)
-      if method
-        if method.arity == 3
-          method.call(self, arguments, @context)
-        else
-          method.call(self, arguments)
-        end
-      else
-        es_method_name = @context['String'].new_with_value(method_name.to_s, @context.namespace_context)
-        call(NO_METHOD, arguments.dup.unshift(es_method_name))
-      end
+      call_method(method_name, method, arguments)
     end
 
     def lookup(method_name)
@@ -60,6 +51,22 @@ module EleetScript
       method
     end
 
+    def super_call(method_name, arguments = [])
+      if super_class == self
+        @context['Errors'].call(
+          :<,
+          @context['String'].new_with_value(
+            "Cannot call super implmentation for #{method_name} if there is no super class",
+            @context
+          )
+        )
+        @context['nil']
+      else
+        method = super_class.lookup(method_name)
+        call_method(method_name, method, arguments)
+      end
+    end
+
     def super_class
       @super_class || @context['Object']
     end
@@ -106,6 +113,19 @@ module EleetScript
 
     private
 
+    def call_method(method_name, method, arguments)
+      if method
+        if method.arity == 3
+          method.call(self, arguments, @context)
+        else
+          method.call(self, arguments)
+        end
+      else
+        es_method_name = @context['String'].new_with_value(method_name.to_s, @context.namespace_context)
+        call(NO_METHOD, arguments.dup.unshift(es_method_name))
+      end
+    end
+
     def has_super_class?
       @super_class || (@super_class.nil? && name != 'Object')
     end

data/lib/lang/runtime/class_instance.rb

@@ -20,15 +20,22 @@ module EleetScript
 
     def call(method_name, arguments = [])
       method = find_method(method_name)
-      if method
-        if method.arity == 3
-          method.call(self, arguments, @context)
-        else
-          method.call(self, arguments)
-        end
+      call_method(method_name, method, arguments)
+    end
+
+    def super_call(method_name, arguments = [])
+      kls = @runtime_class
+      super_kls = kls.super_class
+      if kls == super_kls
+        str = @context['String'].new_with_value(
+          "Cannot call super implementation for #{method_name} without a super class",
+          @context
+        )
+        @context['Errors'].call(:<, str)
+        @context['nil']
       else
-        es_method_name = @context["String"].new_with_value(method_name.to_s, @context.namespace_context)
-        call(NO_METHOD, arguments.dup.unshift(es_method_name))
+        method = super_kls.instance_lookup(method_name)
+        call_method(method_name, method, arguments)
       end
     end
 
@@ -64,5 +71,20 @@ module EleetScript
     def class_name
       @runtime_class.name
     end
+
+    private
+
+    def call_method(method_name, method, arguments)
+      if method
+        if method.arity == 3
+          method.call(self, arguments, @context)
+        else
+          method.call(self, arguments)
+        end
+      else
+        es_method_name = @context["String"].new_with_value(method_name.to_s, @context.namespace_context)
+        call(NO_METHOD, arguments.dup.unshift(es_method_name))
+      end
+    end
   end
 end

data/lib/lang/runtime/context.rb

@@ -232,10 +232,10 @@ module EleetScript
       ctx
     end
 
-    def new_method_context(lambda_context = nil)
-      ctx = MethodContext.new(current_self, current_class, lambda_context)
-      ctx.parent_context = self
-      ctx
+    def new_method_context(name, lambda_context = nil)
+      MethodContext.new(current_self, current_class, name, lambda_context).tap do |ctx|
+        ctx.parent_context = self
+      end
     end
   end
 
@@ -264,10 +264,10 @@ module EleetScript
       ns_context
     end
 
-    def new_method_context(lambda_context = nil)
-      ctx = MethodContext.new(current_self, current_class, lambda_context)
-      ctx.parent_context = self
-      ctx
+    def new_method_context(name, lambda_context = nil)
+      MethodContext.new(current_self, current_class, name, lambda_context).tap do |ctx|
+        ctx.parent_context = self
+      end
     end
 
     private
@@ -278,11 +278,13 @@ module EleetScript
   end
 
   class MethodContext < BaseContext
-    init_with :handle_lambda_context
+    attr_reader :name
+
+    init_with :init_method_context
 
     def local_var(name, value = nil)
       if value
-        if @lambda_context && (val = @lambda_context.local_var(name))
+        if @lambda_context && @lambda_context.local_var(name)
           @lambda_context.local_var(name, value)
         else
           local_vars[name] = value
@@ -303,10 +305,15 @@ module EleetScript
       @parent_context.namespace_context
     end
 
+    def lambda?
+      !@lambda_context.nil?
+    end
+
     private
 
-    def handle_lambda_context(lambda_context)
+    def init_method_context(name, lambda_context)
+      @name = name
       @lambda_context = lambda_context
     end
   end
-end
+end

data/lib/lang/runtime/method.rb

@@ -1,26 +1,29 @@
+# frozen_string_literal: false
+
 module EleetScript
   class EleetScriptMethod
-    def initialize(params, body, lambda_context = nil)
+    def initialize(name, params, body, lambda_context = nil)
+      @name = name
       @params = params
       @body = body
       @lambda_context = lambda_context
     end
 
     def call(receiver, arguments, parent_context)
-      context = parent_context.new_method_context(@lambda_context)
+      context = parent_context.new_method_context(@name, @lambda_context)
 
-      context["lambda?"] = context["false"]
+      context['lambda?'] = context['false']
       @params.each_with_index do |param, index|
         arg = arguments[index]
         next unless arg
         context[param] = arg
       end
-      if arguments.length > 0 && arguments.last.is_a?("Lambda")
-        context["lambda?"] = context["true"]
-        context["lambda"] = arguments.last
+      if arguments.length > 0 && arguments.last.is_a?('Lambda')
+        context['lambda?'] = context['true']
+        context['lambda'] = arguments.last
       end
 
-      context["arguments"] = context["List"].call(:new, arguments)
+      context['arguments'] = context['List'].call(:new, arguments)
 
       @body.eval(context)
     end
@@ -29,4 +32,4 @@ module EleetScript
       3
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eleetscript
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.30
 platform: ruby
 authors:
 - Brandon Buck