qbe

commit 3a9447be7f1a83e568d08a5da7c62a7a5cb7f272
parent 8645a5ae23fb92f7df88f468f82c82d82473b0af
Author: Quentin Carbonneaux <quentin.carbonneaux@yale.edu>
Date:   Tue,  8 Mar 2016 19:50:05 -0500

get rid of dirty dedents

Diffstat:
M
doc/txt.ml
 | 
17
+++++++++--------

1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/doc/txt.ml b/doc/txt.ml
@@ -51,17 +51,18 @@ let rec getlines acc n =
     getlines ((n, getdent s, s) :: acc) (n+1)
   | None -> List.rev acc
 
-let endnum s =
+let matchs skip fin s =
   let rec f n =
     if n >= String.length s then 0 else
-    let c = Char.code s.[n] in
-    if c >= 48 && c <= 57 then f (n+1) else
-    if s.[n] = ' ' then f (n+1) else
-    if s.[n] = '.' then (n+1) else
+    if s.[n] = fin then (n+1) else
+    if String.contains skip s.[n] then f (n+1) else
     0 in
   f 0
+
+let endnum = matchs " 0123456789" '.'
+let endbul = matchs " " '*'
 let skipnum s = String.suff s (endnum s)
-let skipbullet s = String.suff (dedent s 1000) 2
+let skipbul s = String.suff s (endbul s)
 
 let gettitles lines =
   let titles = Hashtbl.create 100 in
@@ -92,7 +93,7 @@ let push lines l =
   lines := l :: !lines
 
 let isolist l = endnum l <> 0
-let isulist l = String.haspref "* " (dedent l 1000)
+let isulist l = endbul l <> 0
 
 let getverb lines idnt =
   let rec f ls =
@@ -158,7 +159,7 @@ let rec getdoc lines si acc =
     end else
     if i = si && isulist l then begin             (* Ulist item *)
       pop lines |> ignore;
-      push lines (n, i+1, skipbullet l);
+      push lines (n, i+1, skipbul l);
       let li = getdoc lines (si+1) [] in
       getdoc lines si (Ulist [li] :: acc);
     end else