eleetscript 0.0.12a → 0.0.13a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1255e8ca939af702f7d090e65496e284bd267b30
-  data.tar.gz: 560259fafdb36ea56bc31d71afa98bb1035259e5
+  metadata.gz: 7fc5d2a285f1c5be7ca29e652a4b778e75d10182
+  data.tar.gz: c49384478e2b92eea802bcb91ea7d57bae711f5d
 SHA512:
-  metadata.gz: 0cb533c5f88be2425ffeb171a997b91a51b7e71ff90ea0d06f6a6061203eaa101c6785440a8529a5498fbd7e2b3fdf1611de164425f64cf5b99e1d7296f44dfa
-  data.tar.gz: d27ee55a7a6c1fad6218ade68651286153d089618f3f7640c1477f4698d7543098c4c7c5ae3b59115e14296fc75d451f4c2d23f3e43f2d0accd35dac28004c35
+  metadata.gz: 50925211b0865177514393bc13a642098177c2495cb432497c6c6d3387a6c38b0d3b61d004df9868ce476c32876c0c2d8edae84925770b55e1d6413b964bf9f4
+  data.tar.gz: 785b7bffb8338e1eceede4b9f283202adffee20a3239f48d26be4d35a00dfb07b34b6f24e39127cebf06e993914fb65c9b8e38d8bb36dcaf8662d27a157f02b0

data/lib/engine/engine.rb

@@ -122,10 +122,16 @@ module EleetScript
   end
 
   class SharedEngine < BaseEngine
+    class << self
+      def memory
+        @memory ||= Memory.new
+      end
+    end
+
     def initialize; end
 
     def memory
-      @@memory ||= Memory.new
+      self.class.memory ||= Memory.new
     end
 
     def reset

data/lib/engine/ruby_to_eleet_wrapper.rb

@@ -40,7 +40,7 @@ module EleetScript
         @ruby_obj.class
       end
       cls_names = cls.ancestors.map { |a| a.name.split("::").last }
-      Values.to_eleet_value(cls_names.include?(name), @engine)
+      cls_names.include?(name)
     end
 
     def class?

data/lib/engine/values.rb

@@ -17,6 +17,8 @@ module EleetScript
           ruby_obj.instance_variable_get("@eleet_obj")
         elsif ruby_obj.kind_of?(String)
           memory.root_namespace["String"].new_with_value(ruby_obj)
+        elsif ruby_obj.kind_of?(Symbol)
+          memory.root_namespace["Symbol"].new_with_value(ruby_obj)
         elsif ruby_obj.kind_of?(Fixnum)
           memory.root_namespace["Integer"].new_with_value(ruby_obj)
         elsif ruby_obj.kind_of?(Float)
@@ -43,7 +45,7 @@ module EleetScript
       end
 
       def to_ruby_value(eleet_obj, engine)
-        ruby_values = ["TrueClass", "FalseClass", "NilClass", "String", "Integer", "Float", "Regex"]
+        ruby_values = ["TrueClass", "FalseClass", "NilClass", "String", "Integer", "Float", "Regex", "Symbol"]
         if eleet_obj.kind_of?(RubyToEleetWrapper)
           eleet_obj.instance_variable_get("@ruby_obj")
         elsif eleet_obj.class_name == "Lambda"

data/lib/lang/grammar.y

@@ -3,7 +3,7 @@ class Parser
 token DO END CLASS LOAD IF WHILE NAMESPACE ELSE ELSIF RETURN BREAK NEXT TRUE
 token YES ON FALSE NO OFF NIL SELF DEFINED PROPERTY RETURN
 token CONSTANT GLOBAL CLASS_IDENTIFIER INSTANCE_IDENTIFIER IDENTIFIER
-token FLOAT NUMBER STRING TERMINATOR EOF REGEX REGEX_FLAGS
+token FLOAT NUMBER STRING TERMINATOR EOF REGEX REGEX_FLAGS SYMBOL
 
 prechigh
   left '.'
@@ -77,6 +77,7 @@ rule
   | False                                                  { result = FalseNode.new }
   | NIL                                                    { result = NilNode.new }
   | Regex
+  | SYMBOL                                                 { result = SymbolNode.new(val[0]) }
   ;
 
   Regex:

data/lib/lang/interpreter.rb

@@ -30,7 +30,7 @@ module EleetScript
 
   module Helpers
     def self.throw_eleet_error(context, error)
-      context["Errors"].call("<", [context["String"].new_with_value(error)])
+      context.root_ns["Errors"].call("<", [context.root_ns["String"].new_with_value(error)])
     end
   end
 
@@ -124,7 +124,13 @@ module EleetScript
     include Interpolatable
 
     def eval(context)
-      context["String"].new_with_value(interpolate(value, context))
+      context.root_ns["String"].new_with_value(interpolate(value, context))
+    end
+  end
+
+  class SymbolNode
+    def eval(context)
+      context.root_ns["Symbol"].new_with_value(value)
     end
   end
 
@@ -133,19 +139,19 @@ module EleetScript
 
     def eval(context)
       f_arg = flags.length == 0 ? nil : flags
-      context["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))
     end
   end
 
   class IntegerNode
     def eval(context)
-      context["Integer"].new_with_value(value)
+      context.root_ns["Integer"].new_with_value(value)
     end
   end
 
   class FloatNode
     def eval(context)
-      context["Float"].new_with_value(value)
+      context.root_ns["Float"].new_with_value(value)
     end
   end
 
@@ -171,7 +177,7 @@ module EleetScript
   class SetLocalNode
     def eval(context)
       if Lexer::RESERVED_WORDS.include?(name)
-        context["Errors"].call("<", [context["String"].new_with_value("Cannot assign a value to reserved word \"name\"")])
+        context.root_ns["Errors"].call("<", [context.root_ns["String"].new_with_value("Cannot assign a value to reserved word \"name\"")])
       else
         context.local_var(name, value.eval(context))
       end
@@ -220,13 +226,13 @@ module EleetScript
 
   class TrueNode
     def eval(context)
-      context["true"]
+      context.root_ns["true"]
     end
   end
 
   class FalseNode
     def eval(context)
-      context["false"]
+      context.root_ns["false"]
     end
   end
 
@@ -285,7 +291,7 @@ module EleetScript
 
   class LambdaNode
     def eval(context)
-      context["Lambda"].new_with_value(EleetScriptMethod.new(params, body, context))
+      context.root_ns["Lambda"].new_with_value(EleetScriptMethod.new(params, body, context))
     end
   end
 

data/lib/lang/lexer.rb

@@ -26,6 +26,7 @@ module EleetScript
       float: /\A([\d_]*?\.[\d_]+)/,
       string: /\A\"(.*?)(?<!\\)\"/m,
       regex: /\Ar\"(.*?)(?<!\\)\"([gim]*)/,
+      symbol: /\A:([a-z][\w\d]*?\b)/i,
       comment: /\A#.*?(?=\n|$)/m
     }
 
@@ -53,6 +54,9 @@ module EleetScript
         elsif instance_var = chunk[TOKEN_RX[:instance_var]]
           tokens << [:INSTANCE_IDENTIFIER, $1]
           i += instance_var.length
+        elsif symbol = chunk[TOKEN_RX[:symbol]]
+          tokens << [:SYMBOL, $1.to_sym]
+          i += symbol.length
         elsif regex = chunk[TOKEN_RX[:regex]]
           pattern, flags = $1, $2
           tokens << [:REGEX, pattern.gsub('\"', '"')]

data/lib/lang/nodes.rb

@@ -47,6 +47,7 @@ module EleetScript
   class IntegerNode < LiteralNode; end
   class FloatNode < LiteralNode; end
   class StringNode < LiteralNode; end
+  class SymbolNode < LiteralNode; end
 
   class TrueNode < LiteralNode
     def value