i tried out #1178 (comment) and i think it does not complicate things much. the only thing that changes is that toData in the Pattern module becomes

toData :: OSC -> Event ValueMap -> Maybe [O.Datum]
toData (OSC {args = ArgList as}) e = fmap (fmap toDatum) $ mapM (\(n, v) -> Map.lookup n (value e) <|> v) as
toData (OSC {args = Named rqrd}) e
  | hasRequired rqrd = Just $ concatMap (\(n, v) -> [O.string n, toDatum v]) $ Map.toList $ value e
  | otherwise = Nothing
  where
    hasRequired (Val k)  = k `elem` ks
    hasRequired (Not x)  = not $ hasRequired x
    hasRequired (All xs) = all hasRequired xs
    hasRequired (Any xs) = any hasRequired xs
    ks = Map.keys (value e)
toData _ _ = Nothing

it occurs to me that the intermediate data structure could even be skipped by making requiredArgs a predicate function:

data Args
  = Named {requiredArgs :: [String] -> Bool}
  …

superdirtShape = OSC "/dirt/play" $ Named {requiredArgs = any (`elem` ["s", "dsp", "gdsp"]) }

toData :: OSC -> Event ValueMap -> Maybe [O.Datum]
toData (OSC {args = ArgList as}) e = fmap (fmap toDatum) $ mapM (\(n, v) -> Map.lookup n (value e) <|> v) as
toData (OSC {args = Named rqrd}) e
  | rqrd ks   = Just $ concatMap (\(n, v) -> [O.string n, toDatum v]) $ Map.toList $ value e
  | otherwise = Nothing
  where
    ks = Map.keys (value e)
toData _ _ = Nothing

though then we lose the automatically derived Show instance on Args.

OSC shapes need additional logic #1178

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions