Ticket #210: 0001-Add-minimal-OCaml-support.patch

a/ext/ohcount_native/generator.rb

@@ -51 +51 @@
-      metafont = LineCommentMonoglot.new("metafont", "%");
-      metapost = LineCommentMonoglot.new("metapost", "%");
-      objective_c = CMonoglot.new("objective_c", '//',             [e('/*'), e('*/')], true,  false)
+      ocaml = CMonoglot.new("ocaml",             nil,              [e('(*'), e('*)')], true,  false)
-      pascal = CMonoglot.new("pascal",           '//',             ['{','}'],          true,  true, {:no_escape_dquote => true, :no_escape_squote => true})
-      perl = CMonoglot.new("perl",               '#',              ['^=\\\\w+', '^=cut[ \t]*\\\\n'],  true,  true)
-      phplanguage = CMonoglot.new("php",         ['//', '#'],             [e('/*'), e('*/')], true,  true, {:polyglot_name => 'phplanguage'})
@@ -119 +120 @@
-        metafont,
-        metapost,
-        objective_c,
+        ocaml,
-        pascal ,
-        perl ,
-        pike ,

a/lib/ohcount/detector.rb

@@ -164 +164 @@
-    '.lisp' => "lisp",
-    '.m'    => :matlab_or_objective_c,
-    '.mf'   => 'metafont',
+    '.ml' => 'ocaml',
+    '.ml4'  => 'ocaml',
+    '.mli'  => 'ocaml',
-    '.mk'   => 'make',
-    '.mm'   => "objective_c",
-    '.mp'   => 'metapost_with_tex',

a/lib/ohcount/sloc_info.rb

@@ -72 +72 @@
-      'metapost'      => {:nice_name => 'MetaPost'         , :category => 1},
-      'mxml'          => {:nice_name => 'Flex'             , :category => 1},
-      'objective_c'   => {:nice_name => 'Objective C'      , :category => 0},
+      'ocaml'         => {:nice_name => 'Objective Caml'   , :category => 0},
-      'pascal'        => {:nice_name => 'Pascal'           , :category => 0},
-      'perl'          => {:nice_name => 'Perl'             , :category => 0},
-      'php'           => {:nice_name => 'PHP'              , :category => 0},

/dev/null

@@ +1 @@
+let rec fib n =
+match n with
+| 0 -> 1
+| 1 -> 1
+| _ -> fib (n-2) + fib (n-1)
+;;

/dev/null

@@ +1 @@
+(* really stupid way to calculate a number in the fibonacci sequence *)
+
+let rec fib n =
+  match n with
+    | 0 -> 1
+    | 1 -> 1
+    | _ -> fib (n-2) + fib (n-1)
+;;

/dev/null

@@ +1 @@
+# This has been shamelessly copied from java_test.rb because my Ruby is not so
+# good and I don't really know what people expect from a Ohcount language test
+#  -- Reinier Lamers 2008-01-19
+# Ditto from haskell_test.rb
+#  -- Samuel Bronson 2008-06-14
+require File.dirname(__FILE__) + '/../test_helper'
+
+class Ohcount::OcamlTest < Ohcount::Test
+  def test_comments
+    lb = [Ohcount::LanguageBreakdown.new("ocaml", "", "(* comment *)", 0)]
+    assert_equal lb, Ohcount::parse("(* comment *)", "ocaml")
+  end
+
+  def test_comprehensive
+    verify_parse("ocaml1.ml")
+  end
+end