yesod-dsl 0.1.1.12 → 0.1.1.13

raw patch · 2 files changed

+63/−1 lines, 2 files

Files

• ExpandMacros.hs +61/−0
• yesod-dsl.cabal +2/−1

@@ -0,0 +1,61 @@+module ExpandMacros (expandMacros) where+import AST+import Data.List+expandMacros :: Module -> Module+expandMacros m = m {+        modRoutes = map fRoute $ modRoutes m+    }+    where+        fRoute r = r {+            routeHandlers = map fHandler $ routeHandlers r+        }++        fHandler h = h {+            handlerParams = map fHandlerParam $ handlerParams h+        }++        fHandlerParam (Select sq) = Select (fSelectQuery sq)+        fHandlerParam (Require sq) = Require (fSelectQuery sq)+        fHandlerParam hp = hp++        fSelectQuery sq = sq {+            sqJoins = map fJoin $ sqJoins sq,+            sqWhere = maybe Nothing (Just . fExpr) $ sqWhere sq+        }+        fJoin j = j {+            joinExpr = maybe Nothing (Just . fExpr) $ joinExpr j+        }+        fExpr (AndExpr e1 e2) = AndExpr (fExpr e1) (fExpr e2)+        fExpr (OrExpr e1 e2) = OrExpr (fExpr e1) (fExpr e2)+        fExpr (NotExpr e) = NotExpr (fExpr e)+        fExpr (ListOpExpr fr1 lo fr2) = ListOpExpr (fFieldRef fr1) lo+                                                   (fFieldRef fr2)+        fExpr (BinOpExpr ve1 bo ve2) = BinOpExpr (fValExpr ve1) bo+                                                 (fValExpr ve2)+        fValExpr (FieldExpr fr) = FieldExpr $ fFieldRef fr    +        fValExpr (ConcatExpr ve1 ve2) = ConcatExpr (fValExpr ve1) (fValExpr ve2)+        fValExpr ve = ve++        fFieldRef fr = case fr of+            FieldRefSubQuery sq -> FieldRefSubQuery $ fSelectQuery sq+            FieldRefFunc fn ps -> expandFieldRef fn ps+            fr' -> fr'++        expandFieldRef fn ps = case find (\d -> defineName d == fn) (modDefines m) of+            Just d -> if length (defineParams d) == length ps+                then case defineContent d of+                    (DefineSubQuery sq) -> FieldRefSubQuery (expandSubQuery sq $ zip (defineParams d) ps)+                else error $ "Expected " ++ show (length $ defineParams d)+                             ++ " parameters for macro " ++ fn ++ " got " +++                             show (length ps)+            _ -> error $ "Reference to undefined macro " ++ fn+                        ++        expandSubQuery sq subs = foldl repSubQuery sq subs+        repSubQuery sq sub = sq {+            sqFields = map (repSelectField sub) $ sqFields sq+        }+        repSelectField (pn,pv) spf@(SelectParamField vn pn' mvn) +            | pn == pn' = SelectField vn pv mvn+            | otherwise = spf+        repSelectField _ sf = sf

@@ -1,5 +1,5 @@ name:           yesod-dsl-version:        0.1.1.12+version:        0.1.1.13 license:        BSD3 license-file:   LICENSE author:         Tero Laitinen @@ -45,6 +45,7 @@                    Generator.EsqueletoInstances                    Obfuscate                    SyncFile+                   ExpandMacros                    Validation.Fields                    Validation.Handlers                    Validation.State