Update ocamldoc's html backend with infix constructors.

Drup · Drup · commit 52d52fe41f73 · 2014-06-26T23:26:01.000+02:00
diff --git a/ocamldoc/odoc_ocamlhtml.mll b/ocamldoc/odoc_ocamlhtml.mll
@@ -251,8 +251,10 @@ let lowercase = ['a'-'z' '\223'-'\246' '\248'-'\255' '_']
 let uppercase = ['A'-'Z' '\192'-'\214' '\216'-'\222']
 let identchar =
   ['A'-'Z' 'a'-'z' '_' '\192'-'\214' '\216'-'\246' '\248'-'\255' '\'' '0'-'9']
+let constructorchar =
+  ['$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '@' '^' '|']
 let symbolchar =
-  ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~']
+  constructorchar | ['!' '?' '~']
 let decimal_literal = ['0'-'9']+
 let hex_literal = '0' ['x' 'X'] ['0'-'9' 'A'-'F' 'a'-'f']+
 let oct_literal = '0' ['o' 'O'] ['0'-'7']+
@@ -366,7 +368,6 @@ rule token = parse
   | "."  { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ".." { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ":"  { print (Lexing.lexeme lexbuf) ; token lexbuf }
-  | "::" { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ":=" { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ":>" { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ";"  { print (Lexing.lexeme lexbuf) ; token lexbuf }
@@ -407,6 +408,22 @@ rule token = parse
             { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | ['*' '/' '%'] symbolchar *
             { print (Lexing.lexeme lexbuf) ; token lexbuf }
+
+  | ':' ['|' '&' '$'] constructorchar *
+  (* := and :> are invalid operators since  COLONEQUAL and COLONGREATER already exist.
+     :< is invalid because [ x:<foo:bar> ] is valid. *)
+  | ':' ['=' '>' '<'] constructorchar +
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
+  | ':' ['@' '^'] constructorchar *
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
+  | "::" constructorchar *
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
+  | ':' ['+' '-'] constructorchar *
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
+  | ':' "**" constructorchar *
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
+  | ':' ['*' '/' '%'] constructorchar *
+            { print (Lexing.lexeme lexbuf) ; token lexbuf }
   | eof { () }
   | _
       { raise (Error(Illegal_character ((Lexing.lexeme lexbuf).[0]),
