eleetscript 0.0.12a → 0.0.13a

data/lib/lang/runtime/base_classes.rb

@@ -1,8 +1,9 @@
 module EleetScript
   class ListBase
-    attr_reader :array_value, :hash_value
+    attr_accessor :array_value, :hash_value
 
     def initialize(nil_val)
+      @nil_val = nil_val
       @array_value = []
       @hash_value = Hash.new(nil_val)
     end
@@ -17,7 +18,7 @@ module EleetScript
     end
 
     def dup
-      lst = ListBase.new
+      lst = ListBase.new(@nil_val)
       lst.array_value = @array_value.dup
       lst.hash_value = @hash_value.dup
       lst

data/lib/lang/runtime/context.rb

@@ -2,14 +2,20 @@ require "util/processed_key_hash"
 
 module EleetScript
   class BaseContext
-    @@_init_funcs = []
+
 
     attr_reader :constants, :local_vars, :global_vars, :namespaces
     attr_accessor :current_self, :current_class
 
     class << self
+      attr_writer :init_funcs
+
       def init_with(*func_symbols)
-        @@_init_funcs += func_symbols
+        self.init_funcs += func_symbols
+      end
+
+      def init_funcs
+        @init_funcs ||= []
       end
     end
 
@@ -128,7 +134,7 @@ module EleetScript
       @constants = ProcessedKeyHash.new
       @global_vars = {}
       @namespaces = {}
-      @@_init_funcs.each do |symbol|
+      self.class.init_funcs.each do |symbol|
         send(symbol, *args) if respond_to?(symbol, true)
       end
     end

data/lib/lang/runtime/eleetscript/object.es

@@ -21,10 +21,6 @@ class Object
     IO.print(msg)
   end
 
-  to_string do
-    class_name
-  end
-
   println do |msg|
     IO.println(msg)
   end
@@ -37,6 +33,10 @@ class Object
     to_string
   end
 
+  to_string do
+    class_name
+  end
+
   =~ do
     false
   end

data/lib/lang/runtime/eleetscript/symbol.es

@@ -0,0 +1,5 @@
+class Symbol
+  inspect do
+    ":" + to_string
+  end
+end

data/lib/lang/runtime/memory.rb

@@ -16,6 +16,7 @@ module EleetScript
       "Enumerable" => nil,
       "List" => "Enumerable",
       "String" => "Enumerable",
+      "Symbol" => nil,
       "Regex" => nil,
       "IO" => nil,
       "Lambda" => nil,
@@ -26,7 +27,11 @@ module EleetScript
 
     class << self
       def define_core_methods(&block)
-        (@@core_definers ||= []) << block
+        core_definers << block
+      end
+
+      def core_definers
+        @core_definers ||= []
       end
     end
 
@@ -58,7 +63,7 @@ module EleetScript
       # Global Errors Object
       root_namespace["Errors"] = root_namespace["List"].new_with_value(ListBase.new(root_namespace.es_nil))
 
-      @@core_definers.each do |definer_block|
+      self.class.core_definers.each do |definer_block|
         instance_eval(&definer_block)
       end
 

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

@@ -46,12 +46,37 @@ module EleetScript
       value
     end
 
-    list.def :merge! do |receiver, arguments|
-      lst = receiver.ruby_value
+    list.def :merge do |receiver, arguments|
+      lst = receiver.ruby_value.dup
       arg = arguments.first
       if arg.is_a?("List")
         lst.merge!(arg.ruby_value)
+      # For Ruby Bridge
+      elsif arg.kind_of?(RubyToEleetWrapper)
+        olst = ListBase.new(root_namespace.es_nil)
+        if arg.raw.kind_of?(Hash)
+          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)])
+            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)])
+          end
+          olst.array_value = new_arr
+        end
+        lst.merge!(olst)
       end
+      root_namespace["List"].new_with_value(lst)
+    end
+
+    list.def :merge! do |receiver, arguments|
+      new_list = receiver.call(:merge, arguments)
+      receiver.ruby_value = new_list.ruby_value
       receiver
     end
 

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

@@ -84,6 +84,10 @@ module EleetScript
       end
     end
 
+    string.def :to_symbol do |receiver, arguments|
+      root_namespace["Symbol"].new_with_value(receiver.ruby_value.to_sym)
+    end
+
     string.def :replace do |receiver, arguments|
       if arguments.length < 2
         string.new_with_value(receiver.ruby_value)

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

@@ -0,0 +1,26 @@
+module EleetScript
+  Memory.define_core_methods do
+    symbol = root_namespace["Symbol"]
+
+    symbol.class_def :new do |receiver, arguments|
+      if arguments.length > 0
+        receiver.new_with_value(arguments.first.call(:to_string).ruby_value.intern)
+      else
+        reciever.new_with_value(:nil)
+      end
+    end
+
+    symbol.def :is do |receiver, arguments|
+      t, f = root_namespace["true"], root_namespace["false"]
+      if arguments.length == 0
+        f
+      else
+        (receiver.ruby_value == arguments.first.ruby_value ? t : f)
+      end
+    end
+
+    symbol.def :to_string do |receiver, arguments|
+      root_namespace["String"].new_with_value("#{receiver.ruby_value.to_s}")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eleetscript
 version: !ruby/object:Gem::Version
-  version: 0.0.12a
+  version: 0.0.13a
 platform: ruby
 authors:
 - Brandon Buck
@@ -49,6 +49,7 @@ files:
 - lib/lang/runtime/eleetscript/regex.es
 - lib/lang/runtime/eleetscript/stack.es
 - lib/lang/runtime/eleetscript/string.es
+- lib/lang/runtime/eleetscript/symbol.es
 - lib/lang/runtime/eleetscript/trueclass.es
 - lib/lang/runtime/memory.rb
 - lib/lang/runtime/method.rb
@@ -62,6 +63,7 @@ files:
 - lib/lang/runtime/ruby/object_methods.rb
 - lib/lang/runtime/ruby/regex_methods.rb
 - lib/lang/runtime/ruby/string_methods.rb
+- lib/lang/runtime/ruby/symbol_methods.rb
 - lib/util/processed_key_hash.rb
 - bin/eleet
 homepage: http://github.com/bbuck/eleetscript