live_ast 0.2.3 → 0.5.0

data/test/flush_cache_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 # test for flushing side-effects: unsort this TestCase from other
 # TestCases.
@@ -39,7 +39,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
     LiveAST.flush_cache
 
-    assert_raise LiveAST::FlushedError do
+    assert_raises LiveAST::FlushedError do
       klass.instance_method(:g).to_ast
     end
   end
@@ -59,7 +59,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
     assert_equal f_ast.object_id,
                  klass.instance_method(:f).to_ast.object_id
 
-    assert_raise LiveAST::FlushedError do
+    assert_raises LiveAST::FlushedError do
       klass.instance_method(:g).to_ast
     end
   end
@@ -91,7 +91,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
     assert_equal a_ast.object_id, a.to_ast.object_id
     
-    assert_raise LiveAST::FlushedError do
+    assert_raises LiveAST::FlushedError do
       b.to_ast
     end
   end

data/test/lambda_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class LambdaTest < RegularTest
   def test_block_braces_multiline

data/test/load_path_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAA_LoadPathTest < BaseTest
   include FileUtils
@@ -58,10 +58,10 @@ class AAA_LoadPathTest < BaseTest
   end
 
   def compare_load_errors(file)
-    orig = assert_raise LoadError do
+    orig = assert_raises LoadError do
       load file
     end
-    live = assert_raise LoadError do
+    live = assert_raises LoadError do
       LiveAST.load file
     end
     assert_equal orig.message, live.message

data/test/load_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAA_LoadFileTest < BaseTest
   class << self
@@ -20,7 +20,7 @@ class AAA_LoadFileTest < BaseTest
       assert_equal true, ret
       assert_equal :code_a, AAA_LoadFileTest.flag
       
-      assert_raise NameError do
+      assert_raises NameError do
         eval("x", TOPLEVEL_BINDING)
       end
 

data/test/{shared/main.rb → main.rb}

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 # require first for stdlib_test
 require 'pp'
@@ -7,10 +7,9 @@ require 'fileutils'
 
 require 'minitest/unit'
 require 'minitest/mock'
-require 'minitest/autorun'
-require 'live_ast/base'
+require 'minitest/autorun' unless defined? Rake
 
-require_relative "ast_generators"
+require 'live_ast/base'
 
 def define_unsorted_test_case(name, superclass, &block)
   klass = Class.new superclass, &block
@@ -48,23 +47,36 @@ class JLMiniTest < MiniTest::Unit::TestCase
     end
   end
 
-  alias_method :assert_raise, :assert_raises
-  alias_method :assert_not_equal, :refute_equal
-  alias_method :assert_not_nil, :refute_nil
-
   def assert_nothing_raised
     assert_equal 3, 3
     yield
   rescue => ex
     raise MiniTest::Assertion,
-      exception_details(ex, "Expected nothing raised, but got:")
+    exception_details(ex, "Expected nothing raised, but got:")
   end
+
+  %w[
+    empty
+    equal
+    in_delta
+    in_epsilon
+    includes
+    instance_of
+    kind_of
+    match
+    nil
+    operator
+    respond_to
+    same
+  ].each { |name|
+    alias_method "assert_not_#{name}", "refute_#{name}"
+  }
 end
 
 class BaseTest < JLMiniTest
-  include ASTGenerators
+  include LiveAST.parser::TestForms
 
-  DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/../data")
+  DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/data")
 
   def self.stdlib_has_source?
     case RUBY_ENGINE
@@ -78,14 +90,12 @@ class BaseTest < JLMiniTest
     path = DATA_DIR + "/" + basename
     FileUtils.mkdir DATA_DIR unless File.directory? DATA_DIR
 
+    FileUtils.rm_f path
     begin
-      FileUtils.rm_f path
       yield path
     ensure
-      unless defined? SimpleCov
-        FileUtils.rm_f path
-        FileUtils.rmdir DATA_DIR rescue nil
-      end
+      FileUtils.rm_f path
+      FileUtils.rmdir DATA_DIR rescue nil
     end
   end
 

data/test/noninvasive_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAA_NoninvasiveTest < BaseTest
   def test_no_clutter

data/test/readme_test.rb

@@ -1,11 +1,13 @@
-require_relative 'shared/main'
+require_relative 'main'
 require_relative '../devel/jumpstart'
 
-sections = [
-  "Synopsis",
-  "Loading Source",
-  "Noninvasive Interface",
-  "+to_ruby+",
-]
+if LiveAST.parser.respond_to?(:unified?) and LiveAST.parser.unified?
+  sections = [
+    "Synopsis",
+    "Loading Source",
+    "Noninvasive Interface",
+    "+to_ruby+",
+  ]
 
-Jumpstart.doc_to_test("README.rdoc", *sections)
+  Jumpstart.doc_to_test("README.rdoc", *sections)
+end

data/test/recursive_eval_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class RecursiveEvalTest < RegularTest
   DEFINE = lambda do

data/test/redefine_method_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class RedefineMethodTest < RegularTest
   DEFINE_A = lambda do

data/test/reload_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAB_ReloadTest < BaseTest
   include FileUtils

data/test/stdlib_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class StdlibTest < RegularTest
   if stdlib_has_source?

data/test/thread_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 require 'thread'
 

data/test/to_ast_feature_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAB_ToASTFeatureTest < BaseTest
   def test_require

data/test/to_ruby_feature_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAB_ToRubyFeatureTest < BaseTest
   def test_require

data/test/to_ruby_test.rb

@@ -1,4 +1,4 @@
-require_relative 'shared/main'
+require_relative 'main'
 
 class AAC_ToRubyTest < RegularTest
   def setup
@@ -83,4 +83,6 @@ class AAC_ToRubyTest < RegularTest
     end.instance_method(:f).to_ruby
     assert_equal src, dst
   end
-end
+end if (un = LiveAST.parser::Unparser rescue nil) &&
+       un.respond_to?(:ruby2ruby?) &&
+       un.ruby2ruby?

metadata

@@ -2,7 +2,7 @@
 name: live_ast
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby_parser
+  name: live_ast_ruby_parser
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.6
+        version: "0"
   type: :runtime
   version_requirements: *id001
 description: LiveAST enables a program to find the ASTs of objects created by dynamically generated code.
@@ -46,7 +46,6 @@ files:
 - lib/live_ast/evaler.rb
 - lib/live_ast/linker.rb
 - lib/live_ast/loader.rb
-- lib/live_ast/parser.rb
 - lib/live_ast/reader.rb
 - lib/live_ast/replace_load.rb
 - lib/live_ast/replace_raise.rb
@@ -79,13 +78,12 @@ files:
 - test/lambda_test.rb
 - test/load_path_test.rb
 - test/load_test.rb
+- test/main.rb
 - test/noninvasive_test.rb
 - test/readme_test.rb
 - test/recursive_eval_test.rb
 - test/redefine_method_test.rb
 - test/reload_test.rb
-- test/shared/ast_generators.rb
-- test/shared/main.rb
 - test/stdlib_test.rb
 - test/thread_test.rb
 - test/to_ast_feature_test.rb
@@ -103,14 +101,6 @@ rdoc_options:
 - --title
 - "LiveAST: Live Abstract Syntax Trees"
 - --exclude
-- CHANGES.rdoc
-- --exclude
-- Rakefile
-- --exclude
-- devel/jumpstart.rb
-- --exclude
-- lib/live_ast.rb
-- --exclude
 - lib/live_ast/ast_load.rb
 - --exclude
 - lib/live_ast/error.rb
@@ -121,91 +111,14 @@ rdoc_options:
 - --exclude
 - lib/live_ast/loader.rb
 - --exclude
-- lib/live_ast/parser.rb
-- --exclude
 - lib/live_ast/reader.rb
 - --exclude
 - lib/live_ast/replace_load.rb
 - --exclude
 - lib/live_ast/replace_raise.rb
 - --exclude
-- test/ast_eval_feature_test.rb
-- --exclude
-- test/ast_load_feature_test.rb
-- --exclude
-- test/backtrace_test.rb
-- --exclude
-- test/covert_define_method_test.rb
-- --exclude
-- test/def_test.rb
-- --exclude
-- test/define_method_test.rb
-- --exclude
-- test/define_singleton_method_test.rb
-- --exclude
-- test/encoding_test.rb
-- --exclude
-- test/encoding_test/bad.rb
-- --exclude
-- test/encoding_test/cp932.rb
-- --exclude
-- test/encoding_test/default.rb
-- --exclude
-- test/encoding_test/eucjp.rb
-- --exclude
-- test/encoding_test/koi8.rb
-- --exclude
-- test/encoding_test/koi8_shebang.rb
-- --exclude
-- test/encoding_test/koi8_with_utf8bom.rb
-- --exclude
-- test/encoding_test/usascii.rb
-- --exclude
-- test/encoding_test/usascii_with_utf8bom.rb
-- --exclude
-- test/encoding_test/utf8.rb
-- --exclude
-- test/encoding_test/utf8bom.rb
-- --exclude
-- test/encoding_test/utf8bom_only.rb
-- --exclude
-- test/error_test.rb
-- --exclude
-- test/eval_test.rb
-- --exclude
-- test/flush_cache_test.rb
-- --exclude
-- test/lambda_test.rb
-- --exclude
-- test/load_path_test.rb
-- --exclude
-- test/load_test.rb
-- --exclude
-- test/noninvasive_test.rb
-- --exclude
-- test/readme_test.rb
-- --exclude
-- test/recursive_eval_test.rb
-- --exclude
-- test/redefine_method_test.rb
-- --exclude
-- test/reload_test.rb
-- --exclude
-- test/shared/ast_generators.rb
-- --exclude
-- test/shared/main.rb
-- --exclude
-- test/stdlib_test.rb
-- --exclude
-- test/thread_test.rb
-- --exclude
-- test/to_ast_feature_test.rb
-- --exclude
-- test/to_ruby_feature_test.rb
-- --exclude
-- test/to_ruby_test.rb
-- --exclude
-- MANIFEST
+- lib/live_ast.rb
+- -a
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/live_ast/parser.rb

@@ -1,48 +0,0 @@
-require 'ruby_parser'
-require 'sexp_processor'
-
-module LiveAST
-  class Parser < SexpProcessor
-    def parse(source)
-      @defs = {}
-      process RubyParser.new.parse(source)
-      @defs
-    end
-
-    def process_defn(sexp)
-      result = Sexp.new
-      result << sexp.shift
-      result << sexp.shift
-      result << process(sexp.shift)
-      result << process(sexp.shift)
-
-      store_sexp(result, sexp.line)
-      s()
-    end
-
-    def process_iter(sexp)
-      line = sexp[1].line
-
-      result = Sexp.new
-      result << sexp.shift
-      result << process(sexp.shift)
-      result << process(sexp.shift)
-      result << process(sexp.shift)
-
-      #
-      # ruby_parser bug: a method without args attached to a
-      # multi-line block reports the wrong line. workaround.
-      #
-      if result[1][3].size == 1
-        line = sexp.line
-      end
-
-      store_sexp(result, line)
-      s()
-    end
-
-    def store_sexp(sexp, line)
-      @defs[line] = @defs.has_key?(line) ? :multiple : sexp
-    end
-  end
-end

data/test/shared/ast_generators.rb

@@ -1,124 +0,0 @@
-module ASTGenerators
-  #
-  # no_arg_def(:f, "A#f") returns the ast of
-  #
-  #   def f
-  #     "A#f"
-  #   end
-  #
-  def no_arg_def(name, ret)
-    s(:defn, name, s(:args), s(:scope, s(:block, s(:str, ret))))
-  end
-
-  #
-  # no_arg_def_return(no_arg_def(:f, "A#f")) == "A#f"
-  #
-  def no_arg_def_return(ast)
-    ast[3][1][1][1]
-  end
-
-  #
-  # binop_def(:f, :+) returns the ast of
-  #
-  #   def f(x, y)
-  #     x + y
-  #   end
-  #
-  def binop_def(name, op)
-    s(:defn,
-      name,
-      s(:args, :x, :y),
-      s(:scope,
-        s(:block, s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))))
-  end
-
-  #
-  # binop_define_method(:f, :*) returns the ast of
-  #
-  #   define_method :f do |x, y|
-  #     x * y
-  #   end
-  #
-  def binop_define_method(name, op)
-    s(:iter,
-      s(:call, nil, :define_method, s(:arglist, s(:lit, name))),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-
-  #
-  # binop_covert_define_method(:f, :-, :my_def) returns the ast of
-  #
-  #   my_def :f do |x, y|
-  #     x - y
-  #   end
-  #
-  def binop_covert_define_method(name, op, covert_name)
-    s(:iter,
-      s(:call, nil, covert_name, s(:arglist, s(:lit, name))),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-
-  #
-  # binop_define_method_with_var(:method_name, :/) returns the ast of
-  #
-  #   define_method method_name do |x, y|
-  #     x / y
-  #   end
-  #
-  def binop_define_method_with_var(name, op)
-    s(:iter,
-      s(:call, nil, :define_method, s(:arglist, s(:lvar, name))),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-
-  #
-  # binop_define_singleton_method(:f, :+, :a) returns the ast of
-  #
-  #   a.define_singleton_method :f do |x, y|
-  #     x + y
-  #   end
-  #
-  def binop_define_singleton_method(name, op, receiver)
-    s(:iter,
-      s(:call, s(:lvar, receiver), :define_singleton_method,
-        s(:arglist, s(:lit, name))),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-  
-  #
-  # no_arg_block(:foo, "bar") returns the ast of
-  #
-  #   foo { "bar" }
-  #
-  def no_arg_block(name, ret)
-    s(:iter, s(:call, nil, name, s(:arglist)), nil, s(:str, ret))
-  end
-  
-  #
-  # binop_block(:foo, :+) returns the ast of
-  #
-  #   foo { |x, y| x + y }
-  #
-  def binop_block(name, op, receiver = nil, args = [])
-    s(:iter,
-      s(:call, receiver, name, s(:arglist, *args)),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-
-  #
-  # binop_proc_new(:*) returns the ast of
-  #
-  #   Proc.new { |x, y| x * y }
-  #
-  def binop_proc_new(op)
-    s(:iter,
-      s(:call, s(:const, :Proc), :new, s(:arglist)),
-      s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
-      s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
-  end
-end