myco 0.1.3 → 0.1.4

data/lib/myco/core/FileToplevel.my

@@ -9,12 +9,23 @@
   
   # Run the code in the given file, ignoring the return value but
   # importing the constants defined therein into the current namespace.
-  import: Decorator {
-    apply: |meme, *args| {
+  var import: Decorator {
+    apply: |meme| {
       load_paths = [meme.target.instance.dirname]
       scope = meme.target.constant_scope
       component = Myco.eval_file(meme.name.to_s, load_paths, false, scope)
-      meme.target.include(component)
+      
+      const_name = meme.metadata[:as]
+      const_name &? (
+        meme.target.const_set(const_name, component)
+      ) ?? (
+        meme.target.include(component)
+      )
     }
   }
+  # Force an import to assign to a constant in the current namespace
+  # instead of being included into the current namespace.
+  var as: Decorator {
+    apply: |meme, given| meme.metadata[:as] = given
+  }
 }

data/lib/myco/core/FileToplevel.my.rb

@@ -5,17 +5,32 @@
   declare_meme(:dirname, [], nil, ::Myco.cscope.dup) { |*| (self.component.instance_variable_get("@dirname"))}
   declare_meme(:basename, [], nil, ::Myco.cscope.dup) { |*| (self.component.instance_variable_get("@basename"))}
   declare_meme(:filename, [], nil, ::Myco.cscope.dup) { |*| (self.component.instance_variable_get("@filename"))}
-  __category__(:decorators).component_eval {(declare_meme(:import, [], nil, ::Myco.cscope.dup) { |*| (::Myco::Component.new([::Myco.find_constant(:Decorator)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
-  .tap { |__c__| __c__.__last__ = __c__.component_eval {(declare_meme(:apply, [], nil, ::Myco.cscope.dup) { |meme, *args| (
-    load_paths = [meme.target.instance.dirname]
-    scope = meme.target.constant_scope
-    component = ::Myco.find_constant(:Myco).eval_file(
-      meme.name.to_s,
-      load_paths,
-      false,
-      scope
-    )
-    meme.target.include(component)
-  )})}}.instance)})}
+  __category__(:decorators).component_eval {(
+    declare_meme(:import, [[:var, []]], nil, ::Myco.cscope.dup) { |*| (::Myco::Component.new([::Myco.find_constant(:Decorator)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
+    .tap { |__c__| __c__.__last__ = __c__.component_eval {(declare_meme(:apply, [], nil, ::Myco.cscope.dup) { |meme| (
+      load_paths = [meme.target.instance.dirname]
+      scope = meme.target.constant_scope
+      component = ::Myco.find_constant(:Myco).eval_file(
+        meme.name.to_s,
+        load_paths,
+        false,
+        scope
+      )
+      const_name = meme.metadata.__send__(
+        :[],
+        :as
+      )
+      ::Myco.branch_op(:"??", ::Myco.branch_op(:"&?", const_name) {meme.target.const_set(
+        const_name,
+        component
+      )}) {meme.target.include(component)}
+    )})}}.instance)}
+    declare_meme(:as, [[:var, []]], nil, ::Myco.cscope.dup) { |*| (::Myco::Component.new([::Myco.find_constant(:Decorator)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
+    .tap { |__c__| __c__.__last__ = __c__.component_eval {(declare_meme(:apply, [], nil, ::Myco.cscope.dup) { |meme, given| (meme.metadata.__send__(
+      :[]=,
+      :as,
+      given
+    ))})}}.instance)}
+  )}
 )}}
 .tap { |__c__| __c__.__name__ = :FileToplevel })}}.instance

data/lib/myco/eval.rb

@@ -1,37 +1,12 @@
 
 module Myco
   
-  # Most of method is stolen from Rubinius implementation of Kernel#eval
-  # TODO: remove in favor of CodeLoader
-  def self.eval(string, scope=nil, filename=nil, lineno=nil, type=:myco)
-    string = StringValue(string)
-    filename = StringValue(filename) if filename
-    lineno = Rubinius::Type.coerce_to lineno, Fixnum, :to_i if lineno
-    lineno = 1 if filename && !lineno
-    
-    binding = ::Binding.setup(Rubinius::VariableScope.of_sender,
-                              Rubinius::CompiledCode.of_sender,
-                              (scope||Rubinius::ConstantScope.of_sender),
-                              self)
-    
-    filename ||= "(eval)"
-    
-    lineno ||= binding.line_number
-    
-    existing_scope = binding.constant_scope
-    binding.constant_scope = existing_scope.dup
-    
-    compiler_class = case type
-    when :myco; Myco::ToolSet::Compiler
-    when :ruby; Rubinius::ToolSets::Runtime::Compiler
-    else; raise NotImplementedError
-    end
-    
-    be = compiler_class.construct_block string, binding, filename, lineno
-    
-    result = be.call_on_instance(binding.self)
-    binding.constant_scope = existing_scope
-    result
+  # TODO: deprecate with proper import set of functions
+  def self.eval string, call_depth:1
+    loader = Myco::CodeLoader::MycoLoader.new("(eval)")
+    loader.bind_to(call_depth: call_depth + 1)
+    loader.string = string
+    loader.load
   end
   
   # TODO: deprecate with proper import set of functions
@@ -41,12 +16,7 @@ module Myco
     get_last ? file_toplevel.component.__last__ : file_toplevel.component
   end
   
-  def self.file_to_ruby use_path
-    parser = Myco::ToolSet::Parser.new(use_path, 1, [])
-    ast = parser.parse_string File.read(use_path)
-    ast.to_ruby_code
-  end
-  
+  # TODO: replace backtrace in a different way, without this hack
   def self.rescue
     begin
       yield

data/lib/myco/version.rb

@@ -1,13 +1,10 @@
 
 module Myco
-  MYCO_VERSION = '0.1.3'
+  MYCO_VERSION = '0.1.4'
   
   MYCO_REQUIRED_GEMS = [
     ['rubinius-toolset',   '~> 2.3'],
-    ['rubinius-melbourne', '~> 2.2'],
-    ['rubinius-processor', '~> 2.2'],
     ['rubinius-compiler',  '~> 2.2'],
-    ['rubinius-ast',       '~> 2.2'],
   ]
   
   # TODO: move elsewhere?

data/lib/myco.rb

@@ -8,32 +8,30 @@ require_relative 'myco/misc'
 require_relative 'myco/backtrace'
 require_relative 'myco/bootstrap'
 
-Myco.rescue do
-  # TODO: be more clever here communicating the load path for bootstrapping
-  Myco::CoreLoadPath = File.expand_path('myco', File.dirname(__FILE__))
-  Myco.eval_file 'myco/bootstrap.my'
-end
 
-# Load the boot toolset from (possibly old) cached bytecode files
-module Myco
-  ToolSet = Rubinius::ToolSets.create :myco_boot do
-    require "rubinius/melbourne"
-    require "rubinius/processor"
-    require "rubinius/compiler"
-    require "rubinius/ast"
-    
-    require_relative 'myco/parser'
-  end
+# Detect whether a second pass is necessary (when no bytecode is available)
+# TODO: recursively check mtime for all rbc files as well,
+#   to be sure that core implementation files don't need to be recompiled.
+if File.file?(File.expand_path('myco/bootstrap.my.rbc', File.dirname(__FILE__)))
+  stages = [:myco]
+else
+  stages = [:myco_boot, :myco]
 end
 
-# Load the runtime toolset from the latest code
-module Myco
-  ToolSet = Rubinius::ToolSets.create :myco do
-    require "rubinius/melbourne"
-    require "rubinius/processor"
+# Run the stages, ultimately creating the runtime toolset
+# First pass:  Load the boot toolset (when only ruby source code is available)
+# Second pass: Load the runtime toolset using the boot toolset to parse it
+stages.each do |toolset_name|
+  Myco::ToolSet = Rubinius::ToolSets.create toolset_name do
+    
+    Myco.rescue do
+      # TODO: be more clever here communicating the load path for bootstrapping
+      Myco::CoreLoadPath = File.expand_path('myco', File.dirname(__FILE__))
+      Myco.eval_file 'myco/bootstrap.my'
+    end
+    
     require "rubinius/compiler"
-    require "rubinius/ast"
     
-    require_relative 'myco/parser'
+    require_relative 'myco/code_tools'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myco
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joe McIlvain
@@ -24,34 +24,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  name: rubinius-melbourne
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  name: rubinius-processor
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -66,20 +38,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  name: rubinius-ast
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -201,6 +159,79 @@ files:
 - lib/myco/bootstrap/meme.rb
 - lib/myco/bootstrap/void.rb
 - lib/myco/code_loader.rb
+- lib/myco/code_tools.rb
+- lib/myco/code_tools/AST.my
+- lib/myco/code_tools/AST.my.rb
+- lib/myco/code_tools/AST/ArgumentAssembly.my
+- lib/myco/code_tools/AST/ArgumentAssembly.my.rb
+- lib/myco/code_tools/AST/ArrayAssembly.my
+- lib/myco/code_tools/AST/ArrayAssembly.my.rb
+- lib/myco/code_tools/AST/BlockArgument.my
+- lib/myco/code_tools/AST/BlockArgument.my.rb
+- lib/myco/code_tools/AST/BlockLiteral.my
+- lib/myco/code_tools/AST/BlockLiteral.my.rb
+- lib/myco/code_tools/AST/BlockParameter.my
+- lib/myco/code_tools/AST/BlockParameter.my.rb
+- lib/myco/code_tools/AST/Body.my
+- lib/myco/code_tools/AST/Body.my.rb
+- lib/myco/code_tools/AST/BranchOperator.my
+- lib/myco/code_tools/AST/BranchOperator.my.rb
+- lib/myco/code_tools/AST/ConstantAccess.my
+- lib/myco/code_tools/AST/ConstantAccess.my.rb
+- lib/myco/code_tools/AST/ConstantAssignment.my
+- lib/myco/code_tools/AST/ConstantAssignment.my.rb
+- lib/myco/code_tools/AST/ConstantDefine.my
+- lib/myco/code_tools/AST/ConstantDefine.my.rb
+- lib/myco/code_tools/AST/ConstantReopen.my
+- lib/myco/code_tools/AST/ConstantReopen.my.rb
+- lib/myco/code_tools/AST/DeclareCategory.my
+- lib/myco/code_tools/AST/DeclareCategory.my.rb
+- lib/myco/code_tools/AST/DeclareDecorator.my
+- lib/myco/code_tools/AST/DeclareDecorator.my.rb
+- lib/myco/code_tools/AST/DeclareFile.my
+- lib/myco/code_tools/AST/DeclareFile.my.rb
+- lib/myco/code_tools/AST/DeclareMeme.my
+- lib/myco/code_tools/AST/DeclareMeme.my.rb
+- lib/myco/code_tools/AST/DeclareObject.my
+- lib/myco/code_tools/AST/DeclareObject.my.rb
+- lib/myco/code_tools/AST/DeclareString.my
+- lib/myco/code_tools/AST/DeclareString.my.rb
+- lib/myco/code_tools/AST/DynamicString.my
+- lib/myco/code_tools/AST/DynamicString.my.rb
+- lib/myco/code_tools/AST/DynamicSymbol.my
+- lib/myco/code_tools/AST/DynamicSymbol.my.rb
+- lib/myco/code_tools/AST/Invoke.my
+- lib/myco/code_tools/AST/Invoke.my.rb
+- lib/myco/code_tools/AST/InvokeMethod.my
+- lib/myco/code_tools/AST/InvokeMethod.my.rb
+- lib/myco/code_tools/AST/KeywordAssembly.my
+- lib/myco/code_tools/AST/KeywordAssembly.my.rb
+- lib/myco/code_tools/AST/LocalVariableAccessAmbiguous.my
+- lib/myco/code_tools/AST/LocalVariableAccessAmbiguous.my.rb
+- lib/myco/code_tools/AST/LocalVariableAssignment.my
+- lib/myco/code_tools/AST/LocalVariableAssignment.my.rb
+- lib/myco/code_tools/AST/MycoModuleScope.my
+- lib/myco/code_tools/AST/MycoModuleScope.my.rb
+- lib/myco/code_tools/AST/Node.my
+- lib/myco/code_tools/AST/Node.my.rb
+- lib/myco/code_tools/AST/ParameterAssembly.my
+- lib/myco/code_tools/AST/ParameterAssembly.my.rb
+- lib/myco/code_tools/AST/Quest.my
+- lib/myco/code_tools/AST/Quest.my.rb
+- lib/myco/code_tools/AST/Script.my
+- lib/myco/code_tools/AST/Script.my.rb
+- lib/myco/code_tools/AST/SplatValue.my
+- lib/myco/code_tools/AST/SplatValue.my.rb
+- lib/myco/code_tools/AST/StringLiteral.my
+- lib/myco/code_tools/AST/StringLiteral.my.rb
+- lib/myco/code_tools/AST/SymbolLiteral.my
+- lib/myco/code_tools/AST/SymbolLiteral.my.rb
+- lib/myco/code_tools/AST/ToRuby.my
+- lib/myco/code_tools/AST/ToRuby.my.rb
+- lib/myco/code_tools/AST/misc.my
+- lib/myco/code_tools/AST/misc.my.rb
+- lib/myco/code_tools/parser.rb
+- lib/myco/code_tools/parser/peg_parser.rb
 - lib/myco/command.my
 - lib/myco/command.my.rb
 - lib/myco/command/inoculate.my
@@ -221,29 +252,6 @@ files:
 - lib/myco/core/Switch.my.rb
 - lib/myco/eval.rb
 - lib/myco/misc.rb
-- lib/myco/parser.rb
-- lib/myco/parser/ast.rb
-- lib/myco/parser/ast/ToRuby.my
-- lib/myco/parser/ast/ToRuby.my.rb
-- lib/myco/parser/ast/argument_assembly.rb
-- lib/myco/parser/ast/array_assembly.rb
-- lib/myco/parser/ast/branch_operator.rb
-- lib/myco/parser/ast/constant_access.rb
-- lib/myco/parser/ast/constant_define.rb
-- lib/myco/parser/ast/constant_reopen.rb
-- lib/myco/parser/ast/declare_category.rb
-- lib/myco/parser/ast/declare_decorator.rb
-- lib/myco/parser/ast/declare_file.rb
-- lib/myco/parser/ast/declare_meme.rb
-- lib/myco/parser/ast/declare_object.rb
-- lib/myco/parser/ast/declare_string.rb
-- lib/myco/parser/ast/invoke.rb
-- lib/myco/parser/ast/invoke_method.rb
-- lib/myco/parser/ast/local_variable_access_ambiguous.rb
-- lib/myco/parser/ast/misc.rb
-- lib/myco/parser/ast/myco_module_scope.rb
-- lib/myco/parser/ast/quest.rb
-- lib/myco/parser/peg_parser.rb
 - lib/myco/tools/BasicCommand.my
 - lib/myco/tools/BasicCommand.my.rb
 - lib/myco/tools/mycompile.my

data/lib/myco/parser/ast/argument_assembly.rb

@@ -1,76 +0,0 @@
-
-module CodeTools::AST
-  
-  module BuilderMethods
-    def argass loc, body
-      ArgumentAssembly.new loc.line, body
-    end
-  end
-  
-  class ArgumentAssembly < Node
-    attr_accessor :body, :block
-    
-    def initialize(line, body, block=nil)
-      @line = line
-      @body = body
-      
-      # TODO: error for multiple block arguments
-      @block = body.pop if body.last.is_a?(BlockPass)
-    end
-    
-    # All items before the first SplatValue
-    def pre_group
-      @body.take_while { |item| !item.is_a?(SplatValue) }
-    end
-    
-    # All items after and including the first SplatValue
-    def post_group
-      @body.drop_while { |item| !item.is_a?(SplatValue) }
-    end
-    
-    # Symbol of bytecode operation to use for send
-    def send_op
-      if @body.detect { |item| item.is_a?(SplatValue) }
-        :send_with_splat
-      elsif @block
-        :send_with_block
-      else
-        :send
-      end
-    end
-    
-    # Number of arguments to use for send operation
-    def send_count
-      pre_group.size
-    end
-    
-    def splat_bytecode(g)
-      ArrayAssembly.new(@line, post_group).bytecode(g)
-    end
-    
-    def block_bytecode(g)
-      @block ? @block.bytecode(g) : g.push_nil
-    end
-    
-    def bytecode(g)
-      pos(g)
-      
-      pre_group.each { |item| item.bytecode(g) }
-      
-      case send_op
-      when :send_with_splat
-        splat_bytecode(g)
-        block_bytecode(g)
-      when :send_with_block
-        block_bytecode(g)
-      end
-    end
-    
-    def to_sexp
-      sexp = [:arglist] + @body.map(&:to_sexp)
-      sexp.push(@block.to_sexp) if @block
-      sexp
-    end
-  end
-   
-end

data/lib/myco/parser/ast/array_assembly.rb

@@ -1,57 +0,0 @@
-
-module CodeTools::AST
-  
-  module BuilderMethods
-    def arrass loc, body
-      ArrayAssembly.new loc.line, body
-    end
-  end
-  
-  class ArrayAssembly < Node
-    attr_accessor :body
-    
-    def initialize(line, body)
-      @line = line
-      @body = body
-    end
-    
-    def bytecode(g)
-      pos(g)
-      
-      if @body.empty?
-        g.make_array(0)
-        return
-      end
-      
-      # Group the @body into chunks of splats and non-splats
-      chunked = @body.chunk { |item| item.is_a?(SplatValue) }
-      
-      # Each SplatValue outputs the bytecode of a single array
-      # Non-SplatValues are grouped to output the bytecode of
-      # a single array for each contiguous group.  Along the way, the
-      # arrays are concatenated to form one final array on the stack.
-      first_bytecode = true
-      chunked.each do |is_splat_group, group|
-        if is_splat_group
-          group.each { |item|
-            item.bytecode(g)
-            g.send(:concat, 1) unless first_bytecode
-            first_bytecode = false
-          }
-        else
-          group.each { |item|
-            item.bytecode(g)
-          }
-          g.make_array(group.size)
-          g.send(:concat, 1) unless first_bytecode
-          first_bytecode = false
-        end
-      end
-    end
-    
-    def to_sexp
-      [:array] + @body.map(&:to_sexp)
-    end
-  end
-   
-end

data/lib/myco/parser/ast/branch_operator.rb

@@ -1,73 +0,0 @@
-
-module CodeTools::AST
-  
-  module BuilderMethods
-    def branch_op loc, type, left, right
-      BranchOperator.new loc.line, type, left, right
-    end
-  end
-  
-  class BranchOperator < Node
-    attr_accessor :type
-    attr_accessor :left
-    attr_accessor :right
-    
-    def initialize line, type, left, right
-      @line  = line
-      @type  = type
-      @left  = left
-      @right = right
-    end
-    
-    def bytecode g
-      pos(g)
-      
-      done_label = g.new_label
-      right_label = g.new_label
-      can_push_void = false
-      
-      @left.bytecode(g)
-      
-      case type
-      when :"&&"
-        g.dup_top
-        g.send :false?, 0
-        g.goto_if_true done_label
-        g.pop
-      when :"||"
-        g.dup_top
-        g.send :false?, 0
-        g.goto_if_false done_label
-        g.pop
-      when :"??"
-        g.dup_top
-        g.send :void?, 0
-        g.goto_if_false done_label
-        g.pop
-      when :"&?"
-        g.send :false?, 0
-        g.goto_if_false right_label
-        otherwise_push_void = true
-      when :"|?"
-        g.send :false?, 0
-        g.goto_if_true right_label
-        otherwise_push_void = true
-      end
-      
-      if otherwise_push_void
-        g.push_void
-        g.goto done_label
-        
-        right_label.set!
-      end
-      
-      @right.bytecode(g)
-      done_label.set!
-    end
-    
-    def to_sexp
-      [:branch_op, @type, @left.to_sexp, @right.to_sexp]
-    end
-  end
-  
-end

data/lib/myco/parser/ast/constant_access.rb

@@ -1,15 +0,0 @@
-
-module CodeTools::AST
-  # Monkey patch original to use ::Myco to look up constants
-  class ConstantAccess
-    def bytecode(g)
-      pos(g)
-      
-      g.push_cpath_top
-      g.find_const :Myco
-        g.push_literal @name
-        g.push_scope
-      g.send :find_constant, 2
-    end
-  end
-end

data/lib/myco/parser/ast/constant_define.rb

@@ -1,40 +0,0 @@
-
-module CodeTools::AST
-  
-  module BuilderMethods
-    def cdefn loc, name, object
-      ConstantDefine.new loc.line, name, object
-    end
-  end
-  
-  class ConstantDefine < Node
-    attr_accessor :name, :object
-    
-    def initialize line, name, object
-      @line   = line
-      @name   = name
-      @object = object
-      @object.create = false
-    end
-    
-    def to_sexp
-      [:cdefn, @name.name, @object.to_sexp]
-    end
-    
-    def implementation
-      ConstantAssignment.new @line, @name, @object
-    end
-    
-    def bytecode g
-      pos(g)
-      
-      implementation.bytecode g
-      
-      g.dup_top
-        g.push_literal @name.name
-      g.send :__name__=, 1
-      g.pop
-    end
-  end
-  
-end

data/lib/myco/parser/ast/constant_reopen.rb

@@ -1,46 +0,0 @@
-
-require_relative 'myco_module_scope'
-
-
-module CodeTools::AST
-  
-  module BuilderMethods
-    def copen loc, name, body
-      ConstantReopen.new loc.line, name, body
-    end
-  end
-  
-  class ConstantReopenScope < MycoModuleScope
-    def body_bytecode g
-      g.push_scope
-      g.send :set_myco_component, 0
-      g.pop
-      
-      @body.bytecode g
-    end
-  end
-  
-  class ConstantReopen < Node
-    attr_accessor :name, :body
-    
-    def initialize line, name, body
-      @line   = line
-      @name   = name
-      @body   = body
-    end
-    
-    def to_sexp
-      [:copen, @name.name, @body.to_sexp]
-    end
-    
-    def bytecode g
-      pos(g)
-      
-      scope = ConstantReopenScope.new @line, @body
-      
-      @name.bytecode g
-      scope.bytecode g
-    end
-  end
-  
-end