Changeset 1fabcc0a1d1b2376339c3d8d4f052beef910fcb3

Show
Ignore:
Timestamp:
06/26/2008 04:52:28 PM (6 months ago)
Author:
Robin Luckey <robin@ohloh.net>
git-committer:
Robin Luckey <robin@ohloh.net> 1214524348 -0700
git-parent:

[676dc44cb59a8fb684940300c42aea812eab4fe5], [873d0fee5838f3c7b9c8c36a564fb005c5909106]

git-author:
Robin Luckey <robin@ohloh.net> 1214524348 -0700
Message:

Merge from Ohcount main line

Conflicts:

ext/ohcount_native/generator.rb
test/unit/vhdl_test.rb

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Rakefile

    radfc63c r1fabcc0  
    100100 
    101101Rake::TestTask.new :ohcount_unit_tests => ARCH_DL do |t| 
    102   puts File.dirname(__FILE__) + '/test/unit/*_test.rb' 
     102  # puts File.dirname(__FILE__) + '/test/unit/*_test.rb' 
    103103  t.test_files = FileList[File.dirname(__FILE__) + '/test/unit/*_test.rb'] 
    104   t.verbose = true 
     104  # t.verbose = true 
    105105end 
    106106 

  • bin/ohcount

    rab15090 r1fabcc0  
    258258    if comment+code > 0 
    259259      printf(" %9.1f%%", comment.to_f / (comment+code).to_f * 100.0) 
     260    else 
     261      printf("       0.0%"); 
    260262    end 
    261263    printf(" %10d", blank) 

  • lib/ohcount/detector.rb

    r048a0f2 r1fabcc0  
    130130    '.kdebuild-1'=> "ebuild", 
    131131    '.erl'  => "erlang", 
     132    '.exheres-0' => "exheres", 
     133    '.exlib' => "exheres", 
    132134    '.f'    => :disambiguate_fortran, 
    133135    '.ftn'  => :disambiguate_fortran, 
    …… 
    174176    '.php4' => "php", 
    175177    '.php5' => "php", 
     178    '.p6'   => "perl", 
    176179    '.pl'   => "perl", 
    177180    '.pm'   => "perl", 
    …… 
    222225    'Makefile.am'   => 'automake', 
    223226    'configure.in'  => 'autoconf', 
    224     'configure.ac'  => 'autoconf' 
     227    'configure.ac'  => 'autoconf', 
     228    'configure'     => 'autoconf' 
    225229  } 
    226230 

  • lib/ohcount/sloc_info.rb

    r23ee87d r5bdc29e  
    5858      'emacslisp'     => {:nice_name => 'Emacs Lisp'       , :category => 0}, 
    5959      'erlang'        => {:nice_name => 'Erlang'           , :category => 0}, 
     60      'exheres'       => {:nice_name => 'Exheres'          , :category => 0}, 
    6061      'fortranfixed'  => {:nice_name => 'Fortran (Fixed-format)', :category => 0}, 
    6162      'fortranfree'   => {:nice_name => 'Fortran (Free-format)',  :category => 0}, 
    …… 
    8687      'tcl'           => {:nice_name => 'Tcl'              , :category => 0}, 
    8788      'vala'          => {:nice_name => 'Vala'             , :category => 0}, 
     89      'vhdl'          => {:nice_name => 'VHDL'             , :category => 0}, 
    8890      'visualbasic'   => {:nice_name => 'Visual Basic'     , :category => 0}, 
    8991      'vim'           => {:nice_name => 'Vim Script'       , :category => 0}, 

  • test/unit/detector_test.rb

    r7cf8da8 r53b5981  
    5959    assert_equal "ebuild", do_detect("foo.ebuild") 
    6060    assert_equal "ebuild", do_detect("foo.eclass") 
     61    assert_equal "exheres", do_detect("foo.exheres-0") 
     62    assert_equal "exheres", do_detect("foo.exlib") 
    6163  end 
    6264 

  • test/unit/vhdl_test.rb

    rfcb57d7 r1fabcc0  
    22 
    33class Ohcount::VHDLTest < Ohcount::Test 
    4  
    54  def test_comment 
    65    lb = [Ohcount::LanguageBreakdown.new("vhdl", "", "-- comment", 0)]