added newline comments. differs slightly from alpha in consuming the …

…newline

lib/matchers/omega/matcher.ml

@@ -95,8 +95,13 @@ module Make (Syntax : Syntax.S) (Info : Info.S) = struct
               end)
             in
             M.comment
-          | Nested_multiline (_, _)
-          | Until_newline _ -> zero)
+          | Until_newline start ->
+            let module M = Parsers.Comments.Omega.Until_newline.Make(struct
+                let start = start
+              end)
+            in
+            M.comment
+          | Nested_multiline (_, _) -> zero) (* FIXME *)
       |> choice
 
   let until_of_from from =

lib/parsers/comments.ml

@@ -19,6 +19,9 @@ module Omega = struct
        diverges from Alpha and is a little bit... weird *)
     (many_till any_char (string until))
 
+  let anything_excluding_newlines () =
+    anything_including_newlines ~until:"\n"
+
   let non_nested_comment from until =
     between
       (string from)
@@ -37,6 +40,22 @@ module Omega = struct
       let comment = non_nested_comment M.left M.right
     end
   end
+
+  (* XXX consumes the newline *)
+  let until_newline start =
+    (string start *> anything_excluding_newlines ()
+     |>> fun l -> start^(String.of_char_list l))
+
+  module Until_newline = struct
+    module type S = sig
+      val start : string
+    end
+
+    module Make (M : S) = struct
+      let comment = until_newline M.start
+    end
+  end
+
 end
 
 module Alpha = struct