diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
| commit | c921d0df325c803fed8c7742eb088cb3d030d541 (patch) | |
| tree | 16d374660aa9adb92c2f08317a20d61ae995ef9a /src/main.mlton.sml | |
| parent | a3e471e933945dcfb54873cb20c691a193b55671 (diff) | |
| parent | bd6f549a527856db3878f1586c6666646a45d8ee (diff) | |
Merge branch 'upstream' into dfsg_clean20160805+dfsg
Diffstat (limited to 'src/main.mlton.sml')
| -rw-r--r-- | src/main.mlton.sml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.mlton.sml b/src/main.mlton.sml index f595134f..6d368106 100644 --- a/src/main.mlton.sml +++ b/src/main.mlton.sml @@ -246,7 +246,7 @@ fun oneRun args = fun send (sock, s) = let - val n = Socket.sendVec (sock, Word8VectorSlice.full (Vector.map (Word8.fromInt o ord) s)) + val n = Socket.sendVec (sock, Word8VectorSlice.full (MLton.Word8Vector.fromPoly (Vector.map (Word8.fromInt o ord) (MLton.CharVector.toPoly s)))) in if n >= size s then () @@ -272,7 +272,7 @@ val () = case CommandLine.arguments () of val s = if CharVector.exists (fn ch => ch = #"\n") buf then "" else - Vector.map (chr o Word8.toInt) (Socket.recvVec (sock, 1024)) + MLton.CharVector.fromPoly (Vector.map (chr o Word8.toInt) (MLton.Word8Vector.toPoly (Socket.recvVec (sock, 1024)))) val s = buf ^ s val (befor, after) = Substring.splitl (fn ch => ch <> #"\n") (Substring.full s) in @@ -345,12 +345,12 @@ val () = case CommandLine.arguments () of let val v = Socket.recvVec (sock, 1024) in - if Vector.length v = 0 then + if Word8Vector.length v = 0 then OS.Process.failure else let - val s = Vector.map (chr o Word8.toInt) v - val last = Vector.sub (v, Vector.length v - 1) + val s = MLton.CharVector.fromPoly (Vector.map (chr o Word8.toInt) (MLton.Word8Vector.toPoly v)) + val last = Word8Vector.sub (v, Word8Vector.length v - 1) val (rc, s) = if last = Word8.fromInt 1 then (SOME OS.Process.success, String.substring (s, 0, size s - 1)) else if last = Word8.fromInt 2 then |