eleetscript 0.0.13a → 0.0.14a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc5d2a285f1c5be7ca29e652a4b778e75d10182
-  data.tar.gz: c49384478e2b92eea802bcb91ea7d57bae711f5d
+  metadata.gz: 1e9923530119b0319ffa8ce45c74d8554dac83ec
+  data.tar.gz: a14bb0f0eb2f815c72d49b82526919b2e14ece5a
 SHA512:
-  metadata.gz: 50925211b0865177514393bc13a642098177c2495cb432497c6c6d3387a6c38b0d3b61d004df9868ce476c32876c0c2d8edae84925770b55e1d6413b964bf9f4
-  data.tar.gz: 785b7bffb8338e1eceede4b9f283202adffee20a3239f48d26be4d35a00dfb07b34b6f24e39127cebf06e993914fb65c9b8e38d8bb36dcaf8662d27a157f02b0
+  metadata.gz: 39efb36e6897c54457071dfb89779d247c34c7eee6c0926fc1d91bc9d25df6b691e57e48f91836fd9e9423d68f589f14c8b4f71eead668e5faa6d23581e47d71
+  data.tar.gz: 2dda61db2fe4268ecd9a8f58d668e3a7e44d9464cdf0b2607547e4ada1b9516fafe32e453d2fcf167d8546eab2dd6f3822ed11183af10e34b8c9754fd35e5fcf

data/lib/engine/engine.rb

@@ -54,7 +54,7 @@ module EleetScript
       load
       var, ns = unnest(name)
       if var[0] =~ /[A-Z]/ && ns.constants.has_key?(var)
-        memory.root_namespace["Errors"].call("<", [memory.root_namespace["String"].new_with_value("Cannot reassign constant via the Engine.")])
+        memory.root_namespace["Errors"].call("<", [memory.root_namespace["String"].new_with_value("Cannot reassign constant via the Engine.", memory.root_namespace)])
         return false
       else
         ns[var] = to_eleet_value(value)

data/lib/engine/values.rb

@@ -16,23 +16,23 @@ module EleetScript
         if ruby_obj.kind_of?(EleetToRubyWrapper)
           ruby_obj.instance_variable_get("@eleet_obj")
         elsif ruby_obj.kind_of?(String)
-          memory.root_namespace["String"].new_with_value(ruby_obj)
+          memory.root_namespace["String"].new_with_value(ruby_obj, memory.root_namespace)
         elsif ruby_obj.kind_of?(Symbol)
-          memory.root_namespace["Symbol"].new_with_value(ruby_obj)
+          memory.root_namespace["Symbol"].new_with_value(ruby_obj, memory.root_namespace)
         elsif ruby_obj.kind_of?(Fixnum)
-          memory.root_namespace["Integer"].new_with_value(ruby_obj)
+          memory.root_namespace["Integer"].new_with_value(ruby_obj, memory.root_namespace)
         elsif ruby_obj.kind_of?(Float)
-          memory.root_namespace["Float"].new_with_value(ruby_obj)
+          memory.root_namespace["Float"].new_with_value(ruby_obj, memory.root_namespace)
         elsif ruby_obj.kind_of?(BigDecimal)
-          memory.root_namespace["Integer"].new_with_value(ruby_obj.to_i)
+          memory.root_namespace["Integer"].new_with_value(ruby_obj.to_i, memory.root_namespace)
         elsif ruby_obj.kind_of?(Proc)
-          memory.root_namespace["Lambda"].new_with_value(ESProc.new(ruby_obj, engine))
+          memory.root_namespace["Lambda"].new_with_value(ESProc.new(ruby_obj, engine), memory.root_namespace)
         elsif ruby_obj.kind_of?(RubyLambda)
           ruby_obj.es_lambda
         elsif ruby_obj.kind_of?(Regexp)
-          memory.root_namespace["Regex"].new_with_value(ESRegex.from_regex(ruby_obj))
+          memory.root_namespace["Regex"].new_with_value(ESRegex.from_regex(ruby_obj), memory.root_namespace)
         elsif ruby_obj.kind_of?(ESRegex)
-          memory.root_namespace["Regex"].new_with_value(ruby_obj)
+          memory.root_namespace["Regex"].new_with_value(ruby_obj, memory.root_namespace)
         elsif ruby_obj.nil?
           memory.root_namespace["nil"]
         elsif ruby_obj == true

data/lib/lang/interpreter.rb

@@ -30,7 +30,7 @@ module EleetScript
 
   module Helpers
     def self.throw_eleet_error(context, error)
-      context.root_ns["Errors"].call("<", [context.root_ns["String"].new_with_value(error)])
+      context.root_ns["Errors"].call("<", [context.root_ns["String"].new_with_value(error, context.namespace_context)])
     end
   end
 
@@ -124,13 +124,13 @@ module EleetScript
     include Interpolatable
 
     def eval(context)
-      context.root_ns["String"].new_with_value(interpolate(value, context))
+      context.root_ns["String"].new_with_value(interpolate(value, context), context.namespace_context)
     end
   end
 
   class SymbolNode
     def eval(context)
-      context.root_ns["Symbol"].new_with_value(value)
+      context.root_ns["Symbol"].new_with_value(value, context.namespace_context)
     end
   end
 
@@ -139,19 +139,19 @@ module EleetScript
 
     def eval(context)
       f_arg = flags.length == 0 ? nil : flags
-      context.root_ns["Regex"].new_with_value(ESRegex.new(interpolate(pattern, context), f_arg))
+      context.root_ns["Regex"].new_with_value(ESRegex.new(interpolate(pattern, context), f_arg), context.namespace_context)
     end
   end
 
   class IntegerNode
     def eval(context)
-      context.root_ns["Integer"].new_with_value(value)
+      context.root_ns["Integer"].new_with_value(value, context.namespace_context)
     end
   end
 
   class FloatNode
     def eval(context)
-      context.root_ns["Float"].new_with_value(value)
+      context.root_ns["Float"].new_with_value(value, context.namespace_context)
     end
   end
 
@@ -177,7 +177,7 @@ module EleetScript
   class SetLocalNode
     def eval(context)
       if Lexer::RESERVED_WORDS.include?(name)
-        context.root_ns["Errors"].call("<", [context.root_ns["String"].new_with_value("Cannot assign a value to reserved word \"name\"")])
+        Helpers.throw_eleet_error(context, "Cannot assign a value to reserved word \"#{name}\"")
       else
         context.local_var(name, value.eval(context))
       end
@@ -291,7 +291,7 @@ module EleetScript
 
   class LambdaNode
     def eval(context)
-      context.root_ns["Lambda"].new_with_value(EleetScriptMethod.new(params, body, context))
+      context.root_ns["Lambda"].new_with_value(EleetScriptMethod.new(params, body, context), context.namespace_context)
     end
   end
 

data/lib/lang/runtime/class.rb

@@ -38,7 +38,7 @@ module EleetScript
           method.call(self, arguments)
         end
       else
-        es_method_name = @context["String"].new_with_value(method_name.to_s)
+        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
@@ -82,12 +82,12 @@ module EleetScript
       end
     end
 
-    def new
-      EleetScriptClassInstance.new(@context, self)
+    def new(current_context)
+      EleetScriptClassInstance.new(@context, self, current_context.namespace_context)
     end
 
-    def new_with_value(value)
-      cls = EleetScriptClassInstance.new(@context, self)
+    def new_with_value(value, current_context)
+      cls = EleetScriptClassInstance.new(@context, self, current_context.namespace_context)
       cls.ruby_value = value
       cls
     end

data/lib/lang/runtime/class_instance.rb

@@ -3,14 +3,14 @@ module EleetScript
     attr_accessor :instance_vars, :runtime_class, :context, :methods
     set_is_instance
 
-    def initialize(class_context, runtime_class)
+    def initialize(class_context, runtime_class, namespace_context)
       @methods = MethodHash.new
       @instance_vars = ProcessedKeyHash.new
       @instance_vars.set_key_preprocessor do |key|
         key[0] == "@" ? key[1..-1] : key
       end
       @runtime_class = runtime_class
-      @context = class_context.new_instance_context(self)
+      @context = class_context.new_instance_context(self, namespace_context)
       @ruby_value = self
     end
 
@@ -27,7 +27,7 @@ module EleetScript
           method.call(self, arguments)
         end
       else
-        es_method_name = @context["String"].new_with_value(method_name.to_s)
+        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

data/lib/lang/runtime/context.rb

@@ -2,8 +2,6 @@ require "util/processed_key_hash"
 
 module EleetScript
   class BaseContext
-
-
     attr_reader :constants, :local_vars, :global_vars, :namespaces
     attr_accessor :current_self, :current_class
 
@@ -25,7 +23,7 @@ module EleetScript
     end
 
     def es_nil
-      @_es_nil ||= self["nil"]
+      @_es_nil ||= root_ns["nil"]
     end
 
     def root_ns
@@ -48,6 +46,10 @@ module EleetScript
       @current_self.class_vars
     end
 
+    def namespace_context
+      root_ns
+    end
+
     def local_var(name, value = nil)
       if value
         local_vars[name] = value
@@ -173,6 +175,10 @@ module EleetScript
       @root_ns
     end
 
+    def namespace_context
+      self
+    end
+
     def new_class_context(current_self, current_class = nil)
       ctx = ClassContext.new(current_self, current_class)
       ctx.parent_context = self
@@ -180,9 +186,9 @@ module EleetScript
     end
 
     def new_namespace_context
-      current_self = @root_ns["Object"].new
-      current_class = current_self.runtime_class
-      ctx = NamespaceContext.new(current_self, current_class, @root_ns)
+      ctx = NamespaceContext.new(nil, nil, @root_ns)
+      ctx.current_self = @root_ns["Object"].new(ctx)
+      ctx.current_class = current_self.runtime_class
       ctx.parent_context = self
       ctx
     end
@@ -211,8 +217,12 @@ module EleetScript
       @parent_context ? @parent_context.instance_vars : {}
     end
 
-    def new_instance_context(instance_self)
-      ctx = ClassInstanceContext.new(instance_self, current_class)
+    def namespace_context
+      @parent_context.namespace_context
+    end
+
+    def new_instance_context(instance_self, namespace)
+      ctx = ClassInstanceContext.new(instance_self, current_class, namespace)
       ctx.parent_context = self
       ctx
     end
@@ -225,6 +235,9 @@ module EleetScript
   end
 
   class ClassInstanceContext < BaseContext
+    attr_accessor :ns_context
+    init_with :set_ns_context
+
     def current_class
       @parent_context.current_class
     end
@@ -233,11 +246,30 @@ module EleetScript
       {}
     end
 
+    def [](key)
+      value = ns_context[key]
+      if value == es_nil
+        super
+      else
+        value
+      end
+    end
+
+    def namespace_context
+      ns_context
+    end
+
     def new_method_context(lambda_context = nil)
       ctx = MethodContext.new(current_self, current_class, lambda_context)
       ctx.parent_context = self
       ctx
     end
+
+    private
+
+    def set_ns_context(ns_context)
+      self.ns_context = ns_context
+    end
   end
 
   class MethodContext < BaseContext
@@ -262,6 +294,10 @@ module EleetScript
       end
     end
 
+    def namespace_context
+      @parent_context.namespace_context
+    end
+
     private
 
     def handle_lambda_context(lambda_context)

data/lib/lang/runtime/memory.rb

@@ -52,16 +52,16 @@ module EleetScript
         end
       end
 
-      @root = root_namespace["Object"].new
+      @root = root_namespace["Object"].new(root_namespace)
       root_namespace.current_self = @root
       root_namespace.current_class = @root.runtime_class
 
-      root_namespace["true"] = root_namespace["TrueClass"].new_with_value(true)
-      root_namespace["false"] = root_namespace["FalseClass"].new_with_value(false)
-      root_namespace["nil"] = root_namespace["NilClass"].new_with_value(nil)
+      root_namespace["true"] = root_namespace["TrueClass"].new_with_value(true, root_namespace)
+      root_namespace["false"] = root_namespace["FalseClass"].new_with_value(false, root_namespace)
+      root_namespace["nil"] = root_namespace["NilClass"].new_with_value(nil, root_namespace)
 
       # Global Errors Object
-      root_namespace["Errors"] = root_namespace["List"].new_with_value(ListBase.new(root_namespace.es_nil))
+      root_namespace["Errors"] = root_namespace["List"].new_with_value(ListBase.new(root_namespace.es_nil), root_namespace)
 
       self.class.core_definers.each do |definer_block|
         instance_eval(&definer_block)

data/lib/lang/runtime/ruby/boolean_methods.rb

@@ -4,11 +4,11 @@ module EleetScript
     false_cls = root_namespace["FalseClass"]
 
     true_cls.def :clone do |receiver, arguments|
-      true_cls.new_with_value(true)
+      root_namespace["true"]
     end
 
     false_cls.def :clone do |receiver, arguments|
-      false_cls.new_with_value(false)
+      root_namespace["false"]
     end
   end
 end

data/lib/lang/runtime/ruby/list_methods.rb

@@ -2,8 +2,8 @@ module EleetScript
   Memory.define_core_methods do
     list = root_namespace["List"]
 
-    list.class_def :new do |receiver, arguments|
-      new_list = receiver.new_with_value(ListBase.new(root_namespace.es_nil))
+    list.class_def :new do |receiver, arguments, context|
+      new_list = receiver.new_with_value(ListBase.new(root_namespace.es_nil), context.namespace_context)
       arguments.each do |arg|
         if arg.instance? && arg.runtime_class.name == "Pair"
           new_list.ruby_value.hash_value[arg.call(:key)] = arg.call(:value)
@@ -46,7 +46,7 @@ module EleetScript
       value
     end
 
-    list.def :merge do |receiver, arguments|
+    list.def :merge do |receiver, arguments, context|
       lst = receiver.ruby_value.dup
       arg = arguments.first
       if arg.is_a?("List")
@@ -58,20 +58,20 @@ module EleetScript
           new_hash = Hash.new(root_namespace.es_nil)
           keys = arg.call(:keys, [])
           keys.raw.length.times do |i|
-            key = keys.call(:[], [root_namespace["Integer"].new_with_value(i)])
+            key = keys.call(:[], [root_namespace["Integer"].new_with_value(i, context.namespace_context)])
             new_hash[key] = arg.call(:[], [key])
           end
           olst.hash_value = new_hash
         elsif arg.raw.kind_of?("Array")
           new_arr = []
           arg.call(:length, []).ruby_value.times do |i|
-            new_arr << arg.call(:[], [root_namespace["Integer"].new_with_value(i)])
+            new_arr << arg.call(:[], [root_namespace["Integer"].new_with_value(i, context.namespace_context)])
           end
           olst.array_value = new_arr
         end
         lst.merge!(olst)
       end
-      root_namespace["List"].new_with_value(lst)
+      root_namespace["List"].new_with_value(lst, context.namespace_context)
     end
 
     list.def :merge! do |receiver, arguments|
@@ -100,9 +100,9 @@ module EleetScript
       arguments.first
     end
 
-    list.def :keys do |receiver, arguments|
+    list.def :keys do |receiver, arguments, context|
       lst = receiver.ruby_value
-      keys = (lst.array_value.length > 0 ? (0...lst.array_value.length).to_a : []).map { |v| root_namespace["Integer"].new_with_value(v) }
+      keys = (lst.array_value.length > 0 ? (0...lst.array_value.length).to_a : []).map { |v| root_namespace["Integer"].new_with_value(v, context.namespace_context) }
       keys.concat(lst.hash_value.keys)
       list.call(:new, keys)
     end
@@ -119,10 +119,10 @@ module EleetScript
       val.nil? ? root_namespace.es_nil : val
     end
 
-    list.def :length do |receiver, arguments|
+    list.def :length do |receiver, arguments, context|
       ruby_val = receiver.ruby_value
       length = ruby_val.array_value.length + ruby_val.hash_value.length
-      root_namespace["Integer"].new_with_value(length)
+      root_namespace["Integer"].new_with_value(length, context.namespace_context)
     end
 
     list.def :first do |receiver, arguments|
@@ -138,17 +138,17 @@ module EleetScript
       receiver
     end
 
-    list.def :join do |receiver, arguments|
+    list.def :join do |receiver, arguments, context|
       str = if arguments.length > 0
         arguments.first.call(:to_string).ruby_value
       else
         ", "
       end
       values = receiver.call(:values).ruby_value.array_value.map { |v| v.call(:to_string).ruby_value }
-      root_namespace["String"].new_with_value(values.join(str))
+      root_namespace["String"].new_with_value(values.join(str), context.namespace_context)
     end
 
-    list.def :to_string do |receiver, arguments|
+    list.def :to_string do |receiver, arguments, context|
       arr_vals = receiver.ruby_value.array_value.map do |val|
         val.call(:inspect).ruby_value
       end
@@ -171,7 +171,7 @@ module EleetScript
       else
         ""
       end
-      root_namespace["String"].new_with_value("[#{str}]")
+      root_namespace["String"].new_with_value("[#{str}]", context.namespace_context)
     end
   end
 end

data/lib/lang/runtime/ruby/nil_methods.rb

@@ -3,7 +3,7 @@ module EleetScript
     nil_cls = root_namespace["NilClass"]
 
     nil_cls.def :clone do |receiver, arguments|
-      nil_cls.new_with_value(nil)
+      root_namespace["nil"]
     end
   end
 end

data/lib/lang/runtime/ruby/number_methods.rb

@@ -4,62 +4,63 @@ module EleetScript
     int = root_namespace["Integer"]
     float = root_namespace["Float"]
 
-    number.def :+ do |receiver, arguments|
+    number.def :+ do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")
         val = receiver.ruby_value + arg.ruby_value
         if val.kind_of?(Fixnum)
-          int.new_with_value(val)
+          int.new_with_value(val, context.namespace_context)
         else
-          float.new_with_value(val)
+          float.new_with_value(val, context.namespace_context)
         end
       elsif arg.is_a?("String")
         str = receiver.ruby_value.to_s + arg.ruby_value
-        root_namespace["String"].new_with_value(str)
+        root_namespace["String"].new_with_value(str, context.namespace_context)
       else
         receiver
       end
     end
 
-    number.def :- do |receiver, arguments|
+    number.def :- do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")
         val = receiver.ruby_value - arg.ruby_value
         if val.kind_of?(Fixnum)
-          int.new_with_value(val)
+          int.new_with_value(val, context.namespace_context)
         else
-          float.new_with_value(float)
+          float.new_with_value(val, context.namespace_context)
         end
       else
         receiver
       end
     end
 
-    number.def :* do |receiver, arguments|
+    number.def :* do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")
         val = receiver.ruby_value * arg.ruby_value
         if val.kind_of?(Fixnum)
-          int.new_with_value(val)
+          int.new_with_value(val, context.namespace_context)
         else
-          float.new_with_value(float)
+          float.new_with_value(val, context.namespace_context)
         end
       else
         receiver
       end
     end
 
-    number.def :/ do |receiver, arguments|
+    number.def :/ do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")
         if arg.ruby_value == 0
-          int.new_with_value(0)
+          int.new_with_value(0, context.namespace_context)
+          root_namespace["Errors"].call(:<, [root_namespace["String"].new_with_value("You cannot divide by zero!", context.namespace_context)])
         else
           val = receiver.ruby_value / arg.ruby_value
           if val.kind_of?(Fixnum)
-            int.new_with_value(val)
+            int.new_with_value(val, context.namespace_context)
           else
-            float.new_with_value(float)
+            float.new_with_value(val, context.namespace_context)
           end
         end
       else
@@ -67,17 +68,18 @@ module EleetScript
       end
     end
 
-    number.def :% do |receiver, arguments|
+    number.def :% do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")
         if arg.ruby_value == 0
-          int.new_with_value(0)
+          int.new_with_value(0, context.namespace_context)
+          root_namespace["Errors"].call(:<, [root_namespace["String"].new_with_value("You cannot divide by zero!", context.namespace_context)])
         else
           val = receiver.ruby_value % arg.ruby_value
           if val.kind_of?(Fixnum)
-            int.new_with_value(val)
+            int.new_with_value(val, context.namespace_context)
           else
-            float.new_with_value(float)
+            float.new_with_value(val, context.namespace_context)
           end
         end
       else
@@ -129,15 +131,15 @@ module EleetScript
       receiver
     end
 
-    number.def :to_string do |receiver, arguments|
-      root_namespace["String"].new_with_value(receiver.ruby_value.to_s)
+    number.def :to_string do |receiver, arguments, context|
+      root_namespace["String"].new_with_value(receiver.ruby_value.to_s, context.namespace_context)
     end
 
-    number.def :clone do |receiver, arguments|
+    number.def :clone do |receiver, arguments, context|
       if receiver.is_a?("Integer")
-        int.new_with_value(receiver.ruby_value)
+        int.new_with_value(receiver.ruby_value, context.namespace_context)
       elsif receiver.is_a?("Float")
-        float.new_with_value(receiver.ruby_value)
+        float.new_with_value(receiver.ruby_value, context.namespace_context)
       else
         root_namespace.es_nil
       end

data/lib/lang/runtime/ruby/object_methods.rb

@@ -2,8 +2,8 @@ module EleetScript
   Memory.define_core_methods do
     object = root_namespace["Object"]
 
-    object.class_def :new do |receiver, arguments|
-      ins = receiver.new
+    object.class_def :new do |receiver, arguments, context|
+      ins = receiver.new(context.namespace_context)
       ins.call("init", arguments)
       ins
     end
@@ -30,12 +30,12 @@ module EleetScript
       receiver.runtime_class
     end
 
-    object.def :class_name do |receiver, arguments|
-      root_namespace["String"].new_with_value(receiver.runtime_class.name)
+    object.def :class_name do |receiver, arguments, context|
+      root_namespace["String"].new_with_value(receiver.runtime_class.name, context.namespace_context)
     end
 
-    object.class_def :class_name do |receiver, arguments|
-      root_namespace["String"].new_with_value(receiver.name)
+    object.class_def :class_name do |receiver, arguments, context|
+      root_namespace["String"].new_with_value(receiver.name, context.namespace_context)
     end
 
     object.def :is do |receiver, arguments|
@@ -46,10 +46,10 @@ module EleetScript
       end
     end
 
-    object.def :clone do |receiver, arguments|
+    object.def :clone do |receiver, arguments, context|
       cls_name = receiver.runtime_class.name
       if ["Integer", "Float", "String", "List"].include?(cls_name)
-        receiver.runtime_class.new_with_value(receiver.ruby_value.dup)
+        receiver.runtime_class.new_with_value(receiver.ruby_value.dup, context.namespace_context)
       else
         ins = receiver.runtime_class.call(:new)
         ins.ruby_value = receiver.ruby_value.dup

data/lib/lang/runtime/ruby/regex_methods.rb

@@ -2,19 +2,19 @@ module EleetScript
   Memory.define_core_methods do
     regex = root_namespace["Regex"]
 
-    regex.class_def :new do |receiver, arguments|
+    regex.class_def :new do |receiver, arguments, context|
       pattern, flags = arguments
       pattern = (pattern ? pattern.ruby_value : "")
       flags = (flags ? flags.ruby_value : nil)
-      receiver.new_with_value(ESRegex.new(pattern, flags))
+      receiver.new_with_value(ESRegex.new(pattern, flags), context.namespace_context)
     end
 
-    regex.def :pattern do |receiver, arguments|
-      root_namespace["String"].new_with_value(receiver.ruby_value.source)
+    regex.def :pattern do |receiver, arguments, context|
+      root_namespace["String"].new_with_value(receiver.ruby_value.source, context.namespace_context)
     end
 
-    regex.def :flags do |receiver, arguments|
-      root_namespace["String"].new_with_value(receiver.ruby_value.flags)
+    regex.def :flags do |receiver, arguments, context|
+      root_namespace["String"].new_with_value(receiver.ruby_value.flags, context.namespace_context)
     end
 
     regex.def :global= do |receiver, arguments|

data/lib/lang/runtime/ruby/string_methods.rb

@@ -24,7 +24,7 @@ module EleetScript
       end
     end
 
-    string.def :substr do |receiver, arguments|
+    string.def :substr do |receiver, arguments, context|
       if arguments.length < 2
         root_namespace["nil"]
       else
@@ -35,33 +35,33 @@ module EleetScript
           else
             (s.ruby_value...e.ruby_value)
           end
-          root_namespace["String"].new_with_value(receiver.ruby_value[range])
+          root_namespace["String"].new_with_value(receiver.ruby_value[range], context.namespace_context)
         else
           root_namespace["nil"]
         end
       end
     end
 
-    string.def :length do |receiver, arguments|
-      root_namespace["Integer"].new_with_value(receiver.ruby_value.length)
+    string.def :length do |receiver, arguments, context|
+      root_namespace["Integer"].new_with_value(receiver.ruby_value.length, context.namespace_context)
     end
 
-    string.def :upper_case do |receiver, arguments|
-      string.new_with_value(receiver.ruby_value.upcase)
+    string.def :upper_case do |receiver, arguments, context|
+      string.new_with_value(receiver.ruby_value.upcase, context.namespace_context)
     end
 
-    string.def :lower_case do |receiver, arguments|
-      string.new_with_value(receiver.ruby_value.downcase)
+    string.def :lower_case do |receiver, arguments, context|
+      string.new_with_value(receiver.ruby_value.downcase, context.namespace_context)
     end
 
-    string.def :[] do |receiver, arguments|
+    string.def :[] do |receiver, arguments, context|
       index = arguments.first
       if index.is_a?("Integer")
         index = index.ruby_value
         if index < 0 || index >= receiver.ruby_value.length
           root_namespace.es_nil
         else
-          string.new_with_value(receiver.ruby_value[index])
+          string.new_with_value(receiver.ruby_value[index], context.namespace_context)
         end
       else
         root_namespace.es_nil
@@ -84,13 +84,13 @@ module EleetScript
       end
     end
 
-    string.def :to_symbol do |receiver, arguments|
-      root_namespace["Symbol"].new_with_value(receiver.ruby_value.to_sym)
+    string.def :to_symbol do |receiver, arguments, context|
+      root_namespace["Symbol"].new_with_value(receiver.ruby_value.to_sym, context.namespace_context)
     end
 
-    string.def :replace do |receiver, arguments|
+    string.def :replace do |receiver, arguments, context|
       if arguments.length < 2
-        string.new_with_value(receiver.ruby_value)
+        string.new_with_value(receiver.ruby_value, context.namespace_context)
       else
         pattern, replacement = arguments
         if !pattern.is_a?("Regex")
@@ -99,28 +99,28 @@ module EleetScript
         if replacement.is_a?("Lambda")
           new_str = if pattern.ruby_value.global?
             receiver.ruby_value.gsub(pattern.ruby_value) do
-              args = Regexp.last_match[1..-1].map { |match| string.new_with_value(match) }
+              args = Regexp.last_match[1..-1].map { |match| string.new_with_value(match, context.namespace_context) }
               replacement.call(:call, args).call(:to_string).ruby_value
             end
           else
             receiver.ruby_value.sub(pattern.ruby_value) do
-              args = Regexp.last_match[1..-1].map { |match| string.new_with_value(match) }
+              args = Regexp.last_match[1..-1].map { |match| string.new_with_value(match, context.namespace_context) }
               replacement.call(:call, args).call(:to_string).ruby_value
             end
           end
-          string.new_with_value(new_str)
+          string.new_with_value(new_str, context.namespace_context)
         else
           new_str = if pattern.ruby_value.global?
             receiver.ruby_value.gsub(pattern.ruby_value, replacement.call(:to_string).ruby_value)
           else
             receiver.ruby_value.sub(pattern.ruby_value, replacement.call(:to_string).ruby_value)
           end
-          string.new_with_value(new_str)
+          string.new_with_value(new_str, context.namespace_context)
         end
       end
     end
 
-    string.def :match do |receiver, arguments|
+    string.def :match do |receiver, arguments, context|
       str_cls, list_cls = root_namespace["String"], root_namespace["List"]
       rx = arguments.first
       args = []
@@ -129,7 +129,7 @@ module EleetScript
           matches = receiver.ruby_value.scan(rx.ruby_value)
           list_args = matches.map do |match|
             args = match.map do |a|
-              str_cls.new_with_value(a)
+              str_cls.new_with_value(a, context.namespace_context)
             end
             list_cls.call(:new, args)
           end
@@ -139,17 +139,17 @@ module EleetScript
           if matches.nil?
             list_cls.call(:new)
           else
-            args = [str_cls.new_with_value(matches[0])]
+            args = [str_cls.new_with_value(matches[0], context.namespace_context)]
             if matches.names.length > 0
               args += matches.names.map do |name|
-                n, v = str_cls.new_with_value(name), str_cls.new_with_value(matches[name])
+                n, v = str_cls.new_with_value(name, context.namespace_context), str_cls.new_with_value(matches[name], context.namespace_context)
                 root_namespace["Pair"].call(:new, [n, v])
               end
             else
               group_matches = matches.to_a
               group_matches.shift # Remove full match
               args += group_matches.map do |res|
-                str_cls.new_with_value(res)
+                str_cls.new_with_value(res, context.namespace_context)
               end
             end
             list_cls.call(:new, args)

data/lib/lang/runtime/ruby/symbol_methods.rb

@@ -2,11 +2,11 @@ module EleetScript
   Memory.define_core_methods do
     symbol = root_namespace["Symbol"]
 
-    symbol.class_def :new do |receiver, arguments|
+    symbol.class_def :new do |receiver, arguments, context|
       if arguments.length > 0
-        receiver.new_with_value(arguments.first.call(:to_string).ruby_value.intern)
+        receiver.new_with_value(arguments.first.call(:to_string).ruby_value.intern, context.namespace_context)
       else
-        reciever.new_with_value(:nil)
+        reciever.new_with_value(:nil, context.namespace_context)
       end
     end
 
@@ -19,8 +19,8 @@ module EleetScript
       end
     end
 
-    symbol.def :to_string do |receiver, arguments|
-      root_namespace["String"].new_with_value("#{receiver.ruby_value.to_s}")
+    symbol.def :to_string do |receiver, arguments, context|
+      root_namespace["String"].new_with_value("#{receiver.ruby_value.to_s}", context.namespace_context)
     end
   end
 end

metadata

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