Changeset 629f9cab359caeb39a81c40233f3369d904a7629

Timestamp:

03/14/2008 02:24:19 PM (10 months ago)

Author:

Robin Luckey <robin@Tangier.local>

git-committer:

Robin Luckey <robin@Tangier.local> 1205529859 -0700

git-parent:

[b5d153b1240eb6c91024d163c8a4cc368e7eaf6f]

git-author:

ciaranm <robin@Tangier.local> 1205331170 -0700

Message:

split cncpp into c and cpp

Files:

• ext/ohcount_native/generator.rb (modified) (2 diffs)
• ext/ohcount_native/ruby_binding.c (modified) (2 diffs)
• lib/ohcount/detector.rb (modified) (6 diffs)
• lib/ohcount/detector.rb.orig (added)
• lib/ohcount/sloc_info.rb (modified) (1 diff)
• test/detect_files/uses_cpp_headers.h (added)
• test/detect_files/uses_cpp_keywords.h (added)
• test/detect_files/uses_cpp_stdlib_headers.h (added)
• test/detect_files/uses_no_cpp.h (added)
• test/expected_dir/c1.c/c/blanks (added)
• test/expected_dir/c1.c/c/code (added)
• test/expected_dir/c1.c/c/comment (added)
• test/expected_dir/c1.c/cncpp/blanks (deleted)
• test/expected_dir/c1.c/cncpp/code (deleted)
• test/expected_dir/c1.c/cncpp/comment (deleted)
• test/unit/c_test.rb (modified) (1 diff)
• test/unit/detector_test.rb (modified) (2 diffs)
• test/unit/diff_test.rb (modified) (1 diff)

ext/ohcount_native/generator.rb

@@ -27 +27 @@
-      boo = PythonMonoglot.new("boo")
-      clearsilver = CMonoglot.new("clearsilver", '#',              nil,                true,  true)
-
+
+
-      csharp = CMonoglot.new("csharp",           '//',             [e('/*'), e('*/')], true,  false)
-      css = CMonoglot.new("css",                  nil,             [e('/*'), e('*/')], false,  false)
@@ -73 +74 @@
-        boo ,
-        clearsilver ,
-
+
+
-        csharp ,
-        css ,

ext/ohcount_native/ruby_binding.c

@@ -105 +105 @@
- *   # Print each line to the console, labeled as code or comments
- *   buffer = File.read("helloworld.c")
-ncpp
+
- *     puts "#{semantic.to_s} #{line}"
- *   end
@@ -113 +113 @@
- *   # Print total lines of code
- *   buffer = File.read("helloworld.c")
-ncpp
+
- *   results.each do |result|
- *     puts "Lines of #{result.name} code: #{ result.code.split("\n").size }"

lib/ohcount/detector.rb

@@ -36 +36 @@
-  # Example:
-  #
-/C++
+
-  #   Dir.entries("src").each do |file|
-  #     context = Ohcount::SimpleFileContext.new(file)
-  #     polyglot = Ohcount::Detector.detect(context)
-ncpp
+
-  #   end
-  #
-  def self.detect(file_context)
-    # start with extension
-
+
+
-    case polyglot
-    when String
@@ -104 +105 @@
-    '.bat'  => "bat",
-    '.boo'  => "boo",
-
-
-
+
+
+
+
-    '.css'  => "css",
-nc
-nc
+
+
-    '.el'   => "emacslisp",
-    #   '.cbl'  => "cobol",
@@ -130 +132 @@
-    '.groovy'=> "groovy",
-    '.h'    => :disambiguate_h_header,
-
-
+
+
+
-    '.hs'   => "haskell",
-nc
-nc
+
+
-    '.hrl'  => "erlang",
-    '.htm'  => "html",
@@ -218 +221 @@
-  end
-
-/C++ from
+, C++ and
-  #
-  # This is done with a weighted heuristic that
-  # scans the *.h file contents for Objective-C keywords,
-
+
+
-  def self.disambiguate_h_header(file_context)
-    buffer = file_context.contents
@@ -234 +238 @@
-      file_context.filenames.contains_m = file_context.filenames.select { |a| a =~ /\.m$/ }.any?
-    end
-'cncpp'
+disambiguate_c_cpp(buffer)
-
-    # if the dir contains a matching *.m file, likely objective_c
@@ -246 +250 @@
-    objective_c += lines_matching(buffer, objective_c_signatures)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-

lib/ohcount/sloc_info.rb

@@ -45 +45 @@
-      'bat'           => {:nice_name => 'DOS batch script' , :category => 0},
-      'boo'           => {:nice_name => 'Boo'              , :category => 0},
-
+
+
-      'clearsilver'   => {:nice_name => 'ClearSilver'      , :category => 0},
-      'csharp'        => {:nice_name => 'C#'               , :category => 0},

test/unit/c_test.rb

@@ -4 +4 @@
-
-  def test_comments
-ncpp
-ncpp
+
+
-  end
-
-  def test_empty_comments
-ncpp
-ncpp
+
+
-  end
-
-
-  def test_block_comment
-ncpp
-ncpp
+
+
-  end
-

test/unit/detector_test.rb

@@ -38 +38 @@
-
-  def test_detect_polyglot
-
+
+
+
+
+
-    assert_equal "ruby", do_detect("foo.rb")
-    assert_equal "matlab", do_detect("foo_matlab.m", ["foo_matlab.m", "bar.m", "README"])
@@ -53 +57 @@
-
-  def test_upper_case_extensions
-nc
+
-    assert_equal "ruby", do_detect("foo_upper_case.RB")
-  end

test/unit/diff_test.rb

@@ -25 +25 @@
-    sloc_infos = Ohcount.diff_files(src_dir + 'diff2_old.c', src_dir + 'diff2_new.c')
-
-ncpp
+
-    c.code_added,     c.code_removed     = [1,1]
-    c.comments_added, c.comments_removed = [1,1]