opal · Nov 13, 2013 · Nov 13, 2013
Showing with 21 additions and 24 deletions.

+20 −24 lib/opal/compiler.rb

+1 −0 lib/opal/nodes/top.rb
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -13,10 +13,8 @@ class Compiler
     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
@@ -25,30 +23,24 @@ def self.compiler_option(name, default_value)
     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
 
     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
@@ -58,20 +50,16 @@ def initialize
       @indent = ''
       @unique = 0
       @options = {}
-
-      @method_calls = Set.new
-      @helpers = Set.new([:breaker, :slice])
     end
 
     # Compile some ruby code to a string.
     def compile(source, options = {})
       @source = source
       @options.update options
 
-      @sexp = Parser.new.parse(@source, self.file) || s(:nil)
+      @sexp = s(:top, Parser.new.parse(@source, self.file) || s(:nil))
 
-      top_node = Nodes::TopNode.new(s(:top, @sexp), :expr, self)
-      @fragments = top_node.compile_to_fragments.flatten
+      @fragments = process(@sexp).flatten
 
       @result = @fragments.map(&:code).join('')
     end
@@ -80,6 +68,16 @@ def source_map(source_file = nil)
       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.
@@ -122,11 +120,9 @@ def unique_temp
 
     # Use the given helper
     def helper(name)
-      @helpers << name
+      self.helpers << name
     end
 
-    attr_accessor :scope
-
     # To keep code blocks nicely indented, this will yield a block after
     # adding an extra layer of indent, and then returning the resulting
     # code after reverting the indent.

diff --git a/lib/opal/nodes/top.rb b/lib/opal/nodes/top.rb
@@ -5,6 +5,7 @@ module Opal
   module Nodes
     # Generates code for an entire file, i.e. the base sexp
     class TopNode < BaseScopeNode
+      handle :top
 
       children :body