voidlizard
/
suckless-conf
mirror of https://github.com/voidlizard/suckless-conf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed-for-9.4.6

This commit is contained in:
Dmitry Zuikov 2023-10-15 10:06:43 +03:00
parent a79097e5b2
commit 8e95f8e9c1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Data/Config/Suckless/KeyValue.hs
View File

@ -39,7 +39,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Integer) m) => HasC
cfgValue = lastMay . val <$> getConf
where
val syn = [ e
| ListVal @C (Key s [LitIntVal e]) <- syn, s == key @a @(Maybe Integer) @m
| ListVal (Key s [LitIntVal e]) <- syn, s == key @a @(Maybe Integer) @m
]
@ -54,28 +54,28 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Scientific) m) => H
cfgValue = lastMay . val <$> getConf
where
val syn = [ e
| ListVal @C (Key s [LitScientificVal e]) <- syn, s == key @a @(Maybe Scientific) @m
| ListVal (Key s [LitScientificVal e]) <- syn, s == key @a @(Maybe Scientific) @m
]
instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Bool) m) => HasCfgValue a (Maybe Bool) m where
cfgValue = lastMay . val <$> getConf
where
val syn = [ e
| ListVal @C (Key s [LitBoolVal e]) <- syn, s == key @a @(Maybe Bool) @m
| ListVal (Key s [LitBoolVal e]) <- syn, s == key @a @(Maybe Bool) @m
]
instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Value) m) => HasCfgValue a (Maybe Value) m where
cfgValue = lastMay . val <$> getConf
where
val syn = [ toJSON v
| ListVal @C (Key s [v@ListVal{}]) <- syn, s == key @a @(Maybe Value) @m
| ListVal (Key s [v@ListVal{}]) <- syn, s == key @a @(Maybe Value) @m
]
instance {-# OVERLAPPABLE #-} (HasConf m, Ord b, IsString b, HasCfgKey a (Maybe b) m) => HasCfgValue a (Maybe b) m where
cfgValue = lastMay . val <$> getConf
where
val syn = [ fromString (show $ pretty e)
| ListVal @C (Key s [LitStrVal e]) <- syn, s == key @a @(Maybe b) @m
| ListVal (Key s [LitStrVal e]) <- syn, s == key @a @(Maybe b) @m
]
@ -83,14 +83,14 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Integer) m) => HasCfg
cfgValue = Set.fromList . val <$> getConf
where
val syn = [ e
| ListVal @C (Key s [LitIntVal e]) <- syn, s == key @a @(Set Integer) @m
| ListVal (Key s [LitIntVal e]) <- syn, s == key @a @(Set Integer) @m
]
instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Scientific) m) => HasCfgValue a (Set Scientific) m where
cfgValue = Set.fromList . val <$> getConf
where
val syn = [ e
| ListVal @C (Key s [LitScientificVal e]) <- syn, s == key @a @(Set Scientific) @m
| ListVal (Key s [LitScientificVal e]) <- syn, s == key @a @(Set Scientific) @m
]
@ -98,7 +98,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Value) m) => HasCfgVa
cfgValue = Set.fromList . val <$> getConf
where
val syn = [ toJSON v
| ListVal @C (Key s [v@ListVal{}]) <- syn, s == key @a @(Set Value) @m
| ListVal (Key s [v@ListVal{}]) <- syn, s == key @a @(Set Value) @m
]
@ -106,7 +106,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, Ord b, IsString b, HasCfgKey a (Set b)
cfgValue = Set.fromList . val <$> getConf
where
val syn = [ fromString (show $ pretty e)
| ListVal @C (Key s [LitStrVal e]) <- syn, s == key @a @(Set b) @m
| ListVal (Key s [LitStrVal e]) <- syn, s == key @a @(Set b) @m
]