MIN Better error for vmode error

luispedro · Mar 27, 2013 · 6c45826 · 6c45826
1 parent 3350e24
commit 6c45826
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hex/Modes.lhs b/hex/Modes.lhs
@@ -139,7 +139,7 @@ vMode1' (OutputfontCommand fontinfo) =
 
 If nothing matches, make the parser fail:
 \begin{code}
-vMode1' _ = unexpected "not a vmode command"
+vMode1' c = unexpected (concat ["Expected a vmode command, got ", show c])
 \end{code}
 
 Now that we have dealt with vertical mode, we must deal with the horizontal.

diff --git a/hex/Tokens.lhs b/hex/Tokens.lhs
@@ -197,10 +197,10 @@ emptyTokenStream TokenStream{charsource=st, state=s, queue=q} = null q && (isNot
 Convert a sequence of \code{CharToken} into a \code{String}
 \begin{code}
 toksToStr :: [Token] -> [Char]
-toksToStr = map charof
+toksToStr = concatMap tos
     where
-        charof (CharToken (TypedChar c _)) = c
-        charof _ = error "hex.Tokens.toksToStr.charof: Unexpected token"
+        tos (CharToken (TypedChar c _)) = [c]
+        tos (ControlSequence s) = "\\" ++ s
 \end{code}