opal 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd073f86d2b6572a34ed96ac1e8bc35e14be214
-  data.tar.gz: 5f55dcc5f1e555bc2d53afababdfedd8a1fc480e
+  metadata.gz: 77632aecb99342d5830be4046997f6f1c4b57c5a
+  data.tar.gz: d0b98b8c4bb8a0cd0e047e45507c4edabdf5a504
 SHA512:
-  metadata.gz: 8db2e2f1545e635e7822d52fe6a009ac2d50d335bd7a2855e0ac44f5eff366171106eec3d783ef3600924d60d28c042d634056119b594f54fa44d1f600952776
-  data.tar.gz: ba90ff768744ca87c6d5a54070292d6d6877dfbf4c3c21bdaa3fe73d13258acfaeea85bf8900251b42d325ce78a7b80b1479606cd1ec504516dd7bb4595f86f3
+  metadata.gz: 767a17fdba3738a6dadf6d3d567a5b695ec69bf540d70278af7b0ce1c8a8a529e4c90d1a2f1518486637857dfe8decc1c41ced22d7d99271c4a2b7f727be6db3
+  data.tar.gz: 1b17efbff47540101001edb95dc5190bcbf39218a47f4f8f983a4698c3dec4958e1149ba6ddb3e781b2131071dd8f42a04f0b41768ba7ff067c4079ef8c1b315

data/README.md

@@ -98,6 +98,8 @@ StringScanner, Date, etc.
 
 ## License
 
+(The MIT License)
+
 Copyright (C) 2013 by Adam Beynon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/opal.rb

@@ -6,11 +6,6 @@ require 'opal/version'
 # Opal is a ruby to javascript compiler, with a runtime for running
 # in any javascript environment.
 module Opal
-
-  def self.compile(source, options = {})
-    Compiler.new.compile(source, options)
-  end
-
   def self.gem_dir
     File.expand_path('..', __FILE__.untaint)
   end

data/lib/opal/compiler.rb

@@ -1,11 +1,13 @@
 require 'set'
 require 'opal/parser'
-require 'opal/target_scope'
-require 'opal/version'
 require 'opal/fragment'
 require 'opal/nodes'
 
 module Opal
+  def self.compile(source, options = {})
+    Compiler.new.compile(source, options)
+  end
+
   class Compiler
     # Generated code gets indented with two spaces on each scope
     INDENT = '  '
@@ -15,10 +17,8 @@ module Opal
     COMPARE = %w[< > <= >=]
 
     # defines a compiler option, also creating method of form 'name?'
-    def self.compiler_option(name, default_value)
-      mid = [true, false].include?(default_value) ? "#{name}?" : name
-
-      define_method(mid) do
+    def self.compiler_option(name, default_value, mid = nil)
+      define_method(mid || name) do
         @options.fetch(name) { default_value }
       end
     end
@@ -27,16 +27,16 @@ module Opal
     compiler_option :file, '(file)'
 
     # adds method stubs for all used methods in file
-    compiler_option :method_missing, true
+    compiler_option :method_missing, true, :method_missing?
 
     # adds an arity check to every method definition
-    compiler_option :arity_check, false
+    compiler_option :arity_check, false, :arity_check?
 
     # checks every constant access, delagating to const_missing if needed
-    compiler_option :const_missing, false
+    compiler_option :const_missing, false, :const_missing?
 
     # compile top level local vars with support for irb style vars
-    compiler_option :irb, false
+    compiler_option :irb, false, :irb?
 
     # how to handle dynamic requires (:error, :warning, :ignore)
     compiler_option :dynamic_require_severity, :error
@@ -44,13 +44,7 @@ module Opal
     attr_reader :result, :fragments
 
     # Current scope
-    attr_reader :scope
-
-    # Any helpers required by this file
-    attr_reader :helpers
-
-    # Method calls made in this file
-    attr_reader :method_calls
+    attr_accessor :scope
 
     # Current case_stmt
     attr_reader :case_stmt
@@ -60,9 +54,6 @@ module Opal
       @indent = ''
       @unique = 0
       @options = {}
-
-      @method_calls = Set.new
-      @helpers = Set.new([:breaker, :slice])
     end
 
     # Compile some ruby code to a string.
@@ -70,10 +61,9 @@ module Opal
       @source = source
       @options.update options
 
-      @sexp = Parser.new.parse(@source, self.file)
+      @sexp = s(:top, Parser.new.parse(@source, self.file) || s(:nil))
 
-      top_node = Nodes::TopNode.new(@sexp, :expr, self)
-      @fragments = top_node.compile_to_fragments.flatten
+      @fragments = process(@sexp).flatten
 
       @result = @fragments.map(&:code).join('')
     end
@@ -82,6 +72,16 @@ module Opal
       Opal::SourceMap.new(@fragments, source_file || self.file)
     end
 
+    # Any helpers required by this file
+    def helpers
+      @helpers ||= Set.new([:breaker, :slice])
+    end
+
+    # Method calls made in this file
+    def method_calls
+      @method_calls ||= Set.new
+    end
+
     # This is called when a parsing/processing error occurs. This
     # method simply appends the filename and curent line number onto
     # the message and raises it.
@@ -124,27 +124,7 @@ module Opal
 
     # Use the given helper
     def helper(name)
-      @helpers << name
-    end
-
-    # Every time the parser enters a new scope, this is called with
-    # the scope type as an argument. Valid types are `:top` for the
-    # top level/file scope; `:class`, `:module` and `:sclass` for the
-    # obvious ruby classes/modules; `:def` and `:iter` for methods
-    # and blocks respectively.
-    #
-    # This method just pushes a new instance of `Opal::Scope` onto the
-    # stack, sets the new scope as the `@scope` variable, and yields
-    # the given block. Once the block returns, the old scope is put
-    # back on top of the stack.
-    def in_scope(type)
-      return unless block_given?
-
-      parent = @scope
-      @scope = TargetScope.new(type, self).tap { |s| s.parent = parent }
-      yield @scope
-
-      @scope = parent
+      self.helpers << name
     end
 
     # To keep code blocks nicely indented, this will yield a block after

data/lib/opal/nodes/base.rb

@@ -23,18 +23,15 @@ module Opal
         end
       end
 
-      attr_reader :compiler
+      attr_reader :compiler, :type
 
       def initialize(sexp, level, compiler)
         @sexp = sexp
+        @type = sexp.type
         @level = level
         @compiler = compiler
       end
 
-      def type
-        @sexp.type
-      end
-
       def children
         @sexp[1..-1]
       end
@@ -119,15 +116,15 @@ module Opal
       end
 
       def add_local(name)
-        scope.add_local name.to_sym
+        scope.add_scope_local name.to_sym
       end
 
       def add_ivar(name)
-        scope.add_ivar name
+        scope.add_scope_ivar name
       end
 
       def add_temp(temp)
-        scope.add_temp temp
+        scope.add_scope_temp temp
       end
 
       def helper(name)

data/lib/opal/nodes/call.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'opal/nodes/base'
+require 'opal/nodes/runtime_helpers'
 
 module Opal
   module Nodes
@@ -99,6 +100,9 @@ module Opal
             push result
           return true
           end
+        elsif RuntimeHelpers.compatible?(recvr, meth, arglist)
+          push(RuntimeHelpers.new(@sexp, @level, @compiler).compile)
+          return true
         end
       end
 

data/lib/opal/nodes/class.rb

@@ -12,13 +12,13 @@ module Opal
         helper :klass
 
         push "(function($base, $super) {"
-        line "  function #{name}(){};"
-        line "  var self = #{name} = $klass($base, $super, '#{name}', #{name});"
+        line "  function $#{name}(){};"
+        line "  var self = $#{name} = $klass($base, $super, '#{name}', $#{name});"
 
-        in_scope(:class) do
+        in_scope do
           scope.name = name
-          add_temp "#{scope.proto} = #{name}._proto"
-          add_temp "$scope = #{name}._scope"
+          add_temp "#{scope.proto} = $#{name}._proto"
+          add_temp "$scope = $#{name}._scope"
 
           body_code = self.body_code
           empty_line
@@ -35,8 +35,7 @@ module Opal
       end
 
       def body_code
-        body[1] = s(:nil) unless body[1]
-        stmt(compiler.returns(body))
+        stmt(compiler.returns(body || s(:nil)))
       end
     end
   end

data/lib/opal/nodes/def.rb

@@ -1,9 +1,9 @@
-require 'opal/nodes/base_scope'
+require 'opal/nodes/scope'
 
 module Opal
   module Nodes
     # FIXME: needs rewrite
-    class DefNode < BaseScopeNode
+    class DefNode < ScopeNode
       handle :def
 
       children :recvr, :mid, :args, :stmts
@@ -40,7 +40,7 @@ module Opal
           arity_code = arity_check(args, opt, uses_splat, block_name, mid)
         end
 
-        in_scope(:def) do
+        in_scope do
           scope.mid = mid
           scope.defs = true if recvr
 
@@ -53,7 +53,7 @@ module Opal
           scope.block_name = yielder
 
           params = process(args)
-          stmt_code = stmt(stmts)
+          stmt_code = stmt(compiler.returns(stmts))
 
           add_temp 'self = this'
 

data/lib/opal/nodes/definitions.rb

@@ -13,20 +13,6 @@ module Opal
       end
     end
 
-    # :scope nodes are actually inside scopes (e.g. :module, :class).
-    # These are not actually the scopes themselves.
-    class ScopeNode < Base
-      handle :scope
-
-      children :body
-
-      def compile
-        body = self.body || s(:nil)
-        body = compiler.returns(body) unless scope.class_scope?
-        push stmt(body)
-      end
-    end
-
     class UndefNode < Base
       handle :undef
 

data/lib/opal/nodes/iter.rb

@@ -1,25 +1,15 @@
-require 'opal/nodes/base_scope'
+require 'opal/nodes/scope'
 
 module Opal
   module Nodes
-    # FIXME: this needs a rewrite very urgently
-    class IterNode < BaseScopeNode
+    class IterNode < ScopeNode
       handle :iter
 
       children :args_sexp, :body_sexp
 
       def compile
-        # opt args are last (if present) and are a s(:block)
-        if args.last.is_a?(Sexp) and args.last.type == :block
-          opt_args = args.pop
-          opt_args.shift
-        end
-
-        # does this iter define a block_pass
-        if args.last.is_a?(Sexp) and args.last.type == :block_pass
-          block_arg = args.pop
-          block_arg = block_arg[1][1].to_sym
-        end
+        opt_args  = extract_opt_args
+        block_arg = extract_block_arg
 
         # find any splat args
         if args.last.is_a?(Sexp) and args.last.type == :splat
@@ -31,31 +21,13 @@ module Opal
         params = args_to_params(args[1..-1])
         params << splat if splat
 
-        to_vars = identity = nil
+        to_vars = identity = body_code = nil
 
-        in_scope(:iter) do
+        in_scope do
           identity = scope.identify!
           add_temp "self = #{identity}._s || this"
 
-
-          args[1..-1].each_with_index do |arg, idx|
-            if arg.type == :lasgn
-              arg = variable(arg[1])
-
-              if opt_args and current_opt = opt_args.find { |s| s[1] == arg.to_sym }
-                push "if (#{arg} == null) #{arg} = ", expr(current_opt[2]), ";"
-              else
-                push "if (#{arg} == null) #{arg} = nil;"
-              end
-            elsif arg.type == :array
-              arg[1..-1].each_with_index do |_arg, _idx|
-                _arg = variable(_arg[1])
-                push "#{_arg} = #{params[idx]}[#{_idx}];"
-              end
-            else
-              raise "Bad block arg type"
-            end
-          end
+          compile_args(args[1..-1], opt_args, params)
 
           if splat
             scope.add_arg splat
@@ -70,13 +42,54 @@ module Opal
             line "#{block_arg} = #{scope_name}._p || nil, #{scope_name}._p = null;"
           end
 
-          line stmt(body)
+          body_code = stmt(body)
           to_vars = scope.to_vars
         end
 
+        line body_code
+
         unshift to_vars
-        unshift "function(#{params.join ', '}) {"
-        wrap "(#{identity} = ", "}, #{identity}._s = self, #{identity})"
+
+        unshift "(#{identity} = function(#{params.join ', '}){"
+        push "}, #{identity}._s = self, #{identity})"
+      end
+
+      def compile_args(args, opt_args, params)
+        args.each_with_index do |arg, idx|
+          if arg.type == :lasgn
+            arg = variable(arg[1])
+
+            if opt_args and current_opt = opt_args.find { |s| s[1] == arg.to_sym }
+              push "if (#{arg} == null) #{arg} = ", expr(current_opt[2]), ";"
+            else
+              push "if (#{arg} == null) #{arg} = nil;"
+            end
+          elsif arg.type == :array
+            arg[1..-1].each_with_index do |_arg, _idx|
+              _arg = variable(_arg[1])
+              push "#{_arg} = #{params[idx]}[#{_idx}];"
+            end
+          else
+            raise "Bad block arg type"
+          end
+        end
+      end
+
+      # opt args are last (if present) and are a s(:block)
+      def extract_opt_args
+        if args.last.is_a?(Sexp) and args.last.type == :block
+          opt_args = args.pop
+          opt_args.shift
+          opt_args
+        end
+      end
+
+      # does this iter define a block_pass
+      def extract_block_arg
+        if args.last.is_a?(Sexp) and args.last.type == :block_pass
+          block_arg = args.pop
+          block_arg = block_arg[1][1].to_sym
+        end
       end
 
       def args

data/lib/opal/nodes/literal.rb

@@ -6,51 +6,56 @@ module Opal
       handle :true, :false, :self, :nil
 
       def compile
-        # :self, :true, :false, :nil
         push type.to_s
       end
     end
 
-    class LiteralNode < Base
-      children :value
-    end
-
-    class NumericNode < LiteralNode
+    class NumericNode < Base
       handle :int, :float
 
+      children :value
+
       def compile
         push value.to_s
         wrap '(', ')' if recv?
       end
     end
 
-    class StringNode < LiteralNode
+    class StringNode < Base
       handle :str
 
+      children :value
+
       def compile
         push value.inspect
       end
     end
 
-    class SymbolNode < LiteralNode
+    class SymbolNode < Base
       handle :sym
 
+      children :value
+
       def compile
         push value.to_s.inspect
       end
     end
 
-    class RegexpNode < LiteralNode
+    class RegexpNode < Base
       handle :regexp
 
+      children :value
+
       def compile
         push((value == // ? /^/ : value).inspect)
       end
     end
 
-    class XStringNode < LiteralNode
+    class XStringNode < Base
       handle :xstr
 
+      children :value
+
       def needs_semicolon?
         stmt? and !value.to_s.include?(';')
       end
@@ -158,35 +163,27 @@ module Opal
       end
     end
 
-    class ExclusiveRangeNode < Base
-      handle :dot2
+    class InclusiveRangeNode < Base
+      handle :irange
 
       children :start, :finish
 
       def compile
         helper :range
 
-        push "$range("
-        push expr(start)
-        push ", "
-        push expr(finish)
-        push ", false)"
+        push '$range(', expr(start), ', ', expr(finish), ', false)'
       end
     end
 
-    class InclusiveRangeNode < Base
-      handle :dot3
+    class ExclusiveRangeNode < Base
+      handle :erange
 
       children :start, :finish
 
       def compile
         helper :range
 
-        push "$range("
-        push expr(start)
-        push ", "
-        push expr(finish)
-        push ", true)"
+        push '$range(', expr(start), ', ', expr(finish), ', true)'
       end
     end
   end