eleetscript 0.0.8a → 0.0.9a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c38fdc6bb79014d5728e6669aa12387778e621fc
-  data.tar.gz: d27623562a61626be0b329b81859a889cb0023e9
+  metadata.gz: 80494963cad281aa36e4530787500857c16eec5f
+  data.tar.gz: 5249123133018b889fe3b94a39e5d43a22123dd3
 SHA512:
-  metadata.gz: 4b9ddaa1b4cef7e92e97359907c8f932d0e1c7e2eb5c2440e826a7bd831a3ada3bddad7317c72e4740fdcaa191e210a64f8e2427c90e3b3fcf09cc98abcd145a
-  data.tar.gz: 223caee593a8b8cc9a0003aca620026f132b0f1b9cb2974e2cb70cf45854691e87eaf776768f110f56dc2693e99ef0acc7901bd51904fbfe87b79cccee2bd476
+  metadata.gz: ca03d69c5ebd3650e643ffdb612d7b0456914af4559437fac911f236522ee52a5f2bef242c221be7fe5c6961aa662c7e31d343c169b8eb2ddb1e3eb7adf9ac7a
+  data.tar.gz: 2e9d01a9470ec764f56713ab7825650c498acaabcc28166d90d76adb606c717b8332b706266247344627847c323c3a22b4366d80f8d4177f40f3c0d40a97802b

data/lib/engine/eleet_to_ruby_wrapper.rb

@@ -23,8 +23,16 @@ module EleetScript
       @eleet_obj
     end
 
+    def class(orig = false)
+      if orig
+        super
+      else
+        call(:class)
+      end
+    end
+
     def to_s
-      Values.to_ruby_value(@eleet_obj.call(:to_string), @engine)
+      call(:to_string)
     end
   end
 end

data/lib/engine/engine.rb

@@ -3,67 +3,94 @@ require "lang/interpreter"
 require "engine/values"
 
 module EleetScript
+  class CannotInstantiateBaseEngine < Exception
+    def initialize
+      super("You cannot instantiate BaseEngine, use SharedEngine or StandaloneEngine")
+    end
+  end
+
   class CannotCallInstanceOrClassMethodsExcpetion < Exception
+    def initialize
+      super("You cannot call a class or instance method using EleetScript::Engine.call")
+    end
   end
 
-  class Engine
+  class BaseEngine
     def initialize
-      @memory = Memory.new
-      @interpreter = Interpreter.new(@memory)
+      raise CannotInstantiateBaseEngine.new
     end
 
-    def execute(code)
+    def evaluate(code)
       begin
-        to_ruby_value(@interpreter.eval(code))
+        to_ruby_value(eval(code))
       rescue Exception => e
         false
       end
     end
 
+    def execute(code)
+      evaluate(code)
+    end
+
     def call(method_name, *args)
       method_name = method_name.to_s
       if method_name =~ /\./
-        throw CannotCallInstanceOrClassMethodsException.new("You cannot call a class or instance method using EleetScript::Engine.call")
-      end
-      nesting = method_name.split("::")
-      ns = @memory.root_namespace
-      method_name = nesting.pop
-      nesting.each do |new_ns|
-        ns = ns.namespace(new_ns)
+        raise CannotCallInstanceOrClassMethodsException.new
       end
+      method_name, ns = unnest(method_name)
       eleet_args = args.map do |arg|
         to_eleet_value(arg)
       end
       to_ruby_value(ns.current_self.call(method_name, eleet_args))
     end
 
+    def [](name)
+      load
+      var, ns = unnest(name)
+      to_ruby_value(ns[name])
+    end
+
+    def []=(name, value)
+      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.")])
+        return false
+      else
+        ns[var] = to_eleet_value(value)
+      end
+      true
+    end
+
     def get(var, raw = false)
-      value = @memory.root_namespace[var]
+      val = self[var]
       if raw
-        value
+        val.eleet_obj
       else
-        to_ruby_value(value)
+        val
       end
     end
 
     def set(var, value)
-      nesting = var.split("::")
-      ns = @memory.root_namespace
-      var = nesting.pop
-      nesting.each do |new_ns|
-        ns = ns.namespace(new_ns)
-      end
-      if var[0] =~ /[A-Z]/
-        if ns.constants.has_key?(var)
-          @memory.root_namespace["Errors"].call("<", [@memory.root_namespace["String"].new_with_value("Cannot reassign constant via the Engine.")])
-          return false
-        else
-          ns[var] = to_eleet_value(value)
-        end
-      else
-        ns[var] = to_eleet_value(value)
-      end
-      true
+      self[var] = value
+    end
+
+    def memory
+      @memory ||= Memory.new
+    end
+
+    protected
+
+    def load
+      interpreter unless @interpreter
+    end
+
+    def eval(code)
+      interpreter.eval(code)
+    end
+
+    def interpreter
+      @interpreter ||= Interpreter.new(memory)
     end
 
     def to_eleet_value(value)
@@ -73,5 +100,57 @@ module EleetScript
     def to_ruby_value(value)
       Values.to_ruby_value(value, self)
     end
+
+    def engine_root_ns
+      memory.root_namespace
+    end
+
+    def unnest(name)
+      if name.start_with?("::")
+        name = name[2..-1]
+        ns = memory.root_namespace
+      else
+        ns = engine_root_ns
+      end
+      nesting = name.split("::")
+      var = nesting.pop
+      nesting.each do |new_ns|
+        ns = ns.namespace(new_ns)
+      end
+      [var, ns]
+    end
+  end
+
+  class SharedEngine < BaseEngine
+    def initialize; end
+
+    def memory
+      @@memory ||= Memory.new
+    end
+
+    protected
+
+    def eval(code)
+      interpreter.eval_with_context(code, context)
+    end
+
+    def context
+      @context ||= memory.root_namespace.new_namespace_context
+    end
+
+    def engine_root_ns
+      context
+    end
+  end
+
+  class Engine < SharedEngine
+    def initialize
+      super
+      puts "WARNING: EleetScript::Engine has been deprecated, please use EleetScript::SharedEngine or EleetScript::StandaloneEngine."
+    end
+  end
+
+  class StandaloneEngine < BaseEngine
+    def initialize; end
   end
 end

data/lib/engine/ruby_to_eleet_wrapper.rb

@@ -51,13 +51,21 @@ module EleetScript
       !class?
     end
 
+    def name
+      if @ruby_obj.class == Class
+        @ruby_obj.name
+      else
+        @ruby_obj.class.name
+      end
+    end
+
     def runtime_class
       cls = if @ruby_obj.class == Class
         @ruby_obj
       else
         @ruby_obj.class
       end
-      Values.to_eleet_value(cls.name)
+      Values.to_eleet_value(cls)
     end
   end
 end

data/lib/engine/values.rb

@@ -11,7 +11,7 @@ module EleetScript
         memory = if engine.kind_of?(Memory)
           engine
         else
-          engine.instance_variable_get("@memory")
+          engine.memory
         end
         if ruby_obj.kind_of?(EleetToRubyWrapper)
           ruby_obj.instance_variable_get("@eleet_obj")
@@ -27,6 +27,10 @@ module EleetScript
           memory.root_namespace["Lambda"].new_with_value(ESProc.new(ruby_obj, engine))
         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))
+        elsif ruby_obj.kind_of?(ESRegex)
+          memory.root_namespace["Regex"].new_with_value(ruby_obj)
         elsif ruby_obj.nil?
           memory.root_namespace["nil"]
         elsif ruby_obj == true
@@ -39,7 +43,7 @@ module EleetScript
       end
 
       def to_ruby_value(eleet_obj, engine)
-        ruby_values = ["TrueClass", "FalseClass", "NilClass", "String", "Integer", "Float"]
+        ruby_values = ["TrueClass", "FalseClass", "NilClass", "String", "Integer", "Float", "Regex"]
         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
+token FLOAT NUMBER STRING TERMINATOR EOF REGEX REGEX_FLAGS
 
 prechigh
   left '.'
@@ -76,6 +76,12 @@ rule
   | True                                                   { result = TrueNode.new }
   | False                                                  { result = FalseNode.new }
   | NIL                                                    { result = NilNode.new }
+  | Regex
+  ;
+
+  Regex:
+    REGEX REGEX_FLAGS                                      { result = RegexNode.new(val[0], val[1]) }
+  | REGEX                                                  { result = RegexNode.new(val[0], "") }
   ;
 
   ListExpression:
@@ -171,6 +177,7 @@ rule
   | Expression 'or' Expression                             { result = CallNode.new(val[0], val[1], [val[2]], nil) }
   | Expression 'is' Expression                             { result = CallNode.new(val[0], val[1], [val[2]], nil) }
   | Expression 'isnt' Expression                           { result = CallNode.new(val[0], val[1], [val[2]], nil) }
+  | Expression '=~' Expression                             { result = CallNode.new(val[0], val[1], [val[2]], nil) }
   ;
 
   OperatorAssignment:
@@ -248,10 +255,9 @@ rule
   | '>='
   | '<='
   | '<'
+  | '=~'
   ;
 
-
-
   Parameters:
     /* nothing */                                          { result = [] }
   | Terminator                                             { result = [] }
@@ -293,7 +299,7 @@ rule
   ;
 
   Else:
-    ELSE Terminator Expression Terminator END              { result = ElseNode.new(val[2]) }
+    ELSE Terminator Expressions Terminator END             { result = ElseNode.new(val[2]) }
   | ELSE Terminator Expressions END                        { result = ElseNode.new(val[2]) }
   | ElseIf
   ;

data/lib/lang/interpreter.rb

@@ -16,6 +16,11 @@ module EleetScript
       nodes.eval(@memory.root_namespace)
     end
 
+    def eval_with_context(code, context)
+      nodes = @parser.parse(code)
+      nodes.eval(context)
+    end
+
     def load(file_name)
       if File.exists?(file_name)
         eval(File.read(file_name))
@@ -57,6 +62,24 @@ module EleetScript
     end
   end
 
+  module Interpolatable
+    INTERPOLATE_RX = /[\\]?%(?:@|@@|\$)?[\w]+?(?=\W|$)/
+
+    def interpolate(str, context)
+      new_val = str.dup
+      matches = str.scan(INTERPOLATE_RX)
+      matches.each do |match|
+        next if match.nil? || match == "%" || match == ""
+        if match.start_with?("\\")
+          next new_val.sub!(match, match[1..-1])
+        end
+        var = match[1..-1]
+        new_val.sub!(match, context[var].call(:to_string).ruby_value)
+      end
+      new_val
+    end
+  end
+
   module NodeMethods
     def returnable?
       self.class.included_modules.include?(Returnable)
@@ -98,24 +121,19 @@ module EleetScript
   end
 
   class StringNode
-    INTERPOLATE_RX = /[\\]?%(?:@|@@|\$)?[\w]+?(?=\W|$)/
+    include Interpolatable
 
     def eval(context)
-      context["String"].new_with_value(interpolate(context))
+      context["String"].new_with_value(interpolate(value, context))
     end
+  end
 
-    def interpolate(context)
-      new_val = value.dup
-      matches = value.scan(INTERPOLATE_RX)
-      matches.each do |match|
-        next if match.nil? || match == "%" || match == ""
-        if match.start_with?("\\")
-          next new_val.sub!(match, match[1..-1])
-        end
-        var = match[1..-1]
-        new_val.sub!(match, context[var].call(:to_string).ruby_value)
-      end
-      new_val
+  class RegexNode
+    include Interpolatable
+
+    def eval(context)
+      f_arg = flags.length == 0 ? nil : flags
+      context["Regex"].new_with_value(ESRegex.new(interpolate(pattern, context), f_arg))
     end
   end
 

data/lib/lang/lexer.rb

@@ -19,12 +19,13 @@ module EleetScript
       globals: /\A(\$[a-z][\w\d]*[?!]?)/i,
       class_var: /\A(\@\@[a-z][\w\d]*[!?]?)/i,
       instance_var: /\A(\@[a-z][\w\d]*[!?]?)/i,
-      operator: /\A(->|=>|[.+\-\*\/%<>=!]=|\*\*=|\*\*|[+\-\*\/%=><]|or|and|not|isnt|is|\||\(|\)|\[|\]|\{|\}|::|[.,])/,
+      operator: /\A(->|=>|[.+\-\*\/%<>=!]=|=~|\*\*=|\*\*|[+\-\*\/%=><]|or|and|not|isnt|is|\||\(|\)|\[|\]|\{|\}|::|[.,])/,
       whitespace: /\A([ \t]+)/,
       terminator: /\A([;\n])/,
       integer: /\A([\d_]+)/,
       float: /\A([\d_]*?\.[\d_]+)/,
       string: /\A\"(.*?)(?<!\\)\"/m,
+      regex: /\Ar\"(.*?)(?<!\\)\"([gim]*)/,
       comment: /\A#.*?(?=\n|$)/m
     }
 
@@ -52,6 +53,13 @@ module EleetScript
         elsif instance_var = chunk[TOKEN_RX[:instance_var]]
           tokens << [:INSTANCE_IDENTIFIER, $1]
           i += instance_var.length
+        elsif regex = chunk[TOKEN_RX[:regex]]
+          pattern, flags = $1, $2
+          tokens << [:REGEX, pattern.gsub('\"', '"')]
+          if flags && flags.length > 0
+            tokens << [:REGEX_FLAGS, flags]
+          end
+          i += regex.length
         elsif identifier = chunk[TOKEN_RX[:identifiers]]
           if KEYWORDS.include? identifier
             tokens << [identifier.upcase.gsub(/\?\!/, "").to_sym, identifier]

data/lib/lang/nodes.rb

@@ -66,6 +66,12 @@ module EleetScript
     end
   end
 
+  class RegexNode < Node.new(:pattern, :flags)
+    def to_s(level = 0)
+      "#{spaces(level)}<RegexNode patter=#{pattern} flags=#{flags}>"
+    end
+  end
+
   class CallNode < Node.new(:receiver, :method_name, :arguments, :lambda)
     def to_s(level = 0)
       tabs = spaces(level)