Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename Nodes::Node to Nodes::Base
Browse files Browse the repository at this point in the history
adambeynon committed Oct 23, 2013
1 parent 5f56be9 commit 9e04360
Showing 16 changed files with 69 additions and 70 deletions.
4 changes: 2 additions & 2 deletions lib/opal/nodes/base.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class Node
class Base
include Helpers

def self.handlers
@@ -11,7 +11,7 @@ def self.handlers

def self.handle(*types)
types.each do |type|
Node.handlers[type] = self
Base.handlers[type] = self
end
end

2 changes: 1 addition & 1 deletion lib/opal/nodes/call.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class CallNode < Node
class CallNode < Base
handle :call

children :recvr, :meth, :arglist, :iter
12 changes: 6 additions & 6 deletions lib/opal/nodes/call_special.rb
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ module Opal
module Nodes
# recv.mid = rhs
# s(:recv, :mid=, s(:arglist, rhs))
class AttrAssignNode < Node
class AttrAssignNode < Base
handle :attrasgn

children :recvr, :mid, :arglist
@@ -17,7 +17,7 @@ def compile

# lhs =~ rhs
# s(:match3, lhs, rhs)
class Match3Node < Node
class Match3Node < Base
handle :match3

children :lhs, :rhs
@@ -30,7 +30,7 @@ def compile

# a ||= rhs
# s(:op_asgn_or, s(:lvar, :a), s(:lasgn, :a, rhs))
class OpAsgnOrNode < Node
class OpAsgnOrNode < Base
handle :op_asgn_or

children :recvr, :rhs
@@ -43,7 +43,7 @@ def compile

# a &&= rhs
# s(:op_asgn_and, s(:lvar, :a), s(:lasgn, a:, rhs))
class OpAsgnAndNode < Node
class OpAsgnAndNode < Base
handle :op_asgn_and

children :recvr, :rhs
@@ -56,7 +56,7 @@ def compile

# lhs[args] ||= rhs
# s(:op_asgn1, lhs, args, :||, rhs)
class OpAsgn1Node < Node
class OpAsgn1Node < Base
handle :op_asgn1

children :lhs, :args, :op, :rhs
@@ -81,7 +81,7 @@ def compile

# lhs.b += rhs
# s(:op_asgn2, lhs, :b=, :+, rhs)
class OpAsgn2Node < Node
class OpAsgn2Node < Base
handle :op_asgn2

children :lhs, :mid, :op, :rhs
4 changes: 2 additions & 2 deletions lib/opal/nodes/case.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class CaseNode < Node
class CaseNode < Base
handle :case

children :condition
@@ -52,7 +52,7 @@ def case_stmt
end
end

class WhenNode < Node
class WhenNode < Base
handle :when

children :whens, :body
2 changes: 1 addition & 1 deletion lib/opal/nodes/class.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class BaseScopeNode < Node
class BaseScopeNode < Base
def in_scope(type, &block)
indent { compiler.in_scope(type, &block) }
end
12 changes: 6 additions & 6 deletions lib/opal/nodes/constants.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class ConstNode < Node
class ConstNode < Base
handle :const

children :name
@@ -18,7 +18,7 @@ def compile
end
end

class ConstDeclarationNode < Node
class ConstDeclarationNode < Base
handle :cdecl

children :name, :base
@@ -29,7 +29,7 @@ def compile
end
end

class ConstAssignNode < Node
class ConstAssignNode < Base
handle :casgn

children :base, :name, :value
@@ -43,7 +43,7 @@ def compile
end
end

class ConstGetNode < Node
class ConstGetNode < Base
handle :colon2

children :base, :name
@@ -63,7 +63,7 @@ def compile
end
end

class TopConstNode < Node
class TopConstNode < Base
handle :colon3

children :name
@@ -76,7 +76,7 @@ def compile
end
end

class TopConstAssignNode < Node
class TopConstAssignNode < Base
handle :casgn3

children :name, :value
2 changes: 1 addition & 1 deletion lib/opal/nodes/def.rb
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ def arity_check(args, opt, splat, block_name, mid)
end

# FIXME: needs rewrite
class ArglistNode < Node
class ArglistNode < Base
handle :arglist

def compile
18 changes: 9 additions & 9 deletions lib/opal/nodes/definitions.rb
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
module Opal
module Nodes

class SvalueNode < Node
class SvalueNode < Base
handle :svalue

children :value
@@ -15,7 +15,7 @@ def compile

# :scope nodes are actually inside scopes (e.g. :module, :class).
# These are not actually the scopes themselves.
class ScopeNode < Node
class ScopeNode < Base
handle :scope

children :body
@@ -27,7 +27,7 @@ def compile
end
end

class UndefNode < Node
class UndefNode < Base
handle :undef

children :mid
@@ -38,7 +38,7 @@ def compile
end
end

class AliasNode < Node
class AliasNode < Base
handle :alias

children :new_name, :old_name
@@ -61,7 +61,7 @@ def compile
end
end

class BeginNode < Node
class BeginNode < Base
handle :begin

children :body
@@ -76,7 +76,7 @@ def compile
end
end

class ParenNode < Node
class ParenNode < Base
handle :paren

children :body
@@ -96,7 +96,7 @@ def compile
end
end

class RescueModNode < Node
class RescueModNode < Base
handle :rescue_mod

children :lhs, :rhs
@@ -116,7 +116,7 @@ def compile
end
end

class BlockNode < Node
class BlockNode < Base
handle :block

def compile
@@ -199,7 +199,7 @@ def find_inline_yield(stmt)
end
end

class WhileNode < Node
class WhileNode < Base
handle :while

children :test, :body
2 changes: 1 addition & 1 deletion lib/opal/nodes/if.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class IfNode < Node
class IfNode < Base
handle :if

children :test, :true_body, :false_body
22 changes: 11 additions & 11 deletions lib/opal/nodes/literal.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class ValueNode < Node
class ValueNode < Base
handle :true, :false, :self, :nil

def compile
@@ -11,7 +11,7 @@ def compile
end
end

class LiteralNode < Node
class LiteralNode < Base
children :value
end

@@ -63,7 +63,7 @@ def compile
end
end

class DynamicStringNode < Node
class DynamicStringNode < Base
handle :dstr

def compile
@@ -87,7 +87,7 @@ def compile
end
end

class DynamicSymbolNode < Node
class DynamicSymbolNode < Base
handle :dsym

def compile
@@ -109,7 +109,7 @@ def compile
end
end

class DynamicXStringNode < Node
class DynamicXStringNode < Base
handle :dxstr

def requires_semicolon(code)
@@ -138,7 +138,7 @@ def compile
end
end

class DynamicRegexpNode < Node
class DynamicRegexpNode < Base
handle :dregx

def compile
@@ -158,7 +158,7 @@ def compile
end
end

class ExclusiveRangeNode < Node
class ExclusiveRangeNode < Base
handle :dot2

children :start, :finish
@@ -174,7 +174,7 @@ def compile
end
end

class InclusiveRangeNode < Node
class InclusiveRangeNode < Base
handle :dot3

children :start, :finish
@@ -190,7 +190,7 @@ def compile
end
end

class HashNode < Node
class HashNode < Base
handle :hash

def keys_and_values
@@ -252,7 +252,7 @@ def compile_hash2(keys, values)
end
end

class ArrayNode < Node
class ArrayNode < Base
handle :array

def compile
@@ -302,7 +302,7 @@ def compile
end

# def args list
class ArgsNode < Node
class ArgsNode < Base
handle :args

def compile
24 changes: 12 additions & 12 deletions lib/opal/nodes/logic.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class NextNode < Node
class NextNode < Base
handle :next

children :value
@@ -15,7 +15,7 @@ def compile
end
end

class BreakNode < Node
class BreakNode < Base
handle :break

children :value
@@ -45,7 +45,7 @@ def compile_iter
end
end

class RedoNode < Node
class RedoNode < Base
handle :redo

def compile
@@ -68,7 +68,7 @@ def compile_iter
end
end

class NotNode < Node
class NotNode < Base
handle :not

children :value
@@ -81,7 +81,7 @@ def compile
end
end

class SplatNode < Node
class SplatNode < Base
handle :splat

children :value
@@ -101,7 +101,7 @@ def compile
end
end

class OrNode < Node
class OrNode < Base
handle :or

children :lhs, :rhs
@@ -117,7 +117,7 @@ def compile
end
end

class AndNode < Node
class AndNode < Base
handle :and

children :lhs, :rhs
@@ -142,7 +142,7 @@ def compile
end
end

class ReturnNode < Node
class ReturnNode < Base
handle :return

children :value
@@ -177,7 +177,7 @@ def compile
end
end

class JSReturnNode < Node
class JSReturnNode < Base
handle :js_return

children :value
@@ -188,7 +188,7 @@ def compile
end
end

class JSTempNode < Node
class JSTempNode < Base
handle :js_tmp

children :value
@@ -198,7 +198,7 @@ def compile
end
end

class BlockPassNode < Node
class BlockPassNode < Base
handle :block_pass

children :value
@@ -208,7 +208,7 @@ def compile
end
end

class DefinedNode < Node
class DefinedNode < Base
handle :defined

children :value
6 changes: 3 additions & 3 deletions lib/opal/nodes/rescue.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class EnsureNode < Node
class EnsureNode < Base
handle :ensure

children :begn, :ensr
@@ -30,7 +30,7 @@ def wrap_in_closure?
end
end

class RescueNode < Node
class RescueNode < Base
handle :rescue

children :body
@@ -64,7 +64,7 @@ def body_code
end
end

class ResBodyNode < Node
class ResBodyNode < Base
handle :resbody

children :args, :body
3 changes: 1 addition & 2 deletions lib/opal/nodes/super.rb
Original file line number Diff line number Diff line change
@@ -2,11 +2,10 @@

module Opal
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
# call.
class BaseSuperNode < Node
class BaseSuperNode < Base
children :arglist, :iter

def compile_dispatcher
22 changes: 11 additions & 11 deletions lib/opal/nodes/variables.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class LocalVariableNode < Node
class LocalVariableNode < Base
handle :lvar

children :var_name
@@ -21,7 +21,7 @@ def compile
end
end

class LocalAssignNode < Node
class LocalAssignNode < Base
handle :lasgn

children :var_name, :value
@@ -45,7 +45,7 @@ def compile
end
end

class InstanceVariableNode < Node
class InstanceVariableNode < Base
handle :ivar

children :name
@@ -61,7 +61,7 @@ def compile
end
end

class InstanceAssignNode < Node
class InstanceAssignNode < Base
handle :iasgn

children :name, :value
@@ -77,7 +77,7 @@ def compile
end
end

class GlobalVariableNode < Node
class GlobalVariableNode < Base
handle :gvar

children :name
@@ -92,7 +92,7 @@ def compile
end
end

class GlobalAssignNode < Node
class GlobalAssignNode < Base
handle :gasgn

children :name, :value
@@ -108,15 +108,15 @@ def compile
end
end

class BackrefNode < Node
class BackrefNode < Base
handle :nth_ref

def compile
push "nil"
end
end

class ClassVariableNode < Node
class ClassVariableNode < Base
handle :cvar

children :name
@@ -128,7 +128,7 @@ def compile
end
end

class ClassVarAssignNode < Node
class ClassVarAssignNode < Base
handle :casgn

children :name, :value
@@ -140,7 +140,7 @@ def compile
end
end

class ClassVarDeclNode < Node
class ClassVarDeclNode < Base
handle :cvdecl

children :name, :value
@@ -152,7 +152,7 @@ def compile
end
end

class MassAssignNode < Node
class MassAssignNode < Base
handle :masgn

children :lhs, :rhs
2 changes: 1 addition & 1 deletion lib/opal/nodes/yield.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

module Opal
module Nodes
class BaseYieldNode < Node
class BaseYieldNode < Base
def compile_call(children, level)
scope.uses_block!

2 changes: 1 addition & 1 deletion lib/opal/parser.rb
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ def process(sexp, level = :expr)
end

def handlers
@handlers ||= Opal::Nodes::Node.handlers
@handlers ||= Opal::Nodes::Base.handlers
end

# Handle "special" method calls, e.g. require(). Subclasses can override

0 comments on commit 9e04360

Please sign in to comment.