crazy mega refactor

src/FWL/Parser.hs

@@ -47,10 +47,10 @@ configBlock = do
 
 configProp :: Parser (String, String)
 configProp = do
-  reserved "table"
+  n <- identifier  -- "table" is no longer reserved
   reservedOp "="
   v <- stringLit
-  return ("table", v)
+  return (n, v)
 
 -- ─── Declarations ────────────────────────────────────────────────────────────
 
@@ -63,6 +63,8 @@ decl =  interfaceDecl
     <|> flowDecl
     <|> ruleDecl
     <|> policyDecl
+    <|> portforwardDecl
+    <|> masqueradeDecl
 
 interfaceDecl :: Parser Decl
 interfaceDecl = do
@@ -158,26 +160,31 @@ policyDecl = do
   n  <- identifier
   reservedOp ":"
   t  <- typeP
-  reserved "on"
-  pm <- braces policyMeta
+  reserved "hook"
+  h  <- hookP
+  mp <- optionMaybe (reserved "priority" >> priorityP)
+  let tb = hookDefaultTable h
+      pr = maybe (hookDefaultPriority h) id mp
   reservedOp "="
   ab <- armBlock
-  _ <- semi
-  return (DPolicy n t pm ab)
+  _  <- semi
+  return (DPolicy n t (PolicyMeta h tb pr) ab)
 
-policyMeta :: Parser PolicyMeta
-policyMeta = do
-  props <- commaSep1 metaProp
-  let h  = foldr (\p a -> case p of Left  v -> v; _ -> a) HInput  props
-      tb = foldr (\p a -> case p of Right (Left  v) -> v; _ -> a) TFilter props
-      pr = foldr (\p a -> case p of Right (Right v) -> v; _ -> a) pFilter props
-  return (PolicyMeta h tb pr)
+-- | Infer table from hook
+hookDefaultTable :: Hook -> TableName
+hookDefaultTable HInput       = TFilter
+hookDefaultTable HForward     = TFilter
+hookDefaultTable HOutput      = TFilter
+hookDefaultTable HPrerouting  = TNAT
+hookDefaultTable HPostrouting = TNAT
 
-metaProp :: Parser (Either Hook (Either TableName Priority))
-metaProp
-  =  (reserved "hook"     >> reservedOp "=" >> fmap (Left)             hookP)
- <|> (reserved "table"    >> reservedOp "=" >> fmap (Right . Left)     tableNameP)
- <|> (reserved "priority" >> reservedOp "=" >> fmap (Right . Right)    priorityP)
+-- | Default priority per hook
+hookDefaultPriority :: Hook -> Priority
+hookDefaultPriority HInput       = pFilter
+hookDefaultPriority HForward     = pFilter
+hookDefaultPriority HOutput      = pFilter
+hookDefaultPriority HPrerouting  = pDstNat
+hookDefaultPriority HPostrouting = pSrcNat
 
 hookP :: Parser Hook
 hookP =  (reserved "Input"       >> return HInput)
@@ -186,9 +193,31 @@ hookP =  (reserved "Input"       >> return HInput)
      <|> (reserved "Prerouting"  >> return HPrerouting)
      <|> (reserved "Postrouting" >> return HPostrouting)
 
-tableNameP :: Parser TableName
-tableNameP =  (reserved "Filter" >> return TFilter)
-          <|> (reserved "NAT"    >> return TNAT)
+-- portforward <name> on <iface> via <MapType> = { entries };
+portforwardDecl :: Parser Decl
+portforwardDecl = do
+  reserved "portforward"
+  n    <- identifier
+  reserved "on"
+  iface <- identifier
+  reserved "via"
+  t    <- typeP
+  reservedOp "="
+  entries <- braces (commaSep mapEntry)
+  _    <- semi
+  return (DPortForward n iface t entries)
+
+-- masquerade <name> on <iface> src <set-name>;
+masqueradeDecl :: Parser Decl
+masqueradeDecl = do
+  reserved "masquerade"
+  n     <- identifier
+  reserved "on"
+  iface <- identifier
+  reserved "src"
+  srcSet <- identifier
+  _     <- semi
+  return (DMasquerade n iface srcSet)
 
 priorityP :: Parser Priority
 priorityP