Commits

Anonymous committed eb54e7d

removed unneeded 'http_' prefix

Comments (0)

Files changed (2)

iteratees_http.ml

    Reading headers and the content from an HTTP-like stream
 *)
 
-type http_line = string  (* The line of text, terminators are not included *)
+type line = string  (* The line of text, terminators are not included *)
 ;
 
 
    ones. It knows nothing about the representation of Iteratees.
 *)
 
-value (http_line : iteratee char ([= `No_term | `Term] * http_line)) =
+value (line : iteratee char ([= `No_term | `Term] * line)) =
   let lf = ['\n'] in
   let crlf = ['\r'; '\n'] in
   let check l ts =
    with non-trivial actions during chunk processing
 *)
 
-value (http_print_lines : iteratee http_line unit) =
+value (print_lines : iteratee line unit) =
   let pr_line l = print_line (">> read line: " ^ l)
   in
   ie_cont step
   match i with
   [ IE_cont None k ->
 let () = dbg "enum_lines: IE_cont\n" in
-      http_line >>= fun line ->
-        match line with
+      line >>= fun term_line ->
+        match term_line with
         [ (`Term, "") ->
 let () = dbg "enum_lines:   empty line\n" in
             return i  (* empty line, normal exit *)
 
 value read_lines_and_one_more_line : iteratee 'a 'b =
   joinI (enum_lines stream2list) >>= fun lines ->
-  http_line >>= fun after ->
+  line >>= fun after ->
   return (lines,after)
 ;
 
 let () = dbg "rl: lines got\n" in
     is_stream_finished >>= fun e ->
 let () = dbg "rl: e got\n" in
-    http_line >>= fun after ->
+    line >>= fun after ->
 let () = dbg "rl: rest got\n" in
     return ((lines, e), after)
   in
 
 (* Test Fd driver *)
 
-value test_driver (line_collector : iteratee http_line 'a) filepath : IO.m unit
+value test_driver (line_collector : iteratee line 'a) filepath : IO.m unit
  =
   let read_lines_and_one_more_line : iteratee char 'y =
     joinI (enum_lines line_collector) >>= fun lines ->
     is_stream_finished >>= fun e ->
-    http_line >>= fun after ->
+    line >>= fun after ->
     return ((lines, e), after)
   in
   mprintf "Opening file %S\n" filepath >>% fun () ->
   @
   List.map runIO
   [
-    test_driver http_print_lines "test-files/test1.txt"
-  ; test_driver http_print_lines "test-files/test2.txt"
-  ; test_driver http_print_lines "test-files/test3.txt"
-  ; test_driver http_print_lines dev_null
+    test_driver print_lines "test-files/test1.txt"
+  ; test_driver print_lines "test-files/test2.txt"
+  ; test_driver print_lines "test-files/test3.txt"
+  ; test_driver print_lines dev_null
   ]
 
   )
    Don't know why, but there is no "joinI" in original sources.
 *)
 
-value http_line_printer : iteratee char unit =
-  joinI & enum_lines http_print_lines
+value line_printer : iteratee char unit =
+  joinI & enum_lines print_lines
 ;
 
 
       print_headers headers
    ]) >>= fun () ->
    (lift%mprintf) "\nLines of the body follow:\n" >>= fun () ->
-   joinI & enum_chunk_decoded http_line_printer
+   joinI & enum_chunk_decoded line_printer
 ;
 
 
 
 value print_headers_print_body () : iteratee 'a unit =
   (lift%mprintf) "\nLines of the headers follow:\n" >>= fun () ->
-  http_line_printer >>= fun () ->
+  line_printer >>= fun () ->
   (lift%mprintf) "\nLines of the body follow:\n" >>= fun () ->
-  joinI & enum_chunk_decoded http_line_printer
+  joinI & enum_chunk_decoded line_printer
 ;
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.