unmangler 0.0.1 → 0.0.2

data/lib/unmangler/string_ptr.rb

@@ -61,7 +61,11 @@ class StringPtr
   end
 
   def index needle
-    @string[@pos..-1].index(needle)
+    (@string[@pos..-1] || '').index(needle)
+  end
+
+  def strlen
+    (@string[@pos..-1] || '').bytesize
   end
 
   def =~ re
@@ -71,6 +75,23 @@ class StringPtr
   def inc!; @pos+=1; end
   def dec!; @pos-=1; end
 
+  # get current character and then increment
+  # like in C:
+  #   c = *p++
+  def get_inc!
+    c = @string[@pos]
+    @pos+=1
+    c
+  end
+
+  # increment and then get current character
+  # like in C:
+  #   c = *++p
+  def inc_get!
+    @pos+=1
+    @string[@pos]
+  end
+
   def trim!
     return unless @string
     if idx = @string.index("\x00")
@@ -94,6 +115,10 @@ class StringPtr
       @pos - x.pos
     end
   end
+
+  def inspect
+    "#<StringPtr @pos=#{@pos.inspect}: #{@string[@pos..-1].inspect}>"
+  end
 end
 
 if $0 == __FILE__

data/lib/unmangler/version.rb

@@ -1,3 +1,3 @@
 module Unmangler
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/borland_samples_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Unmangler::Borland do
+  if max_idx = ENV['LONG_RUN']
+    max_idx = max_idx.to_i
+    idx = 0
+    YAML::load_file(File.join(SAMPLES_DIR, "borland.yaml")).each do |mangled, unmangled|
+      unmangled = preprocess_borland unmangled
+      idx += 1
+      break if idx > max_idx
+      it "should unmangle #{mangled}" do
+        Unmangler::Borland.unmangle(mangled).should == unmangled
+      end
+    end
+  else
+    it "should unmangle" do
+      YAML::load_file(File.join(SAMPLES_DIR, "borland.yaml")).each do |mangled, unmangled|
+        unmangled = preprocess_borland unmangled
+        actual = Unmangler::Borland.unmangle(mangled)
+        actual.should eql(unmangled), [
+          "mangled : #{mangled.white}",
+          "expected: #{unmangled.green}",
+          "actual  : #{actual.red}"
+        ].join("\n")
+      end
+    end
+  end
+end

data/spec/borland_spec.rb

@@ -70,4 +70,6 @@ describe Unmangler::Borland do
   check "@Dbcommon@GetTableNameFromSQLEx$qqrx17System@WideString25Dbcommon@IDENTIFIEROption",
     "__fastcall Dbcommon::GetTableNameFromSQLEx(const System::WideString, Dbcommon::IDENTIFIEROption)"
 
+  check '@Classes@TThread@$bcdtr$qqrv',    '__fastcall Classes::TThread::`class destructor`()'
+  check '@Timespan@TTimeSpan@$bcctr$qqrv', '__fastcall Timespan::TTimeSpan::`class constructor`()'
 end

data/spec/msvc_samples_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Unmangler::MSVC do
+  if max_idx = ENV['LONG_RUN']
+    max_idx = max_idx.to_i
+    idx = 0
+    YAML::load_file(File.join(SAMPLES_DIR, "msvc.yaml")).each do |mangled, unmangled|
+      idx += 1
+      break if idx > max_idx
+      it "should unmangle #{mangled}" do
+        unmangled = preprocess_msvc unmangled
+        Unmangler::MSVC.unmangle(mangled).should == unmangled
+      end
+    end
+  else
+    it "should unmangle" do
+      YAML::load_file(File.join(SAMPLES_DIR, "msvc.yaml")).each do |mangled, unmangled|
+        unmangled = preprocess_msvc unmangled
+        actual = Unmangler::MSVC.unmangle(mangled)
+        actual.should eql(unmangled), [
+          "mangled : #{mangled.white}",
+          "expected: #{unmangled.green}",
+          "actual  : #{actual.red}"
+        ].join("\n")
+      end
+    end
+  end
+end

data/spec/msvc_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Unmangler::MSVC do
+
+  it "keeps original name if not mangled" do
+    s = "foo::bar(@)"
+    Unmangler::MSVC.unmangle(s).should == s
+  end
+
+#  describe "#unmangle" do
+#    it "raises error on bad input" do
+#      lambda{
+#        Unmangler::MSVC.unmangle("@TTabPage@$bctr")
+#      }.should raise_error
+#    end
+#  end
+
+  describe "#safe_unmangle" do
+    it "raises no error and returns original on bad input" do
+      s = "@TTabPage@$bctr"
+      Unmangler::MSVC.safe_unmangle(s).should == s
+    end
+  end
+
+  def self.check mangled, unmangled, test_no_args = true
+    it "unmangles #{mangled}" do
+      Unmangler::MSVC.unmangle(mangled).should == unmangled
+    end
+
+    it "unmangles #{mangled} w/o args" do
+      x = unmangled.split('(').first.strip.
+        gsub(/(public|private|protected): /,'').
+        gsub(/(void|__ptr64|int|__thiscall|__cdecl|virtual|class|struct) /,'').
+        strip
+
+      Unmangler::MSVC.unmangle(mangled, :args => false).should == x
+    end if test_no_args
+  end
+
+  check "?h@@YAXH@Z", "void __cdecl h(int)"
+  check "?AFXSetTopLevelFrame@@YAXPAVCFrameWnd@@@Z", "void __cdecl AFXSetTopLevelFrame(class CFrameWnd *)"
+  check "??0_Lockit@std@@QAE@XZ", "public: __thiscall std::_Lockit::_Lockit(void)"
+
+  check "?SetAt@CString@@QAEXHD@Z", "public: void __thiscall CString::SetAt(int, char)"
+  check "?LoadFrame@CMDIFrameWndEx@@UAEHIKPAVCWnd@@PAUCCreateContext@@@Z",
+    "public: virtual int __thiscall CMDIFrameWndEx::LoadFrame(unsigned int, unsigned long, class CWnd *, struct CCreateContext *)"
+
+  check "??0DNameStatusNode@@AEAA@W4DNameStatus@@@Z",
+    "private: __cdecl DNameStatusNode::DNameStatusNode(enum DNameStatus) __ptr64"
+
+  check "?Add@?$CArray@VCSize@@V1@@@QAEHVCSize@@@Z",
+    "public: int __thiscall CArray<class CSize, class CSize>::Add(class CSize)"
+
+  check "??$_Char_traits_cat@U?$char_traits@D@std@@@std@@YA?AU_Secure_char_traits_tag@0@XZ",
+    "struct std::_Secure_char_traits_tag __cdecl std::_Char_traits_cat<struct std::char_traits<char> >(void)",
+    false
+
+  check "?dtor$0@?0???0CDockSite@@QEAA@XZ@4HA",
+    "int `public: __cdecl CDockSite::CDockSite(void) __ptr64'::`1'::dtor$0",
+    false
+end

data/spec/samples_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+def combined_samples
+  @@combined_samples ||=
+    begin
+      msvc    = YAML::load_file(File.join(SAMPLES_DIR, "msvc.yaml"))
+      borland = YAML::load_file(File.join(SAMPLES_DIR, "borland.yaml"))
+
+      combined = {}
+      (msvc.keys + borland.keys).uniq.each do |key|
+        um = msvc[key]
+        ub = borland[key]
+
+        combined[key] =
+          if um && um != key
+            preprocess_msvc um
+          elsif ub && ub != key
+            preprocess_borland ub
+          else
+            # neither
+            key
+          end
+      end
+      combined
+    end
+end
+
+describe Unmangler do
+  if max_idx = ENV['LONG_RUN']
+    max_idx = max_idx.to_i
+    idx = 0
+    combined_samples.each do |mangled, unmangled|
+      idx += 1
+      break if idx > max_idx
+      it "should unmangle #{mangled}" do
+        Unmangler.unmangle(mangled).should == unmangled
+      end
+    end
+  else
+    it "should unmangle" do
+      combined_samples.each do |mangled, unmangled|
+        actual = Unmangler.unmangle(mangled)
+        actual.should eql(unmangled), [
+          "mangled : #{mangled.white}",
+          "expected: #{unmangled.green}",
+          "actual  : #{actual.red}"
+        ].join("\n")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,39 @@
+require 'yaml'
+require 'awesome_print'
+
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 require 'unmangler'
 
+SAMPLES_DIR = File.expand_path("../samples", File.dirname(__FILE__))
+
+def preprocess_msvc s
+  s.gsub(',',', ')
+end
+
+def preprocess_borland s
+    r = s.gsub('const const ','const ')
+
+    # move '__fastcall' to start of the string if its found in middle of string
+    pos = r.index(" __fastcall ")
+    if pos && pos != 0
+      r = "__fastcall " + r.sub("__fastcall ", "")
+    end
+
+    r
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  #config.filter_run :focus
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  #config.order = 'random'
+  config.before(:suite) do
+    Dir[File.join(SAMPLES_DIR, "*.bz2")].each do |fname|
+      unless File.exist?(fname.sub(/\.bz2$/,''))
+        puts "[.] unpacking #{fname} .."
+        system("bunzip2", "-dk", fname)
+      end
+    end
+  end
+
+  config.backtrace_clean_patterns = [/\/rspec/]
 end

data/unmangler.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |gem|
   gem.summary       = gem.description + %q{, i.e. '@myclass@func$qil' => 'myclass::func(int, long)'}
   gem.homepage      = "http://zed.0xff.me"
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($/).
+    delete_if{ |x| x.end_with?(".bz2") || x.include?("misc/") }
+
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unmangler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies: []
 description: Unmangles mangled C++/Delphi names"
 email:
@@ -25,10 +25,16 @@ files:
 - README.md.tpl
 - Rakefile
 - lib/unmangler.rb
+- lib/unmangler/base.rb
 - lib/unmangler/borland.rb
+- lib/unmangler/msvc.rb
 - lib/unmangler/string_ptr.rb
 - lib/unmangler/version.rb
+- spec/borland_samples_spec.rb
 - spec/borland_spec.rb
+- spec/msvc_samples_spec.rb
+- spec/msvc_spec.rb
+- spec/samples_spec.rb
 - spec/spec_helper.rb
 - unmangler.gemspec
 homepage: http://zed.0xff.me
@@ -56,5 +62,9 @@ specification_version: 4
 summary: Unmangles mangled C++/Delphi names", i.e. '@myclass@func$qil' => 'myclass::func(int,
   long)'
 test_files:
+- spec/borland_samples_spec.rb
 - spec/borland_spec.rb
+- spec/msvc_samples_spec.rb
+- spec/msvc_spec.rb
+- spec/samples_spec.rb
 - spec/spec_helper.rb