Fully normalized top-level definitions

lib/http.tri

@@ -3,7 +3,7 @@
 !import "socket.tri"      !Local
 
 -- ---------------------------------------------------------------------------
--- 1. Constants
+--  Constants
 -- ---------------------------------------------------------------------------
 
 maxHeaderBytes = 65536
@@ -14,39 +14,7 @@ crlf = pair 13 (pair 10 t)
 crlfcrlf = pair 13 (pair 10 (pair 13 (pair 10 t)))
 
 -- ---------------------------------------------------------------------------
--- 2. Lazy eliminators
--- ---------------------------------------------------------------------------
-
-lazyBool = (thenK elseK cond :
-  ((chosen : chosen t)
-   (matchBool
-     thenK
-     elseK
-     cond)))
-
-lazyList = (nilK consK xs :
-  ((chosen : chosen t)
-   (matchList
-     nilK
-     (h r : (_ : consK h r))
-     xs)))
-
-lazyMaybe = (noneK someK m :
-  ((chosen : chosen t)
-   (matchMaybe
-     noneK
-     (x : (_ : someK x))
-     m)))
-
-lazyResult = (errK okK result :
-  ((chosen : chosen t)
-   (matchResult
-     (code rest : (_ : errK code rest))
-     (value rest : (_ : okK value rest))
-     result)))
-
--- ---------------------------------------------------------------------------
--- 3. Small byte/list helpers
+--  Small byte/list helpers
 -- ---------------------------------------------------------------------------
 
 chomp = (xs :
@@ -60,7 +28,7 @@ chomp = (xs :
     (reverse xs))
 
 -- ---------------------------------------------------------------------------
--- 4. Response construction
+--  Response construction
 -- ---------------------------------------------------------------------------
 
 statusPhrase = (code :
@@ -184,7 +152,7 @@ responseForMethod = (method resp :
     (equal? method "HEAD"))
 
 -- ---------------------------------------------------------------------------
--- 5. Header receive / framing
+--  Header receive / framing
 -- ---------------------------------------------------------------------------
 
 recvUntilMax_ = (y (self sock pattern maxBytes acc accLen :
@@ -221,7 +189,7 @@ recvHeaders = (sock :
   recvUntilMax sock crlfcrlf maxHeaderBytes)
 
 -- ---------------------------------------------------------------------------
--- 6. Request line parsing
+--  Request line parsing
 -- ---------------------------------------------------------------------------
 
 readLineBytes_ = (y (self bs acc :
@@ -277,7 +245,7 @@ parseRequestLine = (bs :
    (readLineBytes bs)))
 
 -- ---------------------------------------------------------------------------
--- 7. Header parsing
+--  Header parsing
 -- ---------------------------------------------------------------------------
 
 
@@ -429,7 +397,7 @@ parseHeaders = (bs :
   y parseHeaders_ bs t t t false true)
 
 -- ---------------------------------------------------------------------------
--- 8. Content-Length parsing
+--  Content-Length parsing
 -- ---------------------------------------------------------------------------
 
 bit0? = (x :
@@ -544,7 +512,7 @@ contentLength = (headers :
   y contentLength_ headers)
 
 -- ---------------------------------------------------------------------------
--- 9. Body reading
+--  Body reading
 -- ---------------------------------------------------------------------------
 
 consumeAvailable_ = (y (self bytes remaining acc :