debugger-linecache 1.1.2 → 1.2.0

data/.travis.yml

@@ -1,5 +1,5 @@
 before_install: bundle init --gemspec=debugger-linecache.gemspec
-before_script: rake compile
 rvm:
 - 1.9.2
 - 1.9.3
+- 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+* Replace C extension with ruby 
+* No more debugger-ruby_core_source dependency
+
 ## 1.1.2
 * Fix rdoc/ri warning
 

data/CONTRIBUTING.md

@@ -0,0 +1 @@
+Thanks for trying out this project! [See here for contribution guidelines.](http://tagaholic.me/contributing.html)

data/README.md

@@ -7,10 +7,14 @@ For more info see OLD\_README.
 ## Credits
 
 * Original authors: R. Bernstein, Mark Moseley
+* @ko1 - replace C extension with ruby
 
 ## TODO
 * Fix todo test
 
+## Contributing
+[See here](http://tagaholic.me/contributing.html)
+
 ## LICENSE
 
 This library is licensed under LICENSE.txt. Original was GNU.

data/Rakefile

@@ -1,11 +1,7 @@
 # -*- Ruby -*-
+
 require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/extensiontask'
-
-Rake::ExtensionTask.new('trace_nums')
-
-SO_NAME = "trace_nums.so"
 
 desc "Test everything."
 test_task = task :test => :lib do
@@ -16,13 +12,6 @@ test_task = task :test => :lib do
   end
 end
 
-desc "Create the core ruby-debug shared library extension"
-task :lib do
-  Dir.chdir("ext") do
-    system("#{Gem.ruby} extconf.rb && make")
-  end
-end
-
 desc "Test everything - same as test."
 task :check => :test
 
@@ -32,40 +21,8 @@ Gem::PackageTask.new(base_spec) do |pkg|
   pkg.need_tar = true
 end
 
-# Windows specification
-win_spec = base_spec.clone
-win_spec.extensions = []
-## win_spec.platform = Gem::Platform::WIN32 # deprecated
-win_spec.platform = 'mswin32'
-win_spec.files += ["lib/#{SO_NAME}"]
-
-desc "Create Windows Gem"
-task :win32_gem do
-  # Copy the win32 extension the top level directory.
-  current_dir = File.expand_path(File.dirname(__FILE__))
-  source = File.join(current_dir, "ext", "win32", SO_NAME)
-  target = File.join(current_dir, "lib", SO_NAME)
-  cp(source, target)
-
-  # Create the gem, then move it to pkg.
-  Gem::Builder.new(win_spec).build
-  gem_file = "#{win_spec.name}-#{win_spec.version}-#{win_spec.platform}.gem"
-  mv(gem_file, "pkg/#{gem_file}")
-
-  # Remove win extension from top level directory.
-  rm(target)
-end
-
 desc "Remove built files"
-task :clean => [:clobber_package, :clobber_rdoc] do
-  cd "ext" do
-    if File.exists?("Makefile")
-      sh "make clean"
-      rm  "Makefile"
-    end
-    derived_files = Dir.glob(".o") + Dir.glob("*.so")
-    rm derived_files unless derived_files.empty?
-  end
+task :clean => [:clobber_package] do
 end
 
 task :default => [:test]

data/debugger-linecache.gemspec

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 require 'rubygems' unless defined? Gem
 require File.dirname(__FILE__) + "/lib/debugger/linecache"
 
@@ -15,8 +15,6 @@ example in a debugger where the same lines are shown many times.
   s.required_rubygems_version = ">= 1.3.6"
   s.extra_rdoc_files = ["README.md"]
   s.files = `git ls-files`.split("\n")
-  s.extensions << "ext/trace_nums/extconf.rb"
-  s.add_dependency "debugger-ruby_core_source", '>= 1.1.1'
   s.add_development_dependency 'rake', '~> 0.9.2.2'
-  s.add_development_dependency 'rake-compiler', '~> 0.8.0'
+  s.license = "MIT"
 end

data/lib/debugger/linecache.rb

@@ -1,5 +1,5 @@
 module Debugger
   module Linecache
-    VERSION = '1.1.2'
+    VERSION = '1.2.0'
   end
 end

data/lib/tracelines19.rb

@@ -1,10 +1,26 @@
 #!/usr/bin/env ruby
 # $Id$
-require 'trace_nums'
 
 module TraceLineNumbers
   # Return an array of lines numbers that could be
   # stopped at given a file name of a Ruby program.
+
+  def self.lnums_for_str src
+    name = "#{Time.new.to_i}_#{rand(2**31)}"
+    iseq = RubyVM::InstructionSequence.compile(src, name)
+    lines = {}
+    iseq.disasm.each_line{|line|
+      if /^\d+ (\w+)\s+.+\(\s*(\d+)\)$/ =~ line
+        insn = $1
+        lineno = $2.to_i
+        next unless insn == 'trace'
+        lines[lineno] = true
+        # p [lineno, line]
+      end
+    }
+    lines.keys
+  end
+
   def lnums_for_file(file)
     lnums_for_str(File.read(file))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugger-linecache
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,24 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debugger-ruby_core_source
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,22 +29,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 description: ! 'Linecache is a module for reading and caching lines. This may be useful
   for
 
@@ -69,22 +37,19 @@ description: ! 'Linecache is a module for reading and caching lines. This may be
 '
 email: gabriel.horner@gmail.com
 executables: []
-extensions:
-- ext/trace_nums/extconf.rb
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE.txt
 - OLD_CHANGELOG
 - OLD_README
 - README.md
 - Rakefile
 - debugger-linecache.gemspec
-- ext/trace_nums/extconf.rb
-- ext/trace_nums/trace_nums.c
-- ext/trace_nums/trace_nums.h
 - lib/debugger/linecache.rb
 - lib/linecache19.rb
 - lib/tracelines19.rb
@@ -123,7 +88,8 @@ files:
 - test/test-lnum.rb
 - test/test-tracelines.rb
 homepage: http://github.com/cldwalker/debugger-linecache
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

data/ext/trace_nums/extconf.rb

@@ -1,15 +0,0 @@
-require "mkmf"
-require "debugger/ruby_core_source"
-
-if RUBY_VERSION < '1.9'
-  abort("Ruby version is too old")
-end
-
-hdrs = proc {
-  have_header("vm_core.h") and have_header("version.h")
-}
-
-dir_config("ruby")
-if !Debugger::RubyCoreSource.create_makefile_with_core(hdrs, "trace_nums")
-  abort("Makefile creation failed.")
-end

data/ext/trace_nums/trace_nums.c

@@ -1,105 +0,0 @@
-/*
-Ruby 1.9 version: (7/20/2009, Mark Moseley, mark@fast-software.com)
-
-   Now works with Ruby-1.9.1. Tested with p129 and p243.
-
-   This does not (and can not) function identically to the 1.8 version. 
-   Line numbers are ordered differently. But ruby-debug doesn't seem 
-   to mind the difference.
-
-   Also, 1.9 does not number lines with a "begin" statement.
-
-   All this 1.9 version does is compile into bytecode, disassemble it
-   using rb_iseq_disasm(), and parse the text output. This isn't a
-   great solution; it will break if the disassembly format changes.
-   Walking the iseq tree and decoding each instruction is pretty hairy,
-   though, so until I have a really compelling reason to go that route, 
-   I'll leave it at this.
-*/
-#include <ruby.h>
-#include <version.h>
-#include <vm_core.h>
-#include "trace_nums.h"
-
-VALUE mTraceLineNumbers;
-
-static inline const rb_data_type_t *
-threadptr_data_type(void)
-{
-        static const rb_data_type_t *thread_data_type;
-        if (!thread_data_type)
-        {
-                VALUE current_thread = rb_thread_current();
-                thread_data_type = RTYPEDDATA_TYPE(current_thread);
-        }
-        return thread_data_type;
-}
-
-#define ruby_threadptr_data_type *threadptr_data_type()
-#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
-
-/* Return a list of trace hook line numbers for the string in Ruby source src*/
-static VALUE 
-lnums_for_str(VALUE self, VALUE src)
-{
-  VALUE result = rb_ary_new(); /* The returned array of line numbers. */
-  int len;
-  char *token;
-  char *disasm;
-  rb_thread_t *th;
-  VALUE iseqval;
-  VALUE disasm_val;
-
-  StringValue(src); /* Check that src is a string. */
-  th = GET_THREAD();
-
-  /* First compile to bytecode, using the method in eval_string_with_cref() in vm_eval.c */
-  th->parse_in_eval++;
-  th->mild_compile_error++;
-  iseqval = rb_iseq_compile(src, rb_str_new_cstr("(numbers_for_str)"), INT2FIX(1));
-  th->mild_compile_error--;
-  th->parse_in_eval--;
-
-  /* Disassemble the bytecode into text and parse into lines */
-  disasm_val = rb_iseq_disasm(iseqval);
-  if (disasm_val == Qnil)
-    return(result);
-
-  disasm = (char*)malloc(strlen(RSTRING_PTR(disasm_val))+1);
-  strcpy(disasm, RSTRING_PTR(disasm_val));
-
-  for (token = strtok(disasm, "\n"); token != NULL; token = strtok(NULL, "\n")) 
-  {
-    /* look only for lines tracing RUBY_EVENT_LINE (1) */
-    if (strstr(token, "trace            1 ") == NULL)
-      continue;
-    len = strlen(token) - 1;
-    if (token[len] != ')') 
-      continue;
-    len--;
-    if ((token[len] == '(') || (token[len] == ' '))
-      continue;
-      
-    for (; len > 0; len--)
-    {
-      if (token[len] == ' ') 
-        continue;
-      if ((token[len] >= '0') && (token[len] <= '9')) 
-        continue;
-      if (token[len] == '(')
-        rb_ary_push(result, INT2NUM(atoi(token + len + 1))); /* trace found */
-
-      break;
-    }
-  }
-
-  free(disasm);
-  return result;
-}
-
-void Init_trace_nums(void)
-{
-    mTraceLineNumbers = rb_define_module("TraceLineNumbers");
-    rb_define_module_function(mTraceLineNumbers, "lnums_for_str", 
-			      lnums_for_str, 1);
-}

data/ext/trace_nums/trace_nums.h

@@ -1,111 +0,0 @@
-/* Order is in C enum order. The below is correct for Ruby 1.8.6.
-   Possibly others, but there may need some adjustment here.
-  */
-const char *NODE2NAME[] = 
-  {
-    "method",
-    "fbody",
-    "cfunc",
-    "scope",
-    "block",
-    "if",
-    "case",
-    "when",
-    "opt_n (-n)",
-    "while",
-    "until",
-    "iter",
-    "for",
-    "break",
-    "next",
-    "redo",
-    "retry",
-    "begin",
-    "rescue",
-    "resbody",
-    "ensure",
-    "and",
-    "or",
-    "not",
-    "masgn",
-    "lasgn (x=)",
-    "dasgn",
-    "dasgn_curr",
-    "gasgn",
-    "iasgn",
-    "cdecl",
-    "cvasgn",
-    "cvdecl",
-    "op_asgn1",
-    "op_asgn2",
-    "op_asgn_and",
-    "op_asgn_or",
-    "call",
-    "fcall",
-    "vcall",
-    "super",
-    "zsuper",
-    "array",
-    "zarray",
-    "hash",
-    "return",
-    "yield",
-    "lvar",
-    "dvar",
-    "gvar",
-    "ivar",
-    "const",
-    "cvar",
-    "nth_ref",
-    "back_ref",
-    "match",
-    "match2 (~=, !~)",
-    "match3 (~=, !~)",
-    "lit",
-    "str",
-    "dstr",
-    "xstr",
-    "dxstr",
-    "evstr",
-    "dregx",
-    "dregx_once",
-    "args",
-    "argscat",
-    "argspush",
-    "splat (*args)",
-    "to_ary",
-    "svalue",
-    "block_arg",
-    "block_pass",
-    "defn",
-    "defs",
-    "alias",
-    "valias",
-    "undef",
-    "class",
-    "module",
-    "sclass",
-    "colon2 (::)",
-    "colon3",
-    "cref",
-    "dot2 (..)",
-    "dot3 (...)",
-    "flip2",
-    "flip3",
-    "attrset",
-    "self",
-    "nil",
-    "true",
-    "false",
-    "defined?",
-    "newline (; or \\n)",
-    "postexe",
-    "alloca",
-    "dmethod",
-    "bmethod",
-    "memo",
-    "ifunc",
-    "dsym",
-    "attrasgn",
-    "last"
-};