Keep nodes under Opal::Nodes namespace

opal · Oct 23, 2013 · 5f56be9 · 5f56be9
1 parent 4526c65
commit 5f56be9
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 21 deletions.
diff --git a/lib/opal/nodes/base.rb b/lib/opal/nodes/base.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/helpers'
 
 module Opal
-  class Parser
+  module Nodes
     class Node
       include Helpers
 

diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class CallNode < Node
       handle :call
 

diff --git a/lib/opal/nodes/call_special.rb b/lib/opal/nodes/call_special.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     # recv.mid = rhs
     # s(:recv, :mid=, s(:arglist, rhs))
     class AttrAssignNode < Node

diff --git a/lib/opal/nodes/case.rb b/lib/opal/nodes/case.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class CaseNode < Node
       handle :case
 

diff --git a/lib/opal/nodes/class.rb b/lib/opal/nodes/class.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class BaseScopeNode < Node
       def in_scope(type, &block)
         indent { compiler.in_scope(type, &block) }

diff --git a/lib/opal/nodes/constants.rb b/lib/opal/nodes/constants.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class ConstNode < Node
       handle :const
 

diff --git a/lib/opal/nodes/def.rb b/lib/opal/nodes/def.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/class'
 
 module Opal
-  class Parser
+  module Nodes
     # FIXME: needs rewrite
     class DefNode < BaseScopeNode
       handle :def

diff --git a/lib/opal/nodes/definitions.rb b/lib/opal/nodes/definitions.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
 
     class SvalueNode < Node
       handle :svalue

diff --git a/lib/opal/nodes/helpers.rb b/lib/opal/nodes/helpers.rb
@@ -1,5 +1,5 @@
 module Opal
-  class Parser
+  module Nodes
     module Helpers
 
       # Reserved javascript keywords - we cannot create variables with the

diff --git a/lib/opal/nodes/if.rb b/lib/opal/nodes/if.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class IfNode < Node
       handle :if
 

diff --git a/lib/opal/nodes/iter.rb b/lib/opal/nodes/iter.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/class'
 
 module Opal
-  class Parser
+  module Nodes
     # FIXME: this needs a rewrite very urgently
     class IterNode < BaseScopeNode
       handle :iter

diff --git a/lib/opal/nodes/literal.rb b/lib/opal/nodes/literal.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class ValueNode < Node
       handle :true, :false, :self, :nil
 

diff --git a/lib/opal/nodes/logic.rb b/lib/opal/nodes/logic.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class NextNode < Node
       handle :next
 

diff --git a/lib/opal/nodes/rescue.rb b/lib/opal/nodes/rescue.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class EnsureNode < Node
       handle :ensure
 

diff --git a/lib/opal/nodes/super.rb b/lib/opal/nodes/super.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
 
     # This base class is used just to child the find_super_dispatcher method
     # body. This is then used by actual super calls, or a defined?(super) style

diff --git a/lib/opal/nodes/top.rb b/lib/opal/nodes/top.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/class'
 
 module Opal
-  class Parser
+  module Nodes
     # Generates code for an entire file, i.e. the base sexp
     class TopNode < BaseScopeNode
       def compile

diff --git a/lib/opal/nodes/variables.rb b/lib/opal/nodes/variables.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class LocalVariableNode < Node
       handle :lvar
 

diff --git a/lib/opal/nodes/yield.rb b/lib/opal/nodes/yield.rb
@@ -1,7 +1,7 @@
 require 'opal/nodes/base'
 
 module Opal
-  class Parser
+  module Nodes
     class BaseYieldNode < Node
       def compile_call(children, level)
         scope.uses_block!

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -45,7 +45,7 @@ def parse(source, options = {})
 
       @sexp = Grammar.new.parse(@source, @file)
 
-      top_node = TopNode.new(@sexp, :expr, self)
+      top_node = Nodes::TopNode.new(@sexp, :expr, self)
       @fragments = top_node.compile_to_fragments.flatten
 
       @result = @fragments.map(&:code).join('')
@@ -114,7 +114,7 @@ def s(*parts)
     end
 
     def fragment(str, sexp = nil)
-      Fragment.new(code, sexp)
+      Fragment.new(str, sexp)
     end
 
     # Used to generate a unique id name per file. These are used
@@ -210,7 +210,7 @@ def process(sexp, level = :expr)
     end
 
     def handlers
-      @handlers ||= Parser::Node.handlers
+      @handlers ||= Opal::Nodes::Node.handlers
     end
 
     # Handle "special" method calls, e.g. require(). Subclasses can override