use tokens for css descriptors to avoid ambiguity

between list of selectors and enumerating descriptor (multiple values
split by commas)

Author: yaitskov

css-parser.cabal

@@ -44,6 +44,7 @@ library
     , CssParser.At.MediaQuery
     , CssParser.At.Page
     , CssParser.At.Supports
+    , CssParser.Descriptor
     , CssParser.File
     , CssParser.FixRule
     , CssParser.Fun
@@ -62,6 +63,7 @@ library
     , CssParser.Utils
   other-modules:
     , CssParser.Lexer
+    , CssParser.Lexer.Token
     , CssParser.Parser
   build-depends:
     , array >=0.5.2

src/CssParser/At/FontFeatureValues.hs

@@ -10,13 +10,20 @@ newtype IdentList = IdentList (NonEmpty Ident) deriving newtype (Eq, Ord, Show)
 instance CssShow IdentList where
   toCssText (IdentList l) = unwords (toCssText <$> toList l)
 
+data FontFeatureEntry = FontFeatureEntry Ident (SslNe Unsigned)
+  deriving (Eq, Ord, Show, Generic)
+instance CssShow FontFeatureEntry where
+  toCssText (FontFeatureEntry i l)
+    = toCssText i <> ": " <> toCssText l
+instance ShowSpaceBetween FontFeatureEntry FontFeatureEntry where
+  cssSpace _ _ = ";"
 data FontFeatureValuesSubBlock
-  = FontFeatureValuesSubBlock BrowserPrefix Ident [PropEntry]
+  = FontFeatureValuesSubBlock BrowserPrefix Ident [FontFeatureEntry]
   deriving (Eq, Ord, Show, Generic)
 
 instance CssShow FontFeatureValuesSubBlock where
   toCssText (FontFeatureValuesSubBlock bp i ps) =
-    toCssText bp <> toCssText i <> " {" <> toCssText ps <> "}"
+    "@" <> toCssText bp <> toCssText i <> " {" <> toCssText ps <> "}"
 
 instance ShowSpaceBetween FontFeatureValuesSubBlock FontFeatureValuesSubBlock where
   cssSpace _ _ = ""

src/CssParser/At/Function.hs

@@ -95,7 +95,7 @@ data Function r
   , args :: [FunArg]
   , returns :: Maybe CssType
   , localConsts :: [ ConstEntry ]
-  , result :: PropVals
+  , result :: NonEmpty PropVals
   , atRules :: [r]
   } deriving (Eq, Ord, Show, Generic)
 

src/CssParser/At/Keyframe.hs

@@ -1,9 +1,10 @@
 module CssParser.At.Keyframe where
 
-import CssParser.Ident
+import CssParser.Descriptor (Descriptor)
+import CssParser.Ident ( Ident(..) )
 import CssParser.Rule.Value
 import CssParser.Prelude
-import CssParser.Show
+import CssParser.Show ( CssShow(..), ShowSpaceBetween(..), CslNe )
 
 data KeyframeAdr
   = KeyframePercentAdr RawNum
@@ -17,12 +18,12 @@ instance CssShow KeyframeAdr where
     KeyframeStart -> "from"
     KeyframeEnd -> "to"
 
-data PropEntry = PropEntry PropertyName PropVals deriving (Show, Eq, Ord, Generic)
+data PropEntry = PropEntry Descriptor PropVals deriving (Show, Eq, Ord, Generic)
 instance ShowSpaceBetween PropEntry PropEntry where
   cssSpace _ _ = ""
 instance CssShow PropEntry where
   toCssText (PropEntry pn pv) =
-    toCssText pn <> ": " <>  toCssText pv <> ";"
+    toCssText pn <> toCssText pv <> ";"
 
 data Keyframe = Keyframe (CslNe KeyframeAdr) [PropEntry] deriving (Show, Eq, Ord, Generic)