myco 0.1.0.dev → 0.1.0

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

@@ -1,9 +1,9 @@
 
 module CodeTools::AST
   
-  module ProcessorMethods
-    def process_lambig line, name
-      LocalVariableAccessAmbiguous.new line, name
+  module BuilderMethods
+    def lambig loc, name
+      LocalVariableAccessAmbiguous.new loc.line, name
     end
   end
   
@@ -18,21 +18,17 @@ module CodeTools::AST
     def bytecode g
       pos(g)
       
-      implementation(g).bytecode(g)
+      local = g.state.scope.search_local @name
+      return local.get_bytecode(g) if local
+      
+      rcvr = Self.new @line
+      send = Send.new @line, rcvr, @name, true, true
+      send.bytecode(g)
     end
     
     def to_sexp
       [:lambig, @name]
     end
-    
-    def implementation g
-      if g.state.scope.variables.has_key? @name
-        LocalVariableAccess.new @line, @name
-      else
-        rcvr = Self.new @line
-        Send.new @line, rcvr, @name, true, true
-      end
-    end
   end
   
 end

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

@@ -1,13 +1,127 @@
 
 module CodeTools::AST
   
-  module ProcessorMethods
-    def process_null line
-      NullLiteral.new line
+  # These builder methods are copied directly from rubinius-processor
+  # TODO: remove and Myco-ize all dependencies on rubinius-processor and rubinius-ast
+  module BuilderMethods
+    def colon2 loc, outer, name
+      if outer
+        if outer.kind_of? ConstantAccess and
+           outer.name == :Rubinius
+          case name
+          when :Type
+            TypeConstant.new loc.line
+          when :Mirror
+            MirrorConstant.new loc.line
+          else
+            ScopedConstant.new loc.line, outer, name
+          end
+        else
+          ScopedConstant.new loc.line, outer, name
+        end
+      else
+        ConstantAccess.new loc.line, name
+      end
+    end
+    
+    def colon3 loc, name
+      ToplevelConstant.new loc.line, name
+    end
+    
+    def const loc, name
+      ConstantAccess.new loc.line, name
+    end
+    
+    def lit loc, sym
+      SymbolLiteral.new loc.line, sym
+    end
+    
+    def args loc, required, optional, splat, post, kwargs, kwrest, block
+      Parameters.new loc.line, required, optional, splat, post, kwargs, kwrest, block
+    end
+    
+    def self loc
+      Self.new loc.line
+    end
+    
+    def block loc, array
+      Block.new loc.line, array
+    end
+    
+    def str loc, str
+      StringLiteral.new loc.line, str
+    end
+    
+    def splat loc, expr
+      SplatValue.new loc.line, expr
+    end
+    
+    def block_pass loc, arguments, body
+      BlockPass19.new loc.line, arguments, body
+    end
+    
+    def evstr loc, value
+      if value
+        ToString.new loc.line, value
+      else
+        StringLiteral.new loc.line, ""
+      end
+    end
+    
+    def dsym loc, str, array
+      DynamicSymbol.new loc.line, str, array
+    end
+
+    def dstr loc, str, array
+      DynamicString.new loc.line, str, array
     end
     
-    def process_void line
-      VoidLiteral.new line
+    def true loc
+      TrueLiteral.new loc.line
+    end
+
+    def false loc
+      FalseLiteral.new loc.line
+    end
+
+    def return loc, value
+      Return.new loc.line, value
+    end
+    
+    def lasgn loc, name, value
+      LocalVariableAssignment.new loc.line, name, value
+    end
+    
+    def hash loc, array
+      HashLiteral.new loc.line, array
+    end
+    
+    def cdecl loc, expr, value
+      ConstantAssignment.new loc.line, expr, value
+    end
+    
+    def op_cdecl loc, var, value, op
+      op_value = case op
+      when :and
+        And.new loc.line, var, value
+      when :or
+        Or.new loc.line, var, value
+      else
+        args = ArrayLiteral.new loc.line, [value]
+        SendWithArguments.new loc.line, var, op, args
+      end
+      ConstantAssignment.new loc.line, var, op_value
+    end
+  end
+  
+  # These builder methods process the null and void literals
+  module BuilderMethods
+    def null loc
+      NullLiteral.new loc.line
+    end
+    
+    def void loc
+      VoidLiteral.new loc.line
     end
   end
   
@@ -20,14 +134,18 @@ module CodeTools::AST
   # Replace NilLiteral with NullLiteral and let original NilLiteral "disappear"
   NilLiteral = NullLiteral
   
+  class ::CodeTools::Generator
+    def push_void
+      push_cpath_top
+      find_const :Myco
+      find_const :Void
+    end
+  end
+  
   class VoidLiteral < Node
     def bytecode(g)
       pos(g)
-      
-      # TODO: create push_void helper to abstract this out (and elsewhere)
-      g.push_cpath_top
-      g.find_const :Myco
-      g.find_const :Void
+      g.push_void
     end
     
     def to_sexp
@@ -35,27 +153,4 @@ module CodeTools::AST
     end
   end
   
-  
-  # Patch the And (and Or) Node bytecode to use .false? to determine falsehood
-  # This accomodates treating Void (or any other non-builtin) as falsey
-  # TODO: use new branch instruction when it gets added to Rubinius
-  class And
-    def bytecode(g, use_git=true)
-      @left.bytecode(g)
-      g.dup
-      lbl = g.new_label
-      
-      g.send :false?, 0
-      if use_git
-        g.git lbl
-      else
-        g.gif lbl
-      end
-      
-      g.pop
-      @right.bytecode(g)
-      lbl.set!
-    end
-  end
-  
 end

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

@@ -11,6 +11,11 @@ module CodeTools::AST
     def bytecode(g)
       pos(g)
       
+      # Register in the AST as a scope for local variable lookup
+      # Right now, this just sets @parent to g.state.scope
+      # (Necessary to pass local variables from above to memes below)
+      g.state.scope.nest_scope self
+      
       attach_and_call g, :__myco_module_init__, true
     end
     
@@ -53,6 +58,27 @@ module CodeTools::AST
     def body_bytecode g
       @body.bytecode g
     end
+    
+    include CodeTools::Compiler::LocalVariables
+    
+    # Become the AST scope parent of the given AST scope Node .
+    # This is only for the benefit of LocalVariableAccessAmbiguous
+    # being able to call search_local, and has nothing to do with
+    # the scope referenced by g.push_scope or g.add_scope
+    def nest_scope scope
+      scope.parent = self
+    end
+    
+    attr_accessor :parent
+    
+    # This is an abbreviated form of Iter#search_local
+    # because no locals can be assigned within the MycoModuleScope
+    def search_local name
+      if reference = @parent.search_local(name)
+        reference.depth += 1
+        reference
+      end
+    end
   end
   
 end

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

@@ -1,9 +1,9 @@
 
 module CodeTools::AST
   
-  module ProcessorMethods
-    def process_quest line, receiver, questable
-      Quest.new line, receiver, questable
+  module BuilderMethods
+    def quest loc, receiver, questable
+      Quest.new loc.line, receiver, questable
     end
   end
   

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

@@ -0,0 +1,15 @@
+
+class CodeTools::AST::ArrayAssembly
+  def to_ruby g
+    if @body.empty?
+      g.add("[]")
+    else
+      g.add("[")
+      g.push_indent
+        @body[0...-1].each { |item| g.line(item); g.add(",") }
+        @body.last.tap     { |item| g.line(item) }
+      g.pop_indent
+      g.line("]")
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/block.rb

@@ -0,0 +1,14 @@
+
+class CodeTools::AST::Block
+  def to_ruby g
+    if @array.empty?
+      g.add("()")
+    else
+      g.add("(")
+      g.push_indent
+        @array.each { |item| g.line(item) }
+      g.pop_indent
+      g.line(")")
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/block_pass.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::BlockPass
+  def to_ruby g
+    g.add("&"); g.add(@body)
+  end
+end

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

@@ -0,0 +1,9 @@
+
+class CodeTools::AST::BranchOperator
+  def to_ruby g
+    g.add('::Myco.branch_op(');
+      g.add(@type.inspect); g.add(', ');
+      g.add(@left); g.add(') {');
+      g.add(@right); g.add('}')
+  end
+end

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

@@ -0,0 +1,10 @@
+
+class CodeTools::AST::ConstantAccess
+  def to_ruby g
+    g.add("::Myco.find_constant(#{@name.inspect})")
+  end
+  
+  def to_ruby_assign g, value
+    g.add("::Myco.cscope.for_method_definition.const_set(#{@name.inspect}, "); g.add(value); g.add(")")
+  end
+end

data/lib/myco/parser/ast/to_ruby/constant_assignment.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::ConstantAssignment
+  def to_ruby g
+    @constant.to_ruby_assign(g, @value)
+  end
+end

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

@@ -0,0 +1,9 @@
+
+class CodeTools::AST::ConstantDefine
+  def to_ruby g
+    g.add(implementation)
+    g.line(".tap { |__c__| __c__.__name__ = ")
+      g.add(@name.name.inspect)
+    g.add(" }")
+  end
+end

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

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::ConstantReopen
+  def to_ruby g
+    g.add(@name); g.add(".component_eval {"); g.add(@body); g.add("}")
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_category.rb

@@ -0,0 +1,7 @@
+
+class CodeTools::AST::DeclareCategory
+  def to_ruby g
+    g.add("__category__(#{@name.value.inspect})")
+      g.add(".component_eval {"); g.add(@body); g.add("}")
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_decorator.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::DeclareDecorator
+  def to_ruby g
+    g.add("[#{@name.value.inspect}, "); g.add(@arguments); g.add("]")
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_file.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::DeclareFile
+  def to_ruby g
+    implementation.to_ruby(g)
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_meme.rb

@@ -0,0 +1,16 @@
+
+class CodeTools::AST::DeclareMeme
+  def to_ruby g
+    g.with_nested_var_scope(body_implementation) {
+      g.var_scope_declare_locals(@arguments.names)
+      
+      g.add("declare_meme(")
+      g.add("#{@name.inspect}, ")
+      g.add(@decorations); g.add(", nil, ::Myco.cscope.dup)")
+      g.add(" { ");
+        g.add(@arguments); g.add(" ")
+        g.add(@body);
+      g.add("}")
+    }
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_object.rb

@@ -0,0 +1,8 @@
+
+class CodeTools::AST::DeclareObject
+  def to_ruby g
+    g.add("::Myco::Component.new("); g.add(@types); g.add(", ::Myco.cscope.for_method_definition, __FILE__, __LINE__)")
+    g.line(".tap { |__c__| __c__.__last__ = __c__.component_eval {"); g.add(scope_implementation); g.add("}}")
+    g.add(".instance") if @create
+  end
+end

data/lib/myco/parser/ast/to_ruby/declare_string.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::DeclareString
+  def to_ruby g
+    g.add(implementation)
+  end
+end

data/lib/myco/parser/ast/to_ruby/dynamic_string.rb

@@ -0,0 +1,14 @@
+
+class CodeTools::AST::DynamicString
+  def to_ruby g
+    inspect_escape = Proc.new { |str| str.inspect[1...-1] }
+    
+    g.add('"')
+      g.add(inspect_escape.call(@string))
+      @array.each_slice(2) { |interpolated, inner_string|
+        g.add('#{'); g.add(interpolated.value); g.add('}')
+        g.add(inspect_escape.call(inner_string.value))
+      }
+    g.add('"')
+  end
+end

data/lib/myco/parser/ast/to_ruby/dynamic_symbol.rb

@@ -0,0 +1,7 @@
+
+class CodeTools::AST::DynamicSymbol
+  def to_ruby g
+    g.add(':') # prefix with ':', but...
+    super # delegate to DynamicString implementation
+  end
+end

data/lib/myco/parser/ast/to_ruby/eval_expression.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::EvalExpression
+  def to_ruby g
+    g.add(@body)
+  end
+end

data/lib/myco/parser/ast/to_ruby/false_literal.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::FalseLiteral
+  def to_ruby g
+    g.add("false")
+  end
+end

data/lib/myco/parser/ast/to_ruby/hash_literal.rb

@@ -0,0 +1,16 @@
+
+class CodeTools::AST::HashLiteral
+  def to_ruby g
+    list = @array.each_slice(2).to_a
+    if list.empty?
+      g.add("{}")
+    else
+      g.add("{")
+      g.push_indent
+        list[0...-1].each { |key, value| g.line(key); g.add(" => "); g.add(value); g.add(",") }
+        list.last.tap     { |key, value| g.line(key); g.add(" => "); g.add(value) }
+      g.pop_indent
+      g.line("}")
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/invoke.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::Invoke
+  def to_ruby g
+    g.add(implementation)
+  end
+end

data/lib/myco/parser/ast/to_ruby/invoke_method.rb

@@ -0,0 +1,35 @@
+
+module CodeTools::AST
+  class InvokeMethod
+    def to_ruby g
+      list = @arguments ? @arguments.body.dup : []
+      list.push(@arguments.block) if @arguments.block.is_a?(BlockPass)
+      
+      g.add(@receiver)
+      
+      if g.easy_ident?(@name)
+        g.add(".#{@name}")
+      else
+        g.add(".__send__")
+        list.unshift(SymbolLiteral.new(@line, @name))
+      end
+      
+      if list.empty?
+        g.add("")
+      elsif list.size == 1
+        g.add("("); g.add(list.first); g.add(")")
+      else
+        g.add("(")
+        g.push_indent
+          list[0...-1].each { |item| g.line(item); g.add(",") }
+          list.last.tap     { |item| g.line(item) }
+        g.pop_indent
+        g.line(")")
+      end
+      
+      if @arguments.block.is_a?(Iter)
+        (g.add(" {"); g.add(@arguments.block); g.add("}"))
+      end
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/iter.rb

@@ -0,0 +1,10 @@
+
+class CodeTools::AST::Iter
+  def to_ruby g
+    g.with_nested_var_scope(self) {
+      g.var_scope_declare_locals(@arguments.names)
+      
+      g.add(" "); g.add(@arguments); g.add(" "); g.add(@body)
+    }
+  end
+end

data/lib/myco/parser/ast/to_ruby/local_variable_access_ambiguous.rb

@@ -0,0 +1,16 @@
+
+class CodeTools::AST::LocalVariableAccessAmbiguous
+  def to_ruby g
+    if g.var_scope_has_local?(@name)
+      g.add(@name.to_s)
+    else
+      g.add("self")
+      
+      if g.easy_ident?(@name)
+        g.add(".#{@name}")
+      else
+        g.add(".__send__(#{name.inspect})")
+      end
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/local_variable_assignment.rb

@@ -0,0 +1,8 @@
+
+class CodeTools::AST::LocalVariableAssignment
+  def to_ruby g
+    g.var_scope_declare_local(@name)
+    g.var_scope.variables[@name] = true
+    g.add(@name.to_s); g.add(" = "); g.add(value)
+  end
+end

data/lib/myco/parser/ast/to_ruby/myco_module_scope.rb

@@ -0,0 +1,8 @@
+
+class CodeTools::AST::MycoModuleScope
+  def to_ruby g
+    g.with_nested_var_scope(self) {
+      g.add(@body)
+    }
+  end
+end

data/lib/myco/parser/ast/to_ruby/null_literal.rb

@@ -0,0 +1,6 @@
+
+class CodeTools::AST::NullLiteral
+  def to_ruby g
+    g.add("nil")
+  end
+end

data/lib/myco/parser/ast/to_ruby/parameters.rb

@@ -0,0 +1,60 @@
+
+module CodeTools::AST
+  class Parameters
+    def to_ruby g
+      list = []
+      list_add = Proc.new { |&blk| list.push(Proc.new(&blk)) }
+      
+      @required.each { |item| list_add.call { g.add(item.to_s) } }
+      
+      if @defaults
+        @defaults.arguments.each { |asgn|
+          name = asgn.name
+          value = asgn.value
+          list_add.call {
+            g.add("#{name}=")
+            g.add(value) unless value.is_a?(SymbolLiteral) and value.value==:*
+          }
+        }
+      end
+      
+      if @splat == :*
+        list_add.call { g.add("*") }
+      elsif @splat
+        list_add.call { g.add("*#{@splat}") }
+      end
+      
+      if @keywords
+        @keywords.arguments.each { |asgn|
+          name = asgn.name
+          value = asgn.value
+          list_add.call {
+            g.add("#{name}:")
+            g.add(value) unless value.is_a?(SymbolLiteral) and value.value==:*
+          }
+        }
+        
+        if @keywords.kwrest == true
+          list_add.call { g.add("**") }
+        elsif @keywords.kwrest
+          list_add.call { g.add("**#{@keywords.kwrest.name}") }
+        end
+      end
+      
+      if @block_arg
+        list_add.call { g.add("&#{@block_arg.name}") }
+      end
+      
+      if list.empty?
+        g.add("||")
+      else
+        g.add("|")
+        g.push_indent
+          list[0...-1].each { |proc| proc.call; g.add(", ") }
+          list.last.tap     { |proc| proc.call }
+        g.pop_indent
+        g.add("|")
+      end
+    end
+  end
+end

data/lib/myco/parser/ast/to_ruby/quest.rb

@@ -0,0 +1,13 @@
+
+class CodeTools::AST::Quest
+  def to_ruby g
+    associated_questable = @questable.dup
+    associated_questable.receiver = @receiver
+    
+    g.add("(")
+      g.add(@receiver); g.add(".respond_to?(#{@questable.name.inspect}).false?")
+      g.add(" ? ::Myco::Void : ")
+      g.add(associated_questable)
+    g.add(")")
+  end
+end

data/lib/myco/parser/ast/to_ruby/return.rb

@@ -0,0 +1,7 @@
+
+class CodeTools::AST::Return
+  def to_ruby g
+    g.add("return ")
+    g.add(@value)
+  end
+end

data/lib/myco/parser/ast/to_ruby/scoped_constant.rb

@@ -0,0 +1,11 @@
+
+class CodeTools::AST::ScopedConstant
+  def to_ruby g
+    g.add(@parent); g.add("::#{@name}")
+  end
+  
+  def to_ruby_assign g, value
+    to_ruby(g)
+    g.add(" = "); g.add(value)
+  end
+end