Changeset 64b5f3112397fee684e191efb7a33d21f374b50f

Timestamp:

03/14/2008 01:53:23 PM (10 months ago)

Author:

Robin Luckey <robin@Tangier.local>

git-committer:

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

git-parent:

[b5d153b1240eb6c91024d163c8a4cc368e7eaf6f]

git-author:

Henrik Grubbstrom <grubba@grubba.org> 1205359064 +0100

Message:

Added disambiguator of *.in-files.

Files:

• lib/ohcount/detector.rb (modified) (2 diffs)

lib/ohcount/detector.rb

@@ -138 +138 @@
-    '.htm'  => "html",
-    '.html' => "html",
+    '.in'   => :disambiguate_in,
-    '.inc'  => :disambiguate_inc,
-    '.java' => "java",
@@ -265 +266 @@
-  end
-
+  # For *.in files, checks the prior extension.
+  # Typically used for template files (eg Makefile.in, auto.c.in, etc).
+  def self.disambiguate_in(file_context)
+    # if the filename has an extension prior to the .in
+    if file_context.filename =~ /\..*\.in$/
+      filename = file_context.filename.gsub(/\.in$/, "")
+      context = Ohcount::SimpleFileContext.new(filename, file_context.filenames, file_context.contents, file_context.file_location)
+      return detect(context)
+    end
+    nil
+  end
+
-  # For *.inc files, checks for a PHP class.
-  def self.disambiguate_inc(file_context)