@@ -16,7 +16,7 @@ import qualified Parse.Shader as Shader
1616import qualified Parse.Space as Space
1717import qualified Parse.Symbol as Symbol
1818import qualified Parse.Type as Type
19−import qualified Parse.Utf8 as Utf8
19+import qualified Parse.String as String
2020import qualified Parse.Variable as Var
2121import Parse.Primitives hiding (State)
2222import qualified Parse.Primitives as P
@@ -46,13 +46,13 @@ term =
4646
4747string :: A.Position -> Parser E.Expr Src.Expr
4848string start =
49− do str <- Utf8.string E.Start E.String
49+ do str <- String.string E.Start E.String
5050 addEnd start (Src.Str str)
5151
5252
5353character :: A.Position -> Parser E.Expr Src.Expr
5454character start =
55− do chr <- Utf8.character E.Start E.Char
55+ do chr <- String.character E.Start E.Char
5656 addEnd start (Src.Chr chr)
5757
5858
@@ -537,14 +537,14 @@ chompMatchingName expectedName =
537537 let
538538 (P.Parser parserL) = Var.lower E.DefNameRepeat
539539 in
540− P.Parser $ \state@(P.State _ _ _ sr sc) cok eok cerr eerr ->
540+ P.Parser $ \state@(P.State _ _ _ _ sr sc) cok eok cerr eerr ->
541541 let
542− cokL name newState@(P.State _ _ _ er ec) =
542+ cokL name newState@(P.State _ _ _ _ er ec) =
543543 if expectedName == name
544544 then cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
545545 else cerr sr sc (E.DefNameMatch name)
546546
547− eokL name newState@(P.State _ _ _ er ec) =
547+ eokL name newState@(P.State _ _ _ _ er ec) =
548548 if expectedName == name
549549 then eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
550550 else eerr sr sc (E.DefNameMatch name)