.

[clean-tests.git] / datatype / Language / Quote.hs

diff --git a/datatype/Language/Quote.hs b/datatype/Language/Quote.hs
index afa5bde..29c2da9 100644 (file)
--- a/datatype/Language/Quote.hs
+++ b/datatype/Language/Quote.hs
@@ -21,20 +21,16 @@ import Text.Parsec.Language (haskell)
 import Language.GenDSL as L
 
 dsl :: QuasiQuoter
-dsl = QuasiQuoter
-    { quoteExp = \s->location >>= parseExpr s
-    , quotePat = undefined
-    , quoteType = undefined
-    , quoteDec = undefined
-    }
+dsl = QuasiQuoter { quoteExp = parseDSL expr }
   where
-    parseExpr :: String -> Loc -> ExpQ
-    parseExpr s loc = either (fail . show) id $ runParser p () file s
-      where
-        file = loc_filename loc
-        (line, col) = loc_start loc
-        p = getPosition >>= setPosition . mPos >> whiteSpace *> expr <* eof
-        mPos p = setSourceName (setSourceLine (setSourceColumn p col) line) file
+    parseDSL :: Parser (Q e) -> String -> Q e
+    parseDSL ps s = do
+        loc <- location
+        let file = loc_filename loc
+            (line, col) = loc_start loc
+            p = getPosition >>= setPosition . mPos >> whiteSpace *> ps <* eof
+            mPos p = setSourceName (setSourceLine (setSourceColumn p col) line) file
+        either (fail . show) id $ runParser p () file s
 
 -- Lexer
 identifier,operator :: Parser String