diff --git a/Text/Jasmine.hs b/Text/Jasmine.hs --- a/Text/Jasmine.hs +++ b/Text/Jasmine.hs @@ -9,24 +9,22 @@ import Text.Jasmine.Pretty import qualified Blaze.ByteString.Builder as BB import qualified Data.ByteString.Lazy as LB -import qualified Data.ByteString as B --- TODO: consider using option 4 of http://www.randomhacks.net/articles/2007/03/10/haskell-8-ways-to-report-errors -minifym :: B.ByteString -> Either String LB.ByteString +minifym :: LB.ByteString -> Either String LB.ByteString minifym s = case readJsm s of Left msg -> Left msg Right p -> Right $ BB.toLazyByteString $ renderJS p -minify :: B.ByteString -> LB.ByteString +minify :: LB.ByteString -> LB.ByteString minify s = BB.toLazyByteString $ renderJS $ readJs s -_minify' :: B.ByteString -> BB.Builder +_minify' :: LB.ByteString -> BB.Builder _minify' s = renderJS $ readJs s minifyFile :: FilePath -> IO LB.ByteString minifyFile filename = do - x <- B.readFile (filename) + x <- LB.readFile (filename) return $ minify x -- EOF diff --git a/Text/Jasmine/Parse.hs b/Text/Jasmine/Parse.hs --- a/Text/Jasmine/Parse.hs +++ b/Text/Jasmine/Parse.hs @@ -22,14 +22,14 @@ import Control.Applicative ( (<|>) ) import Control.Monad -import Data.Attoparsec (eitherResult) -import Data.Attoparsec.Char8 (char, satisfy, try, feed, Parser, Result(..), (), endOfInput, many, parse, sepBy, sepBy1, many1) +import Data.Attoparsec.Lazy (eitherResult,parse,Result(..)) +import Data.Attoparsec.Char8 (char, satisfy, try, Parser, (), endOfInput, many, sepBy, sepBy1, many1) import Data.Char import Data.Data import Data.List import Prelude hiding (catch) import System.Environment -import qualified Data.ByteString as B +import qualified Data.ByteString.Lazy as LB import qualified Data.Text as T import qualified Data.Text.Encoding as E import qualified Text.Jasmine.Token as P @@ -1113,16 +1113,16 @@ main :: IO () main = do args <- getArgs - x <- B.readFile (args !! 0) + x <- LB.readFile (args !! 0) putStrLn (show $ doParse program x) -- --------------------------------------------------------------------- -readJs :: B.ByteString -> JSNode +readJs :: LB.ByteString -> JSNode readJs input = case doParse program input of Fail _unparsed contexts err -> error("Parse failed" ++ show(contexts) ++ ":" ++ show err) - Partial _f -> error("Unexpected partial") + -- Partial _f -> error("Unexpected partial") Done _unparsed val -> val -- --------------------------------------------------------------------- @@ -1133,23 +1133,30 @@ Left msg -> fail ("Parse failed:" ++ msg) Right val -> return val -} ---readJsm :: (Monad m) => B.ByteString -> m JSNode -readJsm :: B.ByteString -> Either String JSNode + +readJsm :: LB.ByteString -> Either String JSNode readJsm input = eitherResult $ doParse program input -- --------------------------------------------------------------------- +{- _doParse' :: Parser a -> String -> a -_doParse' p input = case parse (p' p) (E.encodeUtf8 $ T.pack input) of +_doParse' p input = case parse (p' p) (LB.fromChunks [E.encodeUtf8 $ T.pack input]) of Fail _unparsed contexts err -> error("Parse failed" ++ show(contexts) ++ ":" ++ show err) Partial _f -> error("Unexpected partial") Done _unparsed val -> val +-} -doParse :: Parser r -> B.ByteString -> Result r -doParse p input = {-maybeResult $-} feed (parse (p' p) input) B.empty - +{- +doParseStrict :: Parser r -> B.ByteString -> Result r +doParseStrict p input = {-maybeResult $-} feed (parse (p' p) input) LB.empty +-} + +doParse :: Parser r -> LB.ByteString -> Result r +doParse p input = parse (p' p) input + parseString :: Parser r -> String -> Result r -parseString p input = doParse p (E.encodeUtf8 $ T.pack input) +parseString p input = doParse p (LB.fromChunks [E.encodeUtf8 $ T.pack input]) -- --------------------------------------------------------------------- @@ -1169,7 +1176,7 @@ parseFile :: FilePath -> IO JSNode parseFile filename = do - x <- B.readFile (filename) + x <- LB.readFile (filename) return $ (readJs x) -- EOF diff --git a/hjsmin.cabal b/hjsmin.cabal --- a/hjsmin.cabal +++ b/hjsmin.cabal @@ -1,5 +1,5 @@ name: hjsmin -version: 0.0.1 +version: 0.0.2 license: BSD3 license-file: LICENSE author: Alan Zimmerman diff --git a/runtests.hs b/runtests.hs --- a/runtests.hs +++ b/runtests.hs @@ -112,7 +112,7 @@ srcHelloWorld = "function Hello(a) {}" caseHelloWorld = - "Done \"\" JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [])" + "Done Empty JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [])" @=? (show $ parseString functionDeclaration srcHelloWorld) caseMinHelloWorld = -- "function Hello(a){}" @=? (minify (U.fromString srcHelloWorld)) @@ -120,7 +120,7 @@ srcHelloWorld2 = "function Hello(a) {b=1}" caseHelloWorld2 = - "Done \"\" JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [JSSourceElements [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"b\",JSOperator \"=\",JSDecimal 1]]]])" + "Done Empty JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [JSSourceElements [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"b\",JSOperator \"=\",JSDecimal 1]]]])" @=? (show $ parseString functionDeclaration srcHelloWorld2) caseMinHelloWorld2 = -- "function Hello(a){b=1}" @=? (minify (U.fromString srcHelloWorld2)) @@ -128,43 +128,43 @@ srcSimpleAssignment = "a=1;" caseSimpleAssignment = - "Done \"\" JSStatementList [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"a\",JSOperator \"=\",JSDecimal 1]],JSLiteral \";\"]" + "Done Empty JSStatementList [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"a\",JSOperator \"=\",JSDecimal 1]],JSLiteral \";\"]" @=? (show $ parseString statementList srcSimpleAssignment) caseMinSimpleAssignment = testMinify "a=1" srcSimpleAssignment srcEmptyFor = "for (i = 0;;){}" caseEmptyFor = - "Done \"\" JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal 0]]] [] [] (JSLiteral \";\")" + "Done Empty JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal 0]]] [] [] (JSLiteral \";\")" @=? (show $ parseString iterationStatement srcEmptyFor) srcFullFor = "for (i = 0;i<10;i++){}" caseFullFor = - "Done \"\" JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal 0]]] [JSExpression [JSIdentifier \"i\",JSExpressionBinary \"<\" [JSDecimal 10] []]] [JSExpression [JSExpressionPostfix \"++\" [JSIdentifier \"i\"]]] (JSLiteral \";\")" + "Done Empty JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal 0]]] [JSExpression [JSIdentifier \"i\",JSExpressionBinary \"<\" [JSDecimal 10] []]] [JSExpression [JSExpressionPostfix \"++\" [JSIdentifier \"i\"]]] (JSLiteral \";\")" @=? (show $ parseString iterationStatement srcFullFor) srcForVarFull = "for(var i=0,j=tokens.length;i IO () testFile filename =