rhi/quox
rhi/quox
1
0
Fork 0
Code Issues 15 Pull requests 1 Releases Wiki Activity

rename "Tag" highlight to "Constant"

Browse source
This commit is contained in:
rhiannon morris 2023-11-05 14:30:40 +01:00
parent 2f8a2d2cd2
commit 3b9a339e5e
5 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Quox/Parser/FromParser/Error.idr
View file

@ -139,7 +139,7 @@ parameters {opts : LayoutOpts} (showContext : Bool)
prettyError (WrongFail str err loc) = pure $ prettyError (WrongFail str err loc) = pure $
vsep [!(prettyLoc loc), vsep [!(prettyLoc loc),
"wrong error, expected to match", !(hl Tag $ text "\"\{str}\""), "wrong error, expected to match", !(hl Constant $ text "\"\{str}\""),
"but got", !(prettyError err)] "but got", !(prettyError err)]
prettyError (WrapParseError file err) = prettyError (WrapParseError file err) =

12
lib/Quox/Pretty.idr
View file

@ -41,7 +41,7 @@ data HL
| Dim | DVar | DVarErr | Dim | DVar | DVarErr
| Qty | Universe | Qty | Universe
| Syntax | Syntax
| Tag | Constant
%runElab derive "HL" [Eq, Ord, Show] %runElab derive "HL" [Eq, Ord, Show]
@ -86,7 +86,7 @@ toSGR DVarErr = [SetForeground BrightGreen, SetStyle SingleUnderline]
toSGR Qty = [SetForeground BrightMagenta] toSGR Qty = [SetForeground BrightMagenta]
toSGR Universe = [SetForeground BrightRed] toSGR Universe = [SetForeground BrightRed]
toSGR Syntax = [SetForeground BrightCyan] toSGR Syntax = [SetForeground BrightCyan]
toSGR Tag = [SetForeground BrightRed] toSGR Constant = [SetForeground BrightRed]
export %inline export %inline
highlightSGR : HL -> Highlight highlightSGR : HL -> Highlight
@ -272,8 +272,8 @@ typecaseD = hl Syntax $ text "type-case"
ofD = hl Syntax $ text "of" ofD = hl Syntax $ text "of"
returnD = hl Syntax $ text "return" returnD = hl Syntax $ text "return"
dotD = hl Delim $ text "." dotD = hl Delim $ text "."
zeroD = hl Syntax $ text "zero" zeroD = hl Constant $ text "zero"
succD = hl Syntax $ text "succ" succD = hl Constant $ text "succ"
coeD = hl Syntax $ text "coe" coeD = hl Syntax $ text "coe"
compD = hl Syntax $ text "comp" compD = hl Syntax $ text "comp"
undD = hl Syntax $ text "_" undD = hl Syntax $ text "_"
@ -330,13 +330,13 @@ prettyLoc (L (YesLoc file b)) =
export export
prettyTag : {opts : _} -> String -> Eff Pretty (Doc opts) prettyTag : {opts : _} -> String -> Eff Pretty (Doc opts)
prettyTag tag = hl Tag $ text $ "'" ++ quoteTag tag prettyTag tag = hl Constant $ text $ "'" ++ quoteTag tag
export export
prettyStrLit : {opts : _} -> String -> Eff Pretty (Doc opts) prettyStrLit : {opts : _} -> String -> Eff Pretty (Doc opts)
prettyStrLit s = prettyStrLit s =
let s = concatMap esc1 $ unpack s in let s = concatMap esc1 $ unpack s in
hl Syntax $ hcat ["\"", text s, "\""] hl Constant $ hcat ["\"", text s, "\""]
where where
esc1 : Char -> String esc1 : Char -> String
esc1 '"' = "\""; esc1 '\\' = "\\" esc1 '"' = "\""; esc1 '\\' = "\\"

2
lib/Quox/Syntax/Term/Pretty.idr
View file

@ -287,7 +287,7 @@ prettyEnum : {opts : _} -> List String -> Eff Pretty (Doc opts)
prettyEnum cases = prettyEnum cases =
tightBraces =<< tightBraces =<<
fillSeparateTight !commaD <$> fillSeparateTight !commaD <$>
traverse (hl Tag . Doc.text . quoteTag) cases traverse (hl Constant . Doc.text . quoteTag) cases
private private
prettyCaseRet : {opts : _} -> prettyCaseRet : {opts : _} ->

6
lib/Quox/Untyped/Scheme.idr
View file

@ -363,9 +363,9 @@ prettySexp (L (x :: xs)) = do
parens $ ifMultiline parens $ ifMultiline
(hsep $ d :: ds) (hsep $ d :: ds)
(hsep [d, vsep ds] <|> vsep (d :: map (indent 2) ds)) (hsep [d, vsep ds] <|> vsep (d :: map (indent 2) ds))
prettySexp (Q (V x)) = hl Tag $ "'" <+> prettyId' x prettySexp (Q (V x)) = hl Constant $ "'" <+> prettyId' x
prettySexp (Q x) = pure $ hcat [!(hl Tag "'"), !(prettySexp x)] prettySexp (Q x) = pure $ hcat [!(hl Constant "'"), !(prettySexp x)]
prettySexp (N n) = hl Tag $ pshow n prettySexp (N n) = hl Constant $ pshow n
prettySexp (S s) = prettyStrLit $ escape s prettySexp (S s) = prettyStrLit $ escape s
prettySexp (Lambda xs e) = prettyLambda "lambda" xs e prettySexp (Lambda xs e) = prettyLambda "lambda" xs e
prettySexp (LambdaC xs e) = prettyLambda "lambda%" xs e prettySexp (LambdaC xs e) = prettyLambda "lambda%" xs e

2
lib/Quox/Untyped/Syntax.idr
View file

@ -226,7 +226,7 @@ prettyTerm xs (CaseEnum tag cases _) =
prettyCase xs prettyTag tag $ prettyCase xs prettyTag tag $
map (\(t, rhs) => MkPrettyCaseArm t [] rhs) $ toList cases map (\(t, rhs) => MkPrettyCaseArm t [] rhs) $ toList cases
prettyTerm xs (Absurd _) = hl Syntax "absurd" prettyTerm xs (Absurd _) = hl Syntax "absurd"
prettyTerm xs (Nat n _) = hl Tag $ pshow n prettyTerm xs (Nat n _) = hl Constant $ pshow n
prettyTerm xs (Succ nat _) = prettyApp xs !succD [< nat] prettyTerm xs (Succ nat _) = prettyApp xs !succD [< nat]
prettyTerm xs (CaseNat nat zer suc _) = prettyTerm xs (CaseNat nat zer suc _) =
prettyCase xs pure nat [MkPrettyCaseArm !zeroD [] zer, !(sucCaseArm suc)] prettyCase xs pure nat [MkPrettyCaseArm !zeroD [] zer, !(sucCaseArm suc)]