diff options
| author | Alain Frisch <alain@frisch.fr> | 2018-04-30 12:39:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 12:39:12 +0200 |
| commit | 672e615b8152138ac1a921d7bf5a6471dc21d8a4 (patch) | |
| tree | 1399fb5dbe562b995d78e0a83591b84f4c118ef9 /ocamldoc/odoc_text_parser.mly | |
| parent | bcfa95848bc28a67513b2136e830ae573d238e4b (diff) | |
| parent | 9273bab69e3c2cbd45595797cf231339d92d6fe2 (diff) | |
| download | ocaml-fix_large_file_lseek_windows.tar.gz | |
Merge branch 'trunk' into fix_large_file_lseek_windowsfix_large_file_lseek_windows
Diffstat (limited to 'ocamldoc/odoc_text_parser.mly')
| -rw-r--r-- | ocamldoc/odoc_text_parser.mly | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ocamldoc/odoc_text_parser.mly b/ocamldoc/odoc_text_parser.mly index f71ab3777c..3d590d45c4 100644 --- a/ocamldoc/odoc_text_parser.mly +++ b/ocamldoc/odoc_text_parser.mly @@ -82,6 +82,9 @@ let print_DEBUG s = print_string s; print_newline () %token EOF %token <string> Char +%nonassoc below_Char +%nonassoc Char + /* Start Symbols */ %start main located_element_list %type <Odoc_types.text> main @@ -177,7 +180,6 @@ text_element: list: | string { [] (* TODO: a test to check that there is only space characters *) } | string list { $2 } -| list string { $1 } | item { [ $1 ] } | item list { $1 :: $2 } @@ -207,7 +209,7 @@ shortcut_enum2: string: - Char { $1 } + Char %prec below_Char { $1 } | Char string { $1^$2 } ; |