diff options
author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
---|---|---|
committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /doc | |
parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip |
Merge remote-tracking branch 'origin/master' into parser_fix
Diffstat (limited to 'doc')
-rw-r--r-- | doc/coq2html.mll | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/coq2html.mll b/doc/coq2html.mll index 2f1bfdbc..7dd93842 100644 --- a/doc/coq2html.mll +++ b/doc/coq2html.mll @@ -157,7 +157,7 @@ let rec set_enum_depth d = fprintf !oc "<ul>\n"; fprintf !oc "<li>\n"; incr enum_depth; - end + end else if !enum_depth > d then begin fprintf !oc "</li>\n"; fprintf !oc "</ul>\n"; @@ -290,7 +290,7 @@ rule coq_bol = parse | eof { () } | space* as s - { space s; + { space s; coq lexbuf } and skip_newline = parse @@ -337,7 +337,7 @@ and comment = parse | "*)" { if !in_proof then end_comment() } | "(*" - { if !in_proof then start_comment(); + { if !in_proof then start_comment(); comment lexbuf; comment lexbuf } | eof { () } @@ -345,7 +345,7 @@ and comment = parse { if !in_proof then newline(); comment lexbuf } | space* as s - { if !in_proof then space s; + { if !in_proof then space s; comment lexbuf } | eof { () } @@ -422,7 +422,7 @@ let process_file f = if Filename.check_suffix f ".v" then begin let pref_f = Filename.chop_suffix f ".v" in let base_f = Filename.basename pref_f in - current_module := + current_module := "compcert." ^ Str.global_replace (Str.regexp "/") "." pref_f; let ic = open_in f in if !output_name = "-" then |