diff --git a/lib/Quox/Name.idr b/lib/Quox/Name.idr index fe0eb46..57c6754 100644 --- a/lib/Quox/Name.idr +++ b/lib/Quox/Name.idr @@ -31,7 +31,7 @@ baseStr (UN x) = x baseStr (MN x i) = "\{x}#\{show i}" baseStr Unused = "_" -export Show BaseName where show = baseStr +export Show BaseName where show = show . baseStr export FromString BaseName where fromString = UN @@ -82,7 +82,8 @@ fromPBaseName = MakeName [<] . UN export Show PName where - show (MakePName mods base) = concat $ intersperse "." $ toList $ mods :< base + show (MakePName mods base) = + show $ concat $ intersperse "." $ toList $ mods :< base export Show Name where show = show . toPName diff --git a/lib/Quox/Parser/Parser.idr b/lib/Quox/Parser/Parser.idr index 1fe34d4..bca8089 100644 --- a/lib/Quox/Parser/Parser.idr +++ b/lib/Quox/Parser/Parser.idr @@ -89,7 +89,8 @@ terminalMatch what l r = terminalMatchN_ what [(l, r)] ||| tag without leading `'` export bareTag : Grammar True TagVal -bareTag = terminalMatchN "bare tag" [(`(Name t), `(show t)), (`(Str s), `(s))] +bareTag = terminalMatchN "bare tag" + [(`(Name t), `(toDotsP t)), (`(Str s), `(s))] ||| tag with leading quote export