opal 0.3.19 → 0.3.20

data/lib/opal/builder_task.rb

@@ -4,8 +4,7 @@ module Opal
   class BuilderTask
     include Rake::DSL if defined? Rake::DSL
 
-    attr_accessor :name, :build_dir, :specs_dir, :files, :dependencies,
-                  :main, :specs_main
+    attr_accessor :name, :build_dir, :specs_dir, :files, :dependencies
 
     def initialize(namespace = nil)
       @project_dir = Dir.getwd
@@ -16,7 +15,6 @@ module Opal
       @files        = Dir['lib/**/*.{rb,js}']
       @dependencies = []
       @debug_mode   = false
-      @spec_main    = "spec/spec_helper"
 
       yield self if block_given?
 
@@ -29,9 +27,7 @@ module Opal
         :build_dir    => @build_dir,
         :specs_dir    => @specs_dir,
         :files        => @files,
-        :dependencies => @dependencies,
-        :main         => get_main,
-        :specs_main   => @specs_main
+        :dependencies => @dependencies
       }
     end
 
@@ -51,30 +47,17 @@ module Opal
       Builder.build opts
     end
 
-    def get_main
-      return @main if @main
-
-      unless @files.empty?
-        f = @files.first
-        return f.chomp(File.extname(f))
-      end
-
-      nil
-    end
-
     def define_tasks
       define_task :build, "Build Opal Project" do
         name = @debug_mode ? "#@name.debug.js" : "#@name.js"
         build_files :files => @files,
-                    :out   => File.join(@build_dir, "#@name.js"),
-                    :main  => get_main
+                    :out   => File.join(@build_dir, "#@name.js")
       end
 
       define_task :spec, "Build Specs" do
         name = @debug_mode ? "#@name.specs.debug.js" : "#@name.specs.js"
         build_files :files => @specs_dir,
                     :out   => File.join(@build_dir, name),
-                    :main  => @specs_main,
                     :debug => @debug_mode
       end
 

data/lib/opal/grammar.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -710,7 +710,7 @@ clist = [
 ',118,136,134,133,129,130,125,123,116,142,117,459,403,141,,460,,,,,,',
 ',137,138,,135,119,120,121,143,124,126,,,122,,,,,139,140,127,128,,,,',
 ',257,,,,,,,132,131,,118,136,134,133,129,130,125,123,116,142,117,,,141' ]
-        racc_action_table = arr = Array.new(21316, nil)
+        racc_action_table = arr = ::Array.new(21316, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1480,7 +1480,7 @@ clist = [
 '416,416,416,416,416,416,416,416,416,665,665,416,,665,,,,,,,,665,665',
 ',665,665,665,665,665,665,665,,,665,,,,,665,665,665,665,,,,,,665,,,,',
 ',,665,665,,665,665,665,665,665,665,665,665,665,665,665,,,665' ]
-        racc_action_check = arr = Array.new(21316, nil)
+        racc_action_check = arr = ::Array.new(21316, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1730,7 +1730,7 @@ clist = [
 ',,,788,,,,792,815,,,777,,,,,,,,,,,,,,,,,,,,,,239,,,,,,,,,635,,,,,,,',
 ',,,239,,,,,,,,,635,,,,,,,,,,,,,,239,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,',
 ',,725,,,,,,,,,,,297,,,,,,,,,,,,,,,,,,725' ]
-        racc_goto_table = arr = Array.new(2089, nil)
+        racc_goto_table = arr = ::Array.new(2089, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1794,7 +1794,7 @@ clist = [
 ',,,,,,,,,,9,9,,,,,26,,,,9,,,,9,23,,,26,,,,,,,,,,,,,,,,,,,,,,26,,,,,',
 ',,,23,,,,,,,,,,,26,,,,,,,,,23,,,,,,,,,,,,,,26,,,,,,,,,,,,,,,,,,,,,,',
 ',,,,,,,,,,,,9,,,,,,,,,,,9,,,,,,,,,,,,,,,,,,9' ]
-        racc_goto_check = arr = Array.new(2089, nil)
+        racc_goto_check = arr = ::Array.new(2089, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -2183,8 +2183,8 @@ racc_reduce_table = [
   2, 207, :_reduce_344,
   4, 207, :_reduce_345,
   3, 207, :_reduce_346,
-  4, 207, :_reduce_none,
-  3, 207, :_reduce_none,
+  4, 207, :_reduce_347,
+  3, 207, :_reduce_348,
   2, 207, :_reduce_349,
   1, 207, :_reduce_350,
   0, 248, :_reduce_351,
@@ -3635,10 +3635,7 @@ def _reduce_214(val, _values, result)
 end
 
 def _reduce_215(val, _values, result)
-      result = s(:array, val[0])
-      #result.line = val[0].line
-      # FIXME:
-      result = s(:array)
+      result = s(:array, s(:hash, *val[0]))
     
     result
 end
@@ -4321,9 +4318,17 @@ def _reduce_346(val, _values, result)
     result
 end
 
-# reduce 347 omitted
+def _reduce_347(val, _values, result)
+      result = new_call val[0], val[2].intern, val[3]
+    
+    result
+end
 
-# reduce 348 omitted
+def _reduce_348(val, _values, result)
+      result = new_call val[0], val[2].intern, s(:arglist)
+    
+    result
+end
 
 def _reduce_349(val, _values, result)
       result = new_super val[1]

data/lib/opal/grammar.y

@@ -590,10 +590,7 @@ aref_args:
     }
   | assocs trailer
     {
-      result = s(:array, val[0])
-      #result.line = val[0].line
-      # FIXME:
-      result = s(:array)
+      result = s(:array, s(:hash, *val[0]))
     }
 
 paren_args:
@@ -1100,7 +1097,13 @@ method_call:
       result = new_call val[0], :call, val[2]
     }
   | primary_value '::' operation2 paren_args
+    {
+      result = new_call val[0], val[2].intern, val[3]
+    }
   | primary_value '::' operation3
+    {
+      result = new_call val[0], val[2].intern, s(:arglist)
+    }
   | SUPER paren_args
     {
       result = new_super val[1]

data/lib/opal/parser.rb

@@ -55,50 +55,20 @@ module Opal
 
     STATEMENTS = [:xstr, :dxstr]
 
-    DEBUG_CODE = <<-CODE
-      var __const_get = function(const_table, id) {
-        if (const_table && const_table[id]) {
-          return const_table[id];
-        }
-
-        throw new Error('uninitialized constant ' + id);
-      };
-
-      var __send = function(recv, mid, jsid, block) {
-        var args = Array.prototype.slice.call(arguments, 4);
-
-        if (recv == null) {
-          throw new Error("cannot send '" + mid + "' to null");
-        }
-
-        var func = recv[jsid];
-
-        if (!func) {
-          throw new Error(recv + " does not respond to '" + mid + "'");
-        }
-
-        func._p = block;
-
-        return func.apply(recv, args);
-      };
-
-      var __send_splat = function(recv, mid, jsid, block, splat) {
-        return __send.apply(null, [recv, mid, jsid, block].concat(splat));
-      };
-    CODE
-
     attr_reader :grammar
 
+    attr_reader :requires
+
     def self.parse(str)
       self.new.parse str
     end
 
     def initialize(opts = {})
-      @debug = opts[:debug] or false
     end
 
     def parse(source, file = '(file)')
       @file     = file
+      @requires = []
       @helpers  = {
         :breaker   => true,
         :slice     => true
@@ -109,8 +79,12 @@ module Opal
       top @grammar.parse(source, file)
     end
 
-    def raise(msg)
-      super "#{msg} :#{@file}:#{@line}"
+    def warn(msg)
+      puts "#{msg} :#{@file}:#{@line}"
+    end
+
+    def error(msg)
+      raise "#{msg} :#{@file}:#{@line}"
     end
 
     def parser_indent
@@ -152,8 +126,10 @@ module Opal
         }
 
         vars << "__opal = Opal"
+        vars << "self = __opal.top"
         vars << "__scope = __opal"
         vars << "nil = __opal.nil"
+        vars << "def = #{current_self}._klass.prototype" if @scope.defines_defn
         vars.concat @helpers.keys.map { |h| "__#{h} = __opal.#{h}" }
 
         code = "var #{vars.join ', '};\n" + @scope.to_vars + "\n" + code
@@ -162,10 +138,9 @@ module Opal
       pre  = "function() {\n"
       post = ""
 
-      pre += DEBUG_CODE if @debug
       uniques = []
 
-      @unique.times { |i| uniques << "TMP_#{i+1}" }
+      # @unique.times { |i| uniques << "TMP_#{i+1}" }
 
       unless uniques.empty?
         post += ";var #{uniques.join ', '};"
@@ -189,8 +164,17 @@ module Opal
     def indent(&block)
       indent = @indent
       @indent += INDENT
+      @space = "\n#@indent"
       res = yield
       @indent = indent
+      @space = "\n#@indent"
+      res
+    end
+
+    def with_temp(&block)
+      tmp = @scope.new_temp
+      res = yield tmp
+      @scope.queue_temp tmp
       res
     end
 
@@ -220,6 +204,8 @@ module Opal
       meth = "process_#{type}"
       raise "Unsupported sexp: #{type}" unless respond_to? meth
 
+      @line = sexp.line
+
       __send__ meth, sexp, level
     end
 
@@ -229,6 +215,9 @@ module Opal
       case sexp.first
       when :break, :next
         sexp
+      when :yield
+        sexp[0] = :returnable_yield
+        sexp
       when :scope
         sexp
       when :block
@@ -281,7 +270,7 @@ module Opal
         result << (expr ? "#{code};" : code)
       end
 
-      result.join "\n#@indent"
+      result.join(@scope.class_scope? ? "\n\n#@indent" : "\n#@indent")
     end
 
     def process_scope(sexp, level)
@@ -310,16 +299,15 @@ module Opal
       meth, recv, arg = sexp
       mid = mid_to_jsid meth.to_s
 
-      a = @scope.new_temp
-      b = @scope.new_temp
-      l  = process recv, :expr
-      r  = process arg, :expr
-
-      @scope.queue_temp a
-      @scope.queue_temp b
+      with_temp do |a|
+        with_temp do |b|
+          l = process recv, :expr
+          r = process arg, :expr
 
-      "(%s = %s, %s = %s, typeof(%s) === 'number' ? %s %s %s : %s.%s(%s))" %
-      [a, l, b, r, a, a, meth.to_s, b, a, mid, b]
+          "(%s = %s, %s = %s, typeof(%s) === 'number' ? %s %s %s : %s.%s(%s))" %
+            [a, l, b, r, a, a, meth.to_s, b, a, mid, b]
+        end
+      end
     end
 
     def js_block_given(sexp, level)
@@ -327,6 +315,13 @@ module Opal
       "(#{@scope.block_name} !== nil)"
     end
 
+    def handle_block_given(sexp, reverse = false)
+      @scope.uses_block!
+      name = @scope.block_name
+
+      reverse ? "#{ name } === nil" : "#{ name } !== nil"
+    end
+
     # s(:lit, 1)
     # s(:lit, :foo)
     def process_lit(sexp, level)
@@ -398,8 +393,10 @@ module Opal
         "false".inspect
       when :call
         mid = mid_to_jsid part[2].to_s
-        recv = part[1] ? process(part[1], :expr) : 'this'
+        recv = part[1] ? process(part[1], :expr) : current_self
         "(#{recv}.#{mid} ? 'method' : nil)"
+      when :xstr
+        "(typeof(#{process part, :expression}) !== 'undefined')"
       else
         raise "bad defined? part: #{part[0]}"
       end
@@ -457,29 +454,38 @@ module Opal
           end
 
           if block_arg
-            @scope.add_arg block_arg
-            code += "var #{block_arg} = _$ || nil, $context = #{block_arg}.$S;"
+            @scope.block_name = block_arg
+            @scope.add_temp block_arg
+            @scope.add_temp '__context'
+            scope_name = @scope.identify!
+            # @scope.add_arg block_arg
+            # code += "var #{block_arg} = _$ || nil, $context = #{block_arg}.$S;"
+            blk = "\n%s%s = %s._p || nil, __context = %s._s, %s.p = null;\n%s" %
+              [@indent, block_arg, scope_name, block_arg, scope_name, @indent]
+
+            code = blk + code
           end
 
           code += "\n#@indent" + process(body, :stmt)
 
+          if @scope.defines_defn
+            @scope.add_temp 'def = (this._isObject ? this._klass.prototype : this.prototype)'
+          end
+
           code = "\n#@indent#{@scope.to_vars}\n#@indent#{code}"
 
           scope_name = @scope.identity
         end
       end
 
-      tmp = @scope.new_temp
-
-      itercode = "function(#{params.join ', '}) {\n#{code}\n#@indent}"
-      itercode = "#{scope_name} = #{itercode}" if scope_name
+      with_temp do |tmp|
+        itercode = "function(#{params.join ', '}) {\n#{code}\n#@indent}"
+        itercode = "#{scope_name} = #{itercode}" if scope_name
 
-      call << ("(%s = %s, %s._s = this, %s)" % [tmp, itercode, tmp, tmp])
+        call << ("(%s = %s, %s._s = %s, %s)" % [tmp, itercode, tmp, current_self, tmp])
 
-      res = process call, level
-      @scope.queue_temp tmp
-
-      res
+        process call, level
+      end
     end
 
     def js_block_args(sexp)
@@ -518,23 +524,33 @@ module Opal
       out = []
 
       attrs.each do |attr|
-        ivar = attr[1].to_s
+        mid  = attr[1]
+        ivar = "@#{mid}".intern
+        pre  = @scope.proto
 
         unless meth == :attr_writer
-          attr = mid_to_jsid ivar
-          check = "this.#{ivar} == null ? nil : this.#{ivar}"
-          out << "def.#{attr} = function() { return #{check}; }"
+          out << process(s(:defn, mid, s(:args), s(:scope, s(:ivar, ivar))), :stmt)
         end
 
         unless meth == :attr_reader
-          attr = mid_to_jsid "#{ivar}="
-          out << "def.#{attr} = function(val) { return this.#{ivar} = val }"
+          mid = "#{mid}=".intern
+          out << process(s(:defn, mid, s(:args, :val), s(:scope,
+                    s(:iasgn, ivar, s(:lvar, :val)))), :stmt)
         end
       end
 
       out.join ", \n#@indent"
     end
 
+    def handle_alias_native(sexp)
+      args = sexp[2]
+      meth = mid_to_jsid args[1][1].to_s
+      func = args[2][1]
+
+      @scope.methods << meth
+      "%s.%s = %s.%s" % [@scope.proto, meth, @scope.proto, func]
+    end
+
     # s(:call, recv, :mid, s(:arglist))
     # s(:call, nil, :mid, s(:arglist))
     def process_call(sexp, level)
@@ -549,16 +565,19 @@ module Opal
         end
       when :block_given?
         return js_block_given(sexp, level)
+      when :alias_native
+        return handle_alias_native(sexp) if @scope.class_scope?
       when :require
-        # path = arglist[1]
+        path = arglist[1]
 
-        # if path and path[0] == :str
-        #   path_name = path[1].sub(/^opal\//, '')
-        #   @requires << path_name
-        #   return "nil"
-        # else
-        #   raise "Opal cannot do dynamic requires"
-        # end
+        if path and path[0] == :str
+          path_name = path[1].sub(/^opal\//, '')
+          @requires << path_name
+          return "nil"
+        else
+          warn "Opal cannot do dynamic requires"
+          return "nil"
+        end
       end
 
       splat = arglist[1..-1].any? { |a| a.first == :splat }
@@ -649,17 +668,17 @@ module Opal
       body[1] = s(:nil) unless body[1]
 
       code = nil
-      @helpers[:klass] = @helpers[:donate] = true
+      @helpers[:klass] = true
 
       if Symbol === cid or String === cid
-        base = 'this'
-        name = cid.to_s.inspect
+        base = current_self
+        name = cid.to_s
       elsif cid[0] == :colon2
         base = process(cid[1], :expr)
-        name = cid[2].to_s.inspect
+        name = cid[2].to_s
       elsif cid[0] == :colon3
         base = 'Opal.Object'
-        name = cid[1].to_s.inspect
+        name = cid[1].to_s
       else
         raise "Bad receiver in class"
       end
@@ -668,13 +687,21 @@ module Opal
 
       indent do
         in_scope(:class) do
+          @scope.name = name
+          @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
           @scope.donates_methods = true
-          code = @indent + @scope.to_vars + "\n#@indent" + process(body, :stmt)
+          body = process body, :stmt
+          code = @indent + @scope.to_vars + "\n\n#@indent" + body
           code += "\n#{@scope.to_donate_methods}"
         end
       end
 
-      "__klass(#{base}, #{sup}, #{name}, function() {\n#{code}\n#@indent})"
+      spacer  = "\n#{@indent}#{INDENT}"
+      cls     = "function #{name}() {};"
+      boot    = "#{name} = __klass(__base, __super, #{name.inspect}, #{name});"
+      comment = "#{spacer}// line #{ sexp.line }, #{ @file }, class #{ name }#{spacer}"
+
+      "(function(__base, __super){#{comment}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base}, #{sup})"
     end
 
     # s(:sclass, recv, body)
@@ -683,13 +710,13 @@ module Opal
       body = sexp[1]
       code = nil
       base = process recv, :expr
-      @helpers[:sklass] = true
 
       in_scope(:sclass) do
+        @scope.add_temp '__scope = this._scope'
         code = @scope.to_vars + process(body, :stmt)
       end
 
-      "__sklass(#{base}, function() {#{code}})"
+      "(function(){#{ code }}).call(#{ base }.$singleton_class())"
     end
 
     # s(:module, cid, body)
@@ -697,29 +724,37 @@ module Opal
       cid = sexp[0]
       body = sexp[1]
       code = nil
-      @helpers[:module] = @helpers[:donate] = true
+      @helpers[:module] = true
 
       if Symbol === cid or String === cid
-        base = 'this'
-        name = cid.to_s.inspect
+        base = current_self
+        name = cid.to_s
       elsif cid[0] == :colon2
         base = process(cid[1], :expr)
-        name = cid[2].to_s.inspect
+        name = cid[2].to_s
       elsif cid[0] == :colon3
         base = 'Opal.Object'
-        name = cid[1].to_s.inspect
+        name = cid[1].to_s
       else
         raise "Bad receiver in class"
       end
 
       indent do
         in_scope(:module) do
+          @scope.name = name
+          @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
           @scope.donates_methods = true
-          code = @indent + @scope.to_vars + "\n#@indent" + process(body, :stmt) + "\n#@indent" + @scope.to_donate_methods
+          body = process body, :stmt
+          code = @indent + @scope.to_vars + "\n\n#@indent" + body + "\n#@indent" + @scope.to_donate_methods
         end
       end
 
-      "__module(#{base}, #{name}, function() {\n#{code}\n#@indent})"
+      spacer  = "\n#{@indent}#{INDENT}"
+      cls     = "function #{name}() {};"
+      boot    = "#{name} = __module(__base, #{name.inspect}, #{name});"
+      comment = "#{spacer}// line #{ sexp.line }, #{ @file }, module #{ name }#{spacer}"
+
+      "(function(__base){#{comment}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base})"
     end
 
     def process_undef(exp, level)
@@ -730,7 +765,7 @@ module Opal
       # FIXME: maybe add this to donate(). it will be undefined, so
       # when added to includees it will actually undefine methods there
       # too.
-      "delete def.#{jsid}"
+      "delete #{ @scope.proto }.#{jsid}"
     end
 
     # s(:defn, mid, s(:args), s(:scope))
@@ -751,14 +786,15 @@ module Opal
     end
 
     def js_def(recvr, mid, args, stmts, line, end_line)
-      mid = mid_to_jsid mid.to_s
+      jsid = mid_to_jsid mid.to_s
 
       if recvr
         @scope.defines_defs = true
+        smethod = true if @scope.class_scope? && recvr.first == :self
         recv = process(recvr, :expr)
       else
         @scope.defines_defn = true
-        recv = 'this'
+        recv = current_self
       end
 
       code = ''
@@ -784,66 +820,71 @@ module Opal
         end
       end
 
-      # aritycode = arity_check(args, opt, splat) if @debug && false
-
       indent do
-      in_scope(:def) do
-        @scope.mid = mid
+        in_scope(:def) do
+          @scope.mid  = mid
+          @scope.defs = true if recvr
 
-        if block_name
-          @scope.uses_block!
-        end
+          if block_name
+            @scope.uses_block!
+          end
 
-        yielder = block_name || '__yield'
-        @scope.block_name = yielder
+          yielder = block_name || '__yield'
+          @scope.block_name = yielder
 
-        params = process args, :expr
+          params = process args, :expr
 
-        opt[1..-1].each do |o|
-          next if o[2][2] == :undefined
-          id = process s(:lvar, o[1]), :expr
-          code += "if (#{id} == null) {\n#@indent#{INDENT}#{process o, :expr};\n#@indent}"
-        end if opt
+          opt[1..-1].each do |o|
+            next if o[2][2] == :undefined
+            id = process s(:lvar, o[1]), :expr
+            code += ("if (%s == null) {\n%s%s\n%s}" %
+                      [id, @indent + INDENT, process(o, :expre), @indent])
+          end if opt
 
-        code += "#{splat} = __slice.call(arguments, #{len});" if splat
-        code += "\n#@indent" + process(stmts, :stmt)
+          code += "#{splat} = __slice.call(arguments, #{len});" if splat
+          code += "\n#@indent" + process(stmts, :stmt)
 
-        # Returns the identity name if identified, nil otherwise
-        scope_name = @scope.identity
+          # Returns the identity name if identified, nil otherwise
+          scope_name = @scope.identity
 
-        if @scope.uses_block?
-          @scope.add_temp '__context'
-          @scope.add_temp yielder
-          blk = "\n#{@indent}#{yielder} = #{scope_name}._p || nil;\n#{@indent}__context = #{yielder}._s"
-          blk += ";\n#{@indent}#{scope_name}._p = null;\n#{@indent}"
-          code = blk + code
-        end
+          if @scope.uses_block?
+            @scope.add_temp '__context'
+            @scope.add_temp yielder
 
-        if @scope.catches_break?
-          # code = "try {#{code}} catch (e) { if (e === __breaker) { return e.$v; }; throw e;}"
-        end
+            blk = "\n%s%s = %s._p || nil, __context = %s._s, %s._p = null;\n%s" %
+              [@indent, yielder, scope_name, yielder, scope_name, @indent]
 
-        code = "#@indent#{@scope.to_vars}" + code
-      end
+            code = blk + code
+          end
+
+          code = "#@indent#{@scope.to_vars}" + code
+        end
       end
 
       defcode = "#{"#{scope_name} = " if scope_name}function(#{params}) {\n#{code}\n#@indent}"
 
+      comment = "// line #{line}, #{@file}"
+
+      if @scope.class_scope? 
+        comment += ", #{ @scope.name }#{ recvr ? '.' : '#' }#{ mid }"
+      end
+
+      comment += "\n#{@indent}"
+
       if recvr
-        # FIXME: need to donate()
-        "#{recv}.$singleton_class()._proto.#{mid} = #{defcode}"
-      elsif @scope.type == :class
-        @scope.methods << mid# if @scope.donates_methods
-        "def.#{mid} = #{defcode}"
-      elsif @scope.type == :module
-        @scope.methods << mid
-        "def.#{mid} = #{defcode}"
+        if smethod
+          @scope.smethods << jsid
+          "#{ comment }#{ @scope.name }.#{jsid} = #{defcode}"
+        else
+          "#{recv}.$singleton_class().prototype.#{jsid} = #{defcode}"
+        end
+      elsif @scope.class_scope?
+        @scope.methods << jsid
+        "#{ comment }#{ @scope.proto }.#{jsid} = #{defcode}"
       elsif @scope.type == :iter
-        # FIXME: this should also donate()
-        "def.#{mid} = #{defcode}"
+        "def.#{jsid} = #{defcode}"
       else
-        # FIXME: this should also donate()
-        "def.#{mid} = #{defcode}"
+        "def.#{jsid} = #{defcode}"
       end
     end
 
@@ -878,7 +919,20 @@ module Opal
 
     # s(:self)  # => this
     def process_self(sexp, level)
-      'this'
+      current_self
+    end
+
+    # Returns the current value for 'self'. This will be native
+    # 'this' for methods and blocks, and the class name for class
+    # and module bodies.
+    def current_self
+      if @scope.class_scope?
+        @scope.name
+      elsif @scope.top?
+        'self'
+      else
+        'this'
+      end
     end
 
     # s(:true)  # => true
@@ -960,7 +1014,7 @@ module Opal
       @scope.queue_temp redo_var
 
       if stmt_level == :stmt_closure
-        code = "(function() {#{code}; return nil;}).call(this)"
+        code = "(function() {#{code}; return nil;}).call(#{current_self})"
       end
 
       code
@@ -996,23 +1050,25 @@ module Opal
       @scope.queue_temp redo_var
 
       if stmt_level == :stmt_closure
-        code = "(function() {#{code}; return nil;}).call(this)"
+        code = "(function() {#{code}; return nil;}).call(#{current_self})"
       end
 
       code
     end
 
-    ##
     # alias foo bar
     #
     # s(:alias, s(:lit, :foo), s(:lit, :bar))
     def process_alias(exp, level)
-      @helpers['alias'] = true
       new = mid_to_jsid exp[0][1].to_s
       old = mid_to_jsid exp[1][1].to_s
-      # "__alias(this, #{new.inspect}, #{old.inspect})"
-      @scope.methods << new
-      "def.#{new} = def.#{old}"
+
+      if [:class, :module].include? @scope.type
+        @scope.methods << new
+        "%s.%s = %s.%s" % [@scope.proto, new, @scope.proto, old]
+      else
+        "def.%s = def.%s" % [new, old]
+      end
     end
 
     def process_masgn(sexp, level)
@@ -1080,7 +1136,7 @@ module Opal
       ivar = exp[0]
       rhs = exp[1]
       ivar = ivar.to_s[1..-1]
-      lhs = RESERVED.include?(ivar) ? "this['#{ivar}']" : "this.#{ivar}"
+      lhs = RESERVED.include?(ivar) ? "#{current_self}['#{ivar}']" : "#{current_self}.#{ivar}"
       "#{lhs} = #{process rhs, :expr}"
     end
 
@@ -1089,19 +1145,19 @@ module Opal
       ivar = exp.shift.to_s[1..-1]
       part = RESERVED.include?(ivar) ? "['#{ivar}']" : ".#{ivar}"
       @scope.add_ivar part
-      "this#{part}"
+      "#{current_self}#{part}"
     end
 
     # s(:gvar, gvar)
     def process_gvar(sexp, level)
-      gvar = sexp.shift.to_s
+      gvar = sexp.shift.to_s[1..-1]
       @helpers['gvars'] = true
       "__gvars[#{gvar.inspect}]"
     end
 
     # s(:gasgn, :gvar, rhs)
     def process_gasgn(sexp, level)
-      gvar = sexp[0]
+      gvar = sexp[0].to_s[1..-1]
       rhs  = sexp[1]
       @helpers['gvars'] = true
       "__gvars[#{gvar.to_s.inspect}] = #{process rhs, :expr}"
@@ -1109,11 +1165,7 @@ module Opal
 
     # s(:const, :const)
     def process_const(sexp, level)
-      if @debug
-        "__const_get(__scope, #{sexp.shift.to_s.inspect})"
-      else
-        "__scope.#{sexp.shift}"
-      end
+      "__scope.#{sexp.shift}"
     end
 
     # s(:cdecl, :const, rhs)
@@ -1201,12 +1253,21 @@ module Opal
         falsy = returns(falsy || s(:nil))
       end
 
-      code = "if (#{js_truthy test}) {\n"
+      # optimize unless (we don't want else unless we need to)
+      if falsy and !truthy
+        truthy = falsy
+        falsy  = nil
+        check  = js_falsy test
+      else
+        check = js_truthy test
+      end
+
+      code = "if (#{check}) {\n"
       indent { code += @indent + process(truthy, :stmt) } if truthy
       indent { code += "\n#@indent} else {\n#@indent#{process falsy, :stmt}" } if falsy
       code += "\n#@indent}"
 
-      code = "(function() { #{code}; return nil; }).call(this)" if returnable
+      code = "(function() { #{code}; return nil; }).call(#{current_self})" if returnable
 
       code
     end
@@ -1218,7 +1279,12 @@ module Opal
           return process sexp, :expr
         elsif COMPARE.include? mid.to_s
           return process sexp, :expr
+        elsif mid == :"=="
+          return process sexp, :expr
         end
+      elsif [:lvar, :self].include? sexp.first
+        name = process sexp, :expr
+        "#{name} !== false && #{name} !== nil"
       end
     end
 
@@ -1227,10 +1293,22 @@ module Opal
         return optimized
       end
 
-      tmp = @scope.new_temp
-      @scope.queue_temp tmp
+      with_temp do |tmp|
+        "(%s = %s) !== false && %s !== nil" % [tmp, process(sexp, :expr), tmp]
+      end
+    end
 
-      "(%s = %s) !== false && %s !== nil" % [tmp, process(sexp, :expr), tmp]
+    def js_falsy(sexp)
+      if sexp.first == :call
+        mid = sexp[2]
+        if mid == :block_given?
+          return handle_block_given(sexp, true)
+        end
+      end
+
+      with_temp do |tmp|
+        "(%s = %s) === false || %s === nil" % [tmp, process(sexp, :expr), tmp]
+      end
     end
 
     # s(:and, lhs, rhs)
@@ -1272,36 +1350,48 @@ module Opal
     end
 
     # s(:yield, arg1, arg2)
-    #
-    # FIXME: yield as an expression (when used with js_return) should have the
-    # right action. We should then warn when used as an expression in other cases
-    # that we would need to use a try/catch/throw block (which is slow and bad
-    # mmmkay).
     def process_yield(sexp, level)
+      call = handle_yield_call sexp, level
+
+      if level == :stmt
+        "if (#{call} === __breaker) return __breaker.$v"
+      else
+        call
+      end
+    end
+
+    # Created by `#returns()` for when a yield statement should return
+    # it's value (its last in a block etc).
+    def process_returnable_yield(sexp, level)
+      call = handle_yield_call sexp, level
+
+      with_temp do |tmp|
+        "return %s = #{call}, %s === __breaker ? __breaker.$v : %s" %
+          [tmp, tmp, tmp]
+      end
+    end
+
+    def handle_yield_call(sexp, level)
       @scope.uses_block!
+
       splat = sexp.any? { |s| s.first == :splat }
       sexp.unshift s(:js_tmp, '__context') unless splat
-      args = process_arglist(sexp, level)
+      args = process_arglist sexp, level
 
-      yielder = @scope.block_name || '__yield'
+      y = @scope.block_name || '__yield'
 
-      if splat
-        "#{yielder}.apply(__context, #{args})"
-      else
-        "#{yielder}.call(#{args})"
-      end
+      splat ? "#{y}.apply(__context, #{args})" : "#{y}.call(#{args})"
     end
 
     def process_break(exp, level)
       val = exp.empty? ? 'nil' : process(exp.shift, :expr)
       if in_while?
-        if @while_loop[:closure]
-          "return #{val};"
-        else
-          "break;"
-        end
+        @while_loop[:closure] ? "return #{ val };" : "break;"
+      elsif @scope.iter?
+        error "break must be used as a statement" unless level == :stmt
+        "return (__breaker.$v = #{ val }, __breaker)"
       else
-        "return (__breaker.$v = #{val}, __breaker)"
+        error "cannot use break outside of iter/while"
       end
     end
 
@@ -1330,8 +1420,8 @@ module Opal
 
       code << "else {return nil}" if returnable and !done_else
 
-      code = "$case = #{expr};#{code.join "\n"}"
-      code = "(function() { #{code} }).call(this)" if returnable
+      code = "$case = #{expr};#{code.join @space}"
+      code = "(function() { #{code} }).call(#{current_self})" if returnable
       code
     end
 
@@ -1352,7 +1442,7 @@ module Opal
           call  = s(:call, s(:js_tmp, "$splt[i]"), :===, s(:arglist, s(:js_tmp, "$case")))
           splt  = "(function($splt) {for(var i = 0; i < $splt.length; i++) {"
           splt += "if (#{process call, :expr}) { return true; }"
-          splt += "} return false; }).call(this, #{process a[1], :expr})"
+          splt += "} return false; }).call(#{current_self}, #{process a[1], :expr})"
 
           test << splt
         else
@@ -1364,7 +1454,7 @@ module Opal
         end
       end
 
-      "if (%s) {\n%s\n}" % [test.join(' || '), body]
+      "if (%s) {%s%s%s}" % [test.join(' || '), @space, body, @space]
     end
 
     # lhs =~ rhs
@@ -1381,9 +1471,10 @@ module Opal
     #
     # s(:cvar, name)
     def process_cvar(exp, level)
-      tmp = @scope.new_temp
-      @scope.queue_temp tmp
-      "((%s = Opal.cvars[%s]) == null ? nil : %s)" % [tmp, exp.shift.to_s.inspect, tmp]
+      with_temp do |tmp|
+        "((%s = Opal.cvars[%s]) == null ? nil : %s)" %
+          [tmp, exp.shift.to_s.inspect, tmp]
+      end
     end
 
     # @@name = rhs
@@ -1432,15 +1523,16 @@ module Opal
     def js_super args
       if @scope.type == :def
         identity = @scope.identify!
+        cls_name = @scope.parent.name
+        jsid     = mid_to_jsid @scope.mid.to_s
+        base     = @scope.defs ? '' : ".prototype"
 
-        # FIXME: only use `._proto` when inside normal def. remove it
-        # for `def self.foo`.
-        "__class._super._proto.#{@scope.mid}.apply(this, #{args})"
+        "%s._super%s.%s.apply(this, %s)" % [cls_name, base, jsid, args]
 
       elsif @scope.type == :iter
         chain, defn, mid = @scope.get_super_chain
-        trys = chain.map { |c| "#{c}._jsid" }.join ' || '
-        "this._klass._super._proto[#{trys} || #{mid}].apply(this, #{args})"
+        trys = chain.map { |c| "#{c}._sup" }.join ' || '
+        "(#{trys} || this._klass._super._proto[#{mid}]).apply(this, #{args})"
 
       else
         raise "Cannot call super() from outside a method block"
@@ -1470,14 +1562,13 @@ module Opal
       if op.to_s == "||"
         raise "op_asgn2 for ||"
       else
-        temp = @scope.new_temp
-        getr = s(:call, s(:js_tmp, temp), mid, s(:arglist))
-        oper = s(:call, getr, op, s(:arglist, rhs))
-        asgn = s(:call, s(:js_tmp, temp), "#{mid}=", s(:arglist, oper))
+        with_temp do |temp|
+          getr = s(:call, s(:js_tmp, temp), mid, s(:arglist))
+          oper = s(:call, getr, op, s(:arglist, rhs))
+          asgn = s(:call, s(:js_tmp, temp), "#{mid}=", s(:arglist, oper))
 
-        "(#{temp} = #{lhs}, #{process asgn, :expr})".tap {
-          @scope.queue_temp temp
-        }
+          "(#{temp} = #{lhs}, #{process asgn, :expr})"
+        end
       end
     end
 
@@ -1494,8 +1585,8 @@ module Opal
       ensr = process ensr, level
       body = "try {\n#{body}}" unless body =~ /^try \{/
 
-      res = "#{body}\n finally {\n#{ensr}}"
-      res = "(function() { #{res}; }).call(this)" if retn
+      res = "#{body}#{@space}finally {#{@space}#{ensr}}"
+      res = "(function() { #{res}; }).call(#{current_self})" if retn
       res
     end
 
@@ -1512,8 +1603,8 @@ module Opal
       # if no rescue statement captures our error, we should rethrow
       parts << "else { throw $err; }"
 
-      code = "try {\n#@indent#{body}\n#@indent} catch ($err) {\n#@indent#{parts.join "\n"}\n}"
-      code = "(function() { #{code} }).call(this)" if level == :expr
+      code = "try {#@space#{body}#@space} catch ($err) {#@space#{parts.join @space}#{@space}}"
+      code = "(function() { #{code} }).call(#{current_self})" if level == :expr
 
       code
     end
@@ -1538,7 +1629,7 @@ module Opal
         val = process(val, :expr) + ";"
       end
 
-      "if (#{err}) {\n#{val}#{body}}"
+      "if (#{err}) {#{@space}#{val}#{body}}"
       # raise exp.inspect
     end