rubycop 0.5.1 → 1.0.1

data/lib/ruby_cop/ruby/variables.rb

@@ -0,0 +1,24 @@
+module RubyCop
+  module Ruby
+    class Variable < Identifier
+    end
+
+    class ClassVariable < Variable
+      def assignment(rvalue, operator)
+        ClassVariableAssignment.new(self, rvalue, operator)
+      end
+    end
+
+    class GlobalVariable < Variable
+      def assignment(rvalue, operator)
+        GlobalVariableAssignment.new(self, rvalue, operator)
+      end
+    end
+
+    class InstanceVariable < Variable
+      def assignment(rvalue, operator)
+        InstanceVariableAssignment.new(self, rvalue, operator)
+      end
+    end
+  end
+end

data/lib/ruby_cop/ruby/while.rb

@@ -0,0 +1,27 @@
+module RubyCop
+  module Ruby
+    class While < Block
+      def initialize(expression, statements)
+        @expression = expression
+        super(statements)
+      end
+
+      attr_reader :expression
+    end
+
+    class WhileMod < Block
+      def initialize(expression, statements)
+        @expression = expression
+        super(statements)
+      end
+
+      attr_reader :expression
+    end
+
+    class Until < While
+    end
+
+    class UntilMod < WhileMod
+    end
+  end
+end

data/lib/ruby_cop/version.rb

@@ -0,0 +1,3 @@
+module RubyCop
+  VERSION = '1.0.1'
+end

data/ruby_cop.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ruby_cop/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rubycop"
+  s.version     = RubyCop::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Dray Lacy", "Eric Allam"]
+  s.email       = ["dray@envylabs.com", "eric@envylabs.com"]
+  s.homepage    = "https://github.com/envylabs/RubyCop"
+  s.summary     = %q{Statically analyze Ruby and neutralize nefarious code}
+  s.description = %q{Statically analyze Ruby and neutralize nefarious code}
+
+  s.rubyforge_project = "rubycop"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'geminabox'
+  s.add_development_dependency 'rspec', '~> 2.3.0'
+  s.add_development_dependency 'yard'
+end

data/spec/{node_builder_spec.rb → analyzer/node_builder_spec.rb}

@@ -1,10 +1,10 @@
-require 'rubycop'
+require 'spec_helper'
 
-describe Rubycop::Analyzer::NodeBuilder do
+describe RubyCop::NodeBuilder do
   subject { described_class }
 
   RSpec::Matchers.define(:parse) do |ruby|
-    match { |nb| nb.build(ruby).is_a?(Rubycop::Analyzer::Ruby::Node) }
+    match { |nb| nb.build(ruby).is_a?(RubyCop::Ruby::Node) }
   end
 
   context "arrays" do

data/spec/{policy_spec.rb → analyzer/policy_spec.rb}

@@ -1,11 +1,11 @@
-require 'rubycop'
+require 'spec_helper'
 
-describe Rubycop::Analyzer::Policy do
+describe RubyCop::Policy do
   let(:policy) { described_class.new }
   subject { policy }
 
   RSpec::Matchers.define(:allow) do |ruby|
-    match { |policy| Rubycop::Analyzer::NodeBuilder.build(ruby).accept(policy) }
+    match { |policy| RubyCop::NodeBuilder.build(ruby).accept(policy) }
   end
 
   context "assignment" do
@@ -57,8 +57,6 @@ describe Rubycop::Analyzer::Policy do
     it { should_not allow('`ls` rescue 1') }
     it { should_not allow('x rescue `ls`') }
     it { should_not allow('begin; x; rescue (`ls`; RuntimeError) => err; end') }
-    it { should_not allow(%{begin ; begin ; ":D" ; rescue ; retry ; ensure ; raise ":D" ; end ; rescue ; retry ; end})}
-    it { should_not allow(%{begin ; while(true) ; 'x' ; end ; rescue Exception ; retry ; end}) }
   end
 
   context "blocks" do
@@ -76,7 +74,7 @@ describe Rubycop::Analyzer::Policy do
       # This is a tricky case where we want to allow methods like
       # Enumerable#select, but not Kernel#select / IO#select.
       it { should allow('[1, 2, 3].select { |x| x.odd? }') }
-      it { should_not allow('select([$stdin], nil, nil, 1.5)') }
+      it { pending('Kernel#select') { should_not allow('select([$stdin], nil, nil, 1.5)') } }
 
       # TODO: these are a possible concern because symbols are not GC'ed and
       # an attacker could create a large number of them to eat up memory. If
@@ -138,7 +136,6 @@ describe Rubycop::Analyzer::Policy do
       it { should_not allow('trap("EXIT") { }') }
       it { should_not allow('undef :raise') }
       it { should_not allow('undef raise') }
-      it { should_not allow(%{''.dup})}
     end
   end
 
@@ -208,6 +205,7 @@ describe Rubycop::Analyzer::Policy do
     it { should allow('true') }
     it { should allow('[]') }
     it { should allow('[1,2,3]') }
+    it { should allow('%w[ a b c ]') }
     it { should allow('{}') }
     it { should allow('{1 => 2}') }
   end
@@ -293,7 +291,7 @@ describe Rubycop::Analyzer::Policy do
       "Zodfsdsfdsdfsz=Zombies.find()1\n"
     ].each do |error|
       it "raises SyntaxError on #{error.inspect}" do
-        expect { Rubycop::Analyzer::NodeBuilder.build(error) }.to raise_error(SyntaxError)
+        expect { RubyCop::NodeBuilder.build(error) }.to raise_error(SyntaxError)
       end
     end
 

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require "bundler/setup"
+Bundler.require(:default, :test)
+
+require 'ruby_cop'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+end

data/tasks/rspec.rake

@@ -0,0 +1,8 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern    = 'spec/**/*_spec.rb'
+  t.rspec_opts = ['--backtrace']
+end
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,2 @@
+require 'yard'
+YARD::Rake::YardocTask.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycop
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: geminabox
+  requirement: &70160954771200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70160954771200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251476621180 !ruby/object:Gem::Requirement
+  requirement: &70160954770700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70160954770700
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70160954770280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,11 +44,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251476621180
-description: A semantic analyzer for Ruby 1.9
+  version_requirements: *70160954770280
+description: Statically analyze Ruby and neutralize nefarious code
 email:
 - dray@envylabs.com
-- rubymaverick@gmail.com
+- eric@envylabs.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -35,40 +57,42 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/rubycop.rb
-- lib/rubycop/analyzer.rb
-- lib/rubycop/analyzer/gray_list.rb
-- lib/rubycop/analyzer/node_builder.rb
-- lib/rubycop/analyzer/policy.rb
-- lib/rubycop/analyzer/ruby.rb
-- lib/rubycop/analyzer/ruby/args.rb
-- lib/rubycop/analyzer/ruby/array.rb
-- lib/rubycop/analyzer/ruby/assignment.rb
-- lib/rubycop/analyzer/ruby/assoc.rb
-- lib/rubycop/analyzer/ruby/blocks.rb
-- lib/rubycop/analyzer/ruby/call.rb
-- lib/rubycop/analyzer/ruby/case.rb
-- lib/rubycop/analyzer/ruby/constants.rb
-- lib/rubycop/analyzer/ruby/definitions.rb
-- lib/rubycop/analyzer/ruby/for.rb
-- lib/rubycop/analyzer/ruby/hash.rb
-- lib/rubycop/analyzer/ruby/if.rb
-- lib/rubycop/analyzer/ruby/list.rb
-- lib/rubycop/analyzer/ruby/node.rb
-- lib/rubycop/analyzer/ruby/operators.rb
-- lib/rubycop/analyzer/ruby/params.rb
-- lib/rubycop/analyzer/ruby/position.rb
-- lib/rubycop/analyzer/ruby/range.rb
-- lib/rubycop/analyzer/ruby/statements.rb
-- lib/rubycop/analyzer/ruby/string.rb
-- lib/rubycop/analyzer/ruby/tokens.rb
-- lib/rubycop/analyzer/ruby/variables.rb
-- lib/rubycop/analyzer/ruby/while.rb
-- lib/rubycop/version.rb
-- rubycop.gemspec
-- spec/node_builder_spec.rb
-- spec/policy_spec.rb
-homepage: ''
+- lib/ruby_cop.rb
+- lib/ruby_cop/gray_list.rb
+- lib/ruby_cop/node_builder.rb
+- lib/ruby_cop/policy.rb
+- lib/ruby_cop/ruby.rb
+- lib/ruby_cop/ruby/args.rb
+- lib/ruby_cop/ruby/array.rb
+- lib/ruby_cop/ruby/assignment.rb
+- lib/ruby_cop/ruby/assoc.rb
+- lib/ruby_cop/ruby/blocks.rb
+- lib/ruby_cop/ruby/call.rb
+- lib/ruby_cop/ruby/case.rb
+- lib/ruby_cop/ruby/constants.rb
+- lib/ruby_cop/ruby/definitions.rb
+- lib/ruby_cop/ruby/for.rb
+- lib/ruby_cop/ruby/hash.rb
+- lib/ruby_cop/ruby/if.rb
+- lib/ruby_cop/ruby/list.rb
+- lib/ruby_cop/ruby/node.rb
+- lib/ruby_cop/ruby/operators.rb
+- lib/ruby_cop/ruby/params.rb
+- lib/ruby_cop/ruby/position.rb
+- lib/ruby_cop/ruby/range.rb
+- lib/ruby_cop/ruby/statements.rb
+- lib/ruby_cop/ruby/string.rb
+- lib/ruby_cop/ruby/tokens.rb
+- lib/ruby_cop/ruby/variables.rb
+- lib/ruby_cop/ruby/while.rb
+- lib/ruby_cop/version.rb
+- ruby_cop.gemspec
+- spec/analyzer/node_builder_spec.rb
+- spec/analyzer/policy_spec.rb
+- spec/spec_helper.rb
+- tasks/rspec.rake
+- tasks/yard.rake
+homepage: https://github.com/envylabs/RubyCop
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -88,10 +112,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubycop
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: A semantic analyzer for Ruby 1.9
+summary: Statically analyze Ruby and neutralize nefarious code
 test_files:
-- spec/node_builder_spec.rb
-- spec/policy_spec.rb
+- spec/analyzer/node_builder_spec.rb
+- spec/analyzer/policy_spec.rb
+- spec/spec_helper.rb

data/lib/rubycop.rb

@@ -1,6 +0,0 @@
-require "rubycop/version"
-
-module Rubycop
-end
-
-require "rubycop/analyzer"

data/lib/rubycop/analyzer.rb

@@ -1,6 +0,0 @@
-require 'ripper'
-
-require 'rubycop/analyzer/ruby'
-require 'rubycop/analyzer/node_builder'
-require 'rubycop/analyzer/gray_list'
-require 'rubycop/analyzer/policy'

data/lib/rubycop/analyzer/gray_list.rb

@@ -1,28 +0,0 @@
-require 'set'
-
-module Rubycop
-  module Analyzer
-    # Combination blacklist and whitelist.
-    class GrayList
-      def initialize
-        @blacklist = Set.new
-        @whitelist = Set.new
-      end
-
-      # An item is allowed if it's whitelisted, or if it's not blacklisted.
-      def allow?(item)
-        @whitelist.include?(item) || !@blacklist.include?(item)
-      end
-
-      def blacklist(item)
-        @whitelist.delete(item)
-        @blacklist.add(item)
-      end
-
-      def whitelist(item)
-        @blacklist.delete(item)
-        @whitelist.add(item)
-      end
-    end
-  end
-end

data/lib/rubycop/analyzer/node_builder.rb

@@ -1,523 +0,0 @@
-module Rubycop
-  module Analyzer
-    class NodeBuilder < Ripper::SexpBuilder
-      def initialize(src, filename=nil, lineno=nil)
-        @src = src ||= filename && File.read(filename) || ''
-        @filename = filename
-        super
-      end
-
-      class << self
-        def build(src, filename=nil)
-          new(src, filename).parse
-        end
-      end
-
-      def on_alias(new_name, old_name)
-        Ruby::Alias.new(to_ident(new_name), to_ident(old_name))
-      end
-
-      def on_aref(target, args)
-        Ruby::Call.new(target, ident(:[]), args)
-      end
-
-      def on_aref_field(target, args)
-        Ruby::Call.new(target, ident(:[]), args)
-      end
-
-      def on_arg_paren(args)
-        args
-      end
-
-      def on_args_add(args, arg)
-        args.add(arg); args
-      end
-
-      def on_args_add_block(args, block)
-        args.add_block(block) if block; args
-      end
-
-      def on_args_new
-        Ruby::Args.new
-      end
-
-      def on_array(args)
-        args ? args.to_array : Ruby::Array.new
-      end
-
-      def on_assign(lvalue, rvalue)
-        lvalue.assignment(rvalue, ident(:'='))
-      end
-
-      def on_assoc_new(key, value)
-        Ruby::Assoc.new(key, value)
-      end
-
-      def on_assoclist_from_args(args)
-        args
-      end
-
-      def on_bare_assoc_hash(assocs)
-        Ruby::Hash.new(assocs)
-      end
-
-      def on_BEGIN(statements)
-        Ruby::Call.new(nil, ident(:BEGIN), nil, statements)
-      end
-
-      def on_begin(body)
-        body.is_a?(Ruby::ChainedBlock) ? body : body.to_chained_block
-      end
-
-      def on_binary(lvalue, operator, rvalue)
-        Ruby::Binary.new(lvalue, rvalue, operator)
-      end
-
-      def on_blockarg(arg)
-        arg
-      end
-
-      def on_block_var(params, something)
-        params
-      end
-
-      def on_bodystmt(body, rescue_block, else_block, ensure_block)
-        statements = [rescue_block, else_block, ensure_block].compact
-        statements.empty? ? body : body.to_chained_block(statements)
-      end
-
-      def on_brace_block(params, statements)
-        statements.to_block(params)
-      end
-
-      def on_break(args)
-        Ruby::Call.new(nil, ident(:break), args)
-      end
-
-      def on_call(target, separator, identifier)
-        Ruby::Call.new(target, identifier)
-      end
-
-      def on_case(args, when_block)
-        Ruby::Case.new(args, when_block)
-      end
-
-      def on_CHAR(token)
-        Ruby::Char.new(token, position)
-      end
-
-      def on_class(const, superclass, body)
-        Ruby::Class.new(const, superclass, body)
-      end
-
-      def on_class_name_error(ident)
-        raise SyntaxError, 'class/module name must be CONSTANT'
-      end
-
-      def on_command(identifier, args)
-        Ruby::Call.new(nil, identifier, args)
-      end
-
-      def on_command_call(target, separator, identifier, args)
-        Ruby::Call.new(target, identifier, args)
-      end
-
-      def on_const(token)
-        Ruby::Constant.new(token, position)
-      end
-
-      def on_const_path_field(namespace, const)
-        const.namespace = namespace; const
-      end
-
-      def on_const_path_ref(namespace, const)
-        const.namespace = namespace; const
-      end
-
-      def on_const_ref(const)
-        const
-      end
-
-      def on_cvar(token)
-        Ruby::ClassVariable.new(token, position)
-      end
-
-      def on_def(identifier, params, body)
-        Ruby::Method.new(nil, identifier, params, body)
-      end
-
-      def on_defs(target, separator, identifier, params, body)
-        Ruby::Method.new(target, identifier, params, body)
-      end
-
-      def on_defined(ref)
-        Ruby::Defined.new(ref)
-      end
-
-      def on_do_block(params, statements)
-        statements.to_block(params)
-      end
-
-      def on_dot2(min, max)
-        Ruby::Range.new(min, max, false)
-      end
-
-      def on_dot3(min, max)
-        Ruby::Range.new(min, max, true)
-      end
-
-      def on_dyna_symbol(symbol)
-        symbol.to_dyna_symbol
-      end
-
-      def on_else(statements)
-        Ruby::Else.new(statements)
-      end
-
-      def on_END(statements)
-        Ruby::Call.new(nil, ident(:END), nil, statements)
-      end
-
-      def on_ensure(statements)
-        statements
-      end
-
-      def on_if(expression, statements, else_block)
-        Ruby::If.new(expression, statements, else_block)
-      end
-      alias_method :on_elsif, :on_if
-
-      def on_ifop(condition, then_part, else_part)
-        Ruby::IfOp.new(condition, then_part, else_part)
-      end
-
-      def on_if_mod(expression, statement)
-        Ruby::IfMod.new(expression, statement)
-      end
-
-      def on_fcall(identifier)
-        Ruby::Call.new(nil, identifier)
-      end
-
-      def on_field(target, separator, identifier)
-        Ruby::Call.new(target, identifier)
-      end
-
-      def on_float(token)
-        Ruby::Float.new(token, position)
-      end
-
-      def on_for(variable, range, statements)
-        Ruby::For.new(variable, range, statements)
-      end
-
-      def on_gvar(token)
-        Ruby::GlobalVariable.new(token, position)
-      end
-
-      def on_hash(assocs)
-        Ruby::Hash.new(assocs)
-      end
-
-      def on_ident(token)
-        ident(token)
-      end
-
-      def on_int(token)
-        Ruby::Integer.new(token, position)
-      end
-
-      def on_ivar(token)
-        Ruby::InstanceVariable.new(token, position)
-      end
-
-      def on_kw(token)
-        Ruby::Keyword.new(token, position)
-      end
-
-      def on_label(token)
-        Ruby::Label.new(token, position)
-      end
-
-      def on_lambda(params, statements)
-        Ruby::Block.new(statements, params)
-      end
-
-      def on_massign(lvalue, rvalue)
-        lvalue.assignment(rvalue, ident(:'='))
-      end
-
-      def on_method_add_arg(call, args)
-        call.arguments = args; call
-      end
-
-      def on_method_add_block(call, block)
-        call.block = block; call
-      end
-
-      def on_mlhs_add(assignment, ref)
-        assignment.add(ref); assignment
-      end
-
-      def on_mlhs_add_star(assignment, ref)
-        assignment.add(Ruby::SplatArg.new(ref)); assignment
-      end
-
-      def on_mlhs_new
-        Ruby::MultiAssignmentList.new
-      end
-
-      def on_module(const, body)
-        Ruby::Module.new(const, body)
-      end
-
-      def on_mrhs_add(assignment, ref)
-        assignment.add(ref); assignment
-      end
-
-      def on_mrhs_new_from_args(args)
-        Ruby::MultiAssignmentList.new(args.elements)
-      end
-
-      def on_next(args)
-        Ruby::Call.new(nil, ident(:next), args)
-      end
-
-      def on_op(operator)
-        operator.intern
-      end
-
-      def on_opassign(lvalue, operator, rvalue)
-        lvalue.assignment(rvalue, operator)
-      end
-
-      def on_params(params, optionals, rest, something, block)
-        Ruby::Params.new(params, optionals, rest, block)
-      end
-
-      def on_paren(node)
-        node
-      end
-
-      def on_parse_error(message)
-        raise SyntaxError, message
-      end
-
-      def on_program(statements)
-        statements.to_program(@src, @filename)
-      end
-
-      def on_qwords_add(array, word)
-        array.add(Ruby::String.new(word)); array
-      end
-
-      def on_qwords_new
-        Ruby::Array.new
-      end
-
-      def on_redo
-        Ruby::Call.new(nil, ident(:redo))
-      end
-
-      def on_regexp_add(regexp, content)
-        regexp.add(content); regexp
-      end
-
-      def on_regexp_literal(regexp, rdelim)
-        regexp
-      end
-
-      def on_regexp_new
-        Ruby::Regexp.new
-      end
-
-      def on_rescue(types, var, statements, block)
-        statements.to_chained_block(block, Ruby::RescueParams.new(types, var))
-      end
-
-      def on_rescue_mod(expression, statements)
-        Ruby::RescueMod.new(expression, statements)
-      end
-
-      def on_rest_param(param)
-        param
-      end
-
-      def on_retry
-        Ruby::Call.new(nil, ident(:retry))
-      end
-
-      def on_return(args)
-        Ruby::Call.new(nil, ident(:return), args)
-      end
-
-      def on_sclass(superclass, body)
-        Ruby::SingletonClass.new(superclass, body)
-      end
-
-      def on_stmts_add(target, statement)
-        target.add(statement) if statement; target
-      end
-
-      def on_stmts_new
-        Ruby::Statements.new
-      end
-
-      def on_string_add(string, content)
-        string.add(content); string
-      end
-
-      def on_string_concat(*strings)
-        Ruby::StringConcat.new(strings)
-      end
-
-      def on_string_content
-        Ruby::String.new
-      end
-
-      # weird string syntax that I didn't know existed until writing this lib.
-      # ex. "safe level is #$SAFE" => "safe level is 0"
-      def on_string_dvar(variable)
-        variable
-      end
-
-      def on_string_embexpr(expression)
-        expression
-      end
-
-      def on_string_literal(string)
-        string
-      end
-
-      def on_super(args)
-        Ruby::Call.new(nil, ident(:super), args)
-      end
-
-      def on_symbol(token)
-        Ruby::Symbol.new(token, position)
-      end
-
-      def on_symbol_literal(symbol)
-        symbol
-      end
-
-      def on_top_const_field(field)
-        field
-      end
-
-      def on_top_const_ref(const)
-        const
-      end
-
-      def on_tstring_content(token)
-        token
-      end
-
-      def on_unary(operator, operand)
-        Ruby::Unary.new(operator, operand)
-      end
-
-      def on_undef(args)
-        Ruby::Call.new(nil, ident(:undef), Ruby::Args.new(args.collect { |e| to_ident(e) }))
-      end
-
-      def on_unless(expression, statements, else_block)
-        Ruby::Unless.new(expression, statements, else_block)
-      end
-
-      def on_unless_mod(expression, statement)
-        Ruby::UnlessMod.new(expression, statement)
-      end
-
-      def on_until(expression, statements)
-        Ruby::Until.new(expression, statements)
-      end
-
-      def on_until_mod(expression, statement)
-        Ruby::UntilMod.new(expression, statement)
-      end
-
-      def on_var_alias(new_name, old_name)
-        Ruby::Alias.new(to_ident(new_name), to_ident(old_name))
-      end
-
-      def on_var_field(field)
-        field
-      end
-
-      def on_var_ref(ref)
-        ref
-      end
-
-      def on_void_stmt
-        nil
-      end
-
-      def on_when(expression, statements, next_block)
-        Ruby::When.new(expression, statements, next_block)
-      end
-
-      def on_while(expression, statements)
-        Ruby::While.new(expression, statements)
-      end
-
-      def on_while_mod(expression, statement)
-        Ruby::WhileMod.new(expression, statement)
-      end
-
-      def on_word_add(string, word)
-        string.add(word); string
-      end
-
-      def on_words_add(array, word)
-        array.add(word); array
-      end
-
-      def on_word_new
-        Ruby::String.new
-      end
-
-      def on_words_new
-        Ruby::Array.new
-      end
-
-      def on_xstring_add(string, content)
-        on_string_add(string, content)
-      end
-
-      def on_xstring_new
-        Ruby::ExecutableString.new
-      end
-
-      def on_xstring_literal(string)
-        string
-      end
-
-      def on_yield(args)
-        Ruby::Call.new(nil, ident(:yield), args)
-      end
-
-      def on_yield0
-        Ruby::Call.new(nil, ident(:yield))
-      end
-
-      def on_zsuper(*)
-        Ruby::Call.new(nil, ident(:super))
-      end
-
-    private
-
-      def ident(ident)
-        Ruby::Identifier.new(ident, position)
-      end
-
-      def to_ident(ident_or_sym)
-        ident_or_sym.is_a?(Ruby::Identifier) ? ident_or_sym : ident(ident_or_sym)
-      end
-
-      def position
-        Ruby::Position.new(lineno, column)
-      end
-    end
-  end
-end