eleetscript 0.0.14a → 0.0.15a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e9923530119b0319ffa8ce45c74d8554dac83ec
-  data.tar.gz: a14bb0f0eb2f815c72d49b82526919b2e14ece5a
+  metadata.gz: 0e4f8b67c1f572dc4962a488a2922c6adc3ecb38
+  data.tar.gz: b1c43f3ea9c8893a1585a6f60043f1da8b627711
 SHA512:
-  metadata.gz: 39efb36e6897c54457071dfb89779d247c34c7eee6c0926fc1d91bc9d25df6b691e57e48f91836fd9e9423d68f589f14c8b4f71eead668e5faa6d23581e47d71
-  data.tar.gz: 2dda61db2fe4268ecd9a8f58d668e3a7e44d9464cdf0b2607547e4ada1b9516fafe32e453d2fcf167d8546eab2dd6f3822ed11183af10e34b8c9754fd35e5fcf
+  metadata.gz: 8f3049744c6a35f3e6ccb32fec32c0ade0b3944cb464b8b2156708f63e04c79f58fa4946489dbfc244407b86e0b83573b9cbb86b73760c5a9a72bf26f06d53eb
+  data.tar.gz: d4c968ee303abab77cbb49b6990aec2cac34b2959e0e8bcf225aeebbe4cc5d175fd198cef5f89db01d14f053576107c61b3e563ad1e32589d52392b09a26907b

data/bin/eleet

@@ -66,7 +66,7 @@ if ARGV.empty?
         next
       end
       if value.kind_of?(ES::EleetScriptClass) || value.kind_of?(ES::EleetScriptClassInstance)
-        if ["Integer", "Float", "String", "TrueClass", "FalseClass", "NilClass"].include?(value.class_name)
+        if value.instance? && ["Integer", "Float", "String", "TrueClass", "FalseClass", "NilClass"].include?(value.class_name)
           puts " => #{value.ruby_value.inspect}"
         else
           puts " => #{value.call(:inspect).ruby_value}"

data/lib/engine/eleet_to_ruby_wrapper.rb

@@ -27,7 +27,7 @@ module EleetScript
       if orig
         super
       else
-        call(:class)
+        call(:class_ref)
       end
     end
 

data/lib/engine/engine.rb

@@ -50,14 +50,14 @@ module EleetScript
       to_ruby_value(ns[name])
     end
 
-    def []=(name, value)
+    def []=(name, value, options = {})
       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)])
         return false
       else
-        ns[var] = to_eleet_value(value)
+        ns[var] = to_eleet_value(value, options)
       end
       true
     end
@@ -71,8 +71,8 @@ module EleetScript
       end
     end
 
-    def set(var, value)
-      self[var] = value
+    def set(var, value, options = {})
+      send(:[]=, var, value, options)
     end
 
     def memory
@@ -93,8 +93,8 @@ module EleetScript
       @interpreter ||= Interpreter.new(memory)
     end
 
-    def to_eleet_value(value)
-      Values.to_eleet_value(value, self)
+    def to_eleet_value(value, options = {})
+      Values.to_eleet_value(value, self, options)
     end
 
     def to_ruby_value(value)

data/lib/engine/ruby_to_eleet_wrapper.rb

@@ -1,13 +1,23 @@
 module EleetScript
   class RubyToEleetWrapper
-    def initialize(ruby_obj, engine)
+    def initialize(ruby_obj, engine, options = {})
       @ruby_obj = ruby_obj
       @engine = engine
+      @options = options
+      if @options[:lock]
+        @options[:lock] = [@options[:lock]] unless @options[:lock].kind_of?(Array)
+      end
     end
 
-    def call(method_name, args)
+    def call(method_name, args = [])
+      unless can_call_method?(method_name)
+        @engine["Errors"] < "Attempt to call locked method \"#{method_name}\" failed."
+        return Values.to_eleet_value(@engine["nil"], @engine)
+      end
       if method_name.to_sym == :to_string
         method_name = :to_s
+      elsif method_name.to_sym == :class_ref
+        method_name = :class
       elsif method_name.to_sym == :class_name
         cls = if @ruby_obj.class == Class
           @ruby_obj
@@ -25,10 +35,17 @@ module EleetScript
       begin
         Values.to_eleet_value(@ruby_obj.send(method_name, *ruby_args, &block), @engine)
       rescue NoMethodError => e
-        Values.to_eleet_value(@engine.get("nil"), @engine)
+        Values.to_eleet_value(@engine["nil"], @engine)
       end
     end
 
+    def can_call_method?(method_name)
+      method_name = method_name.to_sym
+      return false if @options[:lock] && @options[:lock].include?(method_name)
+      return false if @ruby_obj.respond_to?(:eleetscript_lock_methods) && @ruby_obj.eleetscript_lock_methods.include?(method_name)
+      true
+    end
+
     def raw
       @ruby_obj
     end

data/lib/engine/values.rb

@@ -7,7 +7,7 @@ require "engine/ruby_lambda"
 module EleetScript
   module Values
     class << self
-      def to_eleet_value(ruby_obj, engine)
+      def to_eleet_value(ruby_obj, engine, options = {})
         memory = if engine.kind_of?(Memory)
           engine
         else
@@ -40,7 +40,7 @@ module EleetScript
         elsif ruby_obj == false
           memory.root_namespace["false"]
         else
-          RubyToEleetWrapper.new(ruby_obj, engine)
+          RubyToEleetWrapper.new(ruby_obj, engine, options)
         end
       end
 

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

@@ -4,6 +4,11 @@ module EleetScript
     int = root_namespace["Integer"]
     float = root_namespace["Float"]
 
+    number.class_def :new do |receiver, arguments|
+      root_namespace["Errors"].call(:<, [root_namespace["String"].new_with_value("Cannot call new on Number", root_namespace)])
+      root_namespace["nil"]
+    end
+
     number.def :+ do |receiver, arguments, context|
       arg = arguments.first
       if arg.is_a?("Number")

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

@@ -26,7 +26,7 @@ module EleetScript
       end
     end
 
-    object.def :class do |receiver, arguments|
+    object.def :class_ref do |receiver, arguments|
       receiver.runtime_class
     end
 

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

@@ -2,6 +2,11 @@ module EleetScript
   Memory.define_core_methods do
     string = root_namespace["String"]
 
+    string.class_def :new do |receiver, arguments, context|
+      arg = arguments.length > 0 ? arguments.first.call(:to_string).ruby_value : ""
+      receiver.new_with_value(arg, context.namespace_context)
+    end
+
     string.def :+ do |receiver, arguments|
       arg = arguments.first
       arg_str = if arg.class?

metadata

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