diff --git a/TODO.txt b/TODO.txt --- a/TODO.txt +++ b/TODO.txt @@ -63,5 +63,23 @@ ------------ +Integrating language-haskell. +----------------------------- + +Baseline before starting, on my laptop (intel Core2 Duo SU7300) + +$ time ./dist/build/runtests/runtests + +real 0m1.625s +user 0m1.616s +sys 0m0.016s + +Baseline 2010-12-20, after getting all tests to pass at last + +real 0m0.209s +user 0m0.196s +sys 0m0.004s + + EOF diff --git a/Text/Jasmine.hs b/Text/Jasmine.hs --- a/Text/Jasmine.hs +++ b/Text/Jasmine.hs @@ -6,26 +6,29 @@ , minifyFile ) where -import Text.Jasmine.Parse +--import Text.Jasmine.Parse +import Language.JavaScript.Parser import Text.Jasmine.Pretty import qualified Blaze.ByteString.Builder as BB import qualified Data.ByteString.Lazy as LB +import qualified Data.ByteString.Lazy.Char8 as S8 minifym :: LB.ByteString -> Either String LB.ByteString -minifym s = case readJsm s of - Left msg -> Left msg +minifym s = case parse' s of + Left msg -> Left (show msg) Right p -> Right $ BB.toLazyByteString $ renderJS p minifyBb :: LB.ByteString -> Either String BB.Builder -minifyBb s = case readJsm s of - Left msg -> Left msg +minifyBb s = case parse' s of + Left msg -> Left (show msg) Right p -> Right (renderJS p) minify :: LB.ByteString -> LB.ByteString -minify s = BB.toLazyByteString $ renderJS $ readJs s +--minify s = BB.toLazyByteString $ renderJS $ readJs s +minify s = BB.toLazyByteString $ renderJS $ readJs (lbToStr s) _minify' :: LB.ByteString -> BB.Builder -_minify' s = renderJS $ readJs s +_minify' s = renderJS $ readJs (lbToStr s) minifyFile :: FilePath -> IO LB.ByteString minifyFile filename = @@ -33,4 +36,14 @@ x <- LB.readFile (filename) return $ minify x +parse' :: S8.ByteString -> Either ParseError JSNode +parse' input = parse (lbToStr input) "src" + +lbToStr :: S8.ByteString -> [Char] +lbToStr str = S8.unpack str + +strToLb :: String -> S8.ByteString +strToLb str = S8.pack str +--strToLb str = (LB.fromChunks [(E.encodeUtf8 $ T.pack str)]) + -- EOF diff --git a/Text/Jasmine/Parse.hs b/Text/Jasmine/Parse.hs --- a/Text/Jasmine/Parse.hs +++ b/Text/Jasmine/Parse.hs @@ -9,6 +9,8 @@ , parseFile , parseString -- For testing + , parseProgram + {- , doParse , program , functionDeclaration @@ -16,6 +18,7 @@ , statementList , iterationStatement , main + -} ) where -- --------------------------------------------------------------------- @@ -193,7 +196,6 @@ firstchar :: Parser [Char] firstchar = do { c <- satisfy (\c -> isPrint c && c /= '*' && c /= '\\' && c /= '/'); return [c]} <|> escapeseq - escapeseq :: Parser [Char] escapeseq = do { _ <- char '\\'; c <- satisfy (\cc -> isPrint cc); return ['\\',c]} @@ -1156,6 +1158,9 @@ parseString :: Parser r -> String -> Result r parseString p input = doParse p (LB.fromChunks [E.encodeUtf8 $ T.pack input]) + +parseProgram :: String -> Result JSNode +parseProgram input = doParse program (LB.fromChunks [E.encodeUtf8 $ T.pack input]) -- --------------------------------------------------------------------- diff --git a/Text/Jasmine/Pretty.hs b/Text/Jasmine/Pretty.hs --- a/Text/Jasmine/Pretty.hs +++ b/Text/Jasmine/Pretty.hs @@ -6,7 +6,8 @@ import Data.Char import Data.List import Data.Monoid -import Text.Jasmine.Parse +-- import Text.Jasmine.Parse +import Language.JavaScript.Parser import qualified Blaze.ByteString.Builder as BB import qualified Blaze.ByteString.Builder.Char.Utf8 as BS import qualified Data.ByteString.Lazy as LB @@ -44,7 +45,7 @@ renderJS :: JSNode -> BB.Builder renderJS (JSEmpty l) = (renderJS l) renderJS (JSIdentifier s) = text s -renderJS (JSDecimal i) = text $ show i +renderJS (JSDecimal i) = text i renderJS (JSOperator s) = text s renderJS (JSExpression xs) = rJS xs renderJS (JSSourceElements xs) = rJS (map fixBlock $ fixSourceElements xs) @@ -64,8 +65,8 @@ <> (text "else") renderJS (JSIfElse c t e) = (text "if") <> (text "(") <> (renderJS c) <> (text ")") <> (renderJS t) <> (text "else") <> (spaceOrBlock $ fixBlock e) -renderJS (JSMemberDot xs) = (text ".") <> (rJS xs) -renderJS (JSMemberSquare x xs) = (text "[") <> (renderJS x) <> (text "]") <> (rJS xs) +renderJS (JSMemberDot xs y) = (rJS xs) <> (text ".") <> (renderJS y) +renderJS (JSMemberSquare xs x) = (rJS xs) <> (text "[") <> (renderJS x) <> (text "]") renderJS (JSLiteral l) = (text l) renderJS (JSStringLiteral s l) = empty <> (char s) <> (text l) <> (char s) renderJS (JSUnary l ) = text l @@ -92,8 +93,8 @@ renderJS (JSDoWhile s e _ms) = (text "do") <> (renderJS s) <> (text "while") <> (char '(') <> (renderJS e) <> (char ')') -- <> (renderJS ms) renderJS (JSElementList xs) = rJS xs renderJS (JSElision xs) = (char ',') <> (rJS xs) ---renderJS (JSExpressionBinary o e1 e2) = (rJS e1) <> (text o) <> (rJS e2) -renderJS (JSExpressionBinary o e1 e2) = (text o) <> (rJS e1) <> (rJS e2) +renderJS (JSExpressionBinary o e1 e2) = (rJS e1) <> (text o) <> (rJS e2) +--renderJS (JSExpressionBinary o e1 e2) = (text o) <> (rJS e1) <> (rJS e2) renderJS (JSExpressionParen e) = (char '(') <> (renderJS e) <> (char ')') renderJS (JSExpressionPostfix o e) = (rJS e) <> (text o) renderJS (JSExpressionTernary c v1 v2) = (rJS c) <> (char '?') <> (rJS v1) <> (char ':') <> (rJS v2) @@ -181,6 +182,10 @@ | t1 == t2 = myFix ((JSVariables t1 (x1s++x2s)):xs) | otherwise = (JSVariables t1 x1s):myFix ((JSLiteral l):(JSVariables t2 x2s):xs) +myFix ((JSVariables t1 x1s):(JSVariables t2 x2s):xs) + | t1 == t2 = myFix ((JSVariables t1 (x1s++x2s)):xs) + | otherwise = (JSVariables t1 x1s):myFix ((JSVariables t2 x2s):xs) + -- Merge adjacent semi colons myFix ((JSLiteral ";"):(JSLiteral ";"):xs) = myFix ((JSLiteral ";"):xs) myFix ((JSLiteral ";"):(JSLiteral "" ):xs) = myFix ((JSLiteral ""):xs) @@ -190,11 +195,16 @@ -- Merge strings split over lines and using "+" fixLiterals :: [JSNode] -> [JSNode] fixLiterals [] = [] -fixLiterals [x] = [x] +-- Old version fixLiterals ((JSStringLiteral d1 s1):(JSExpressionBinary "+" [JSStringLiteral d2 s2] r):xs) | d1 == d2 = fixLiterals ((JSStringLiteral d1 (s1++s2)):(r++xs)) | otherwise = (JSStringLiteral d1 s1):fixLiterals ((JSExpressionBinary "+" [JSStringLiteral d2 s2] r):xs) +fixLiterals ((JSExpressionBinary "+" [JSStringLiteral d1 s1] [JSStringLiteral d2 s2]):xs) + | d1 == d2 = fixLiterals ((JSStringLiteral d1 (s1++s2)):xs) + | otherwise = (JSExpressionBinary "+" [JSStringLiteral d1 s1] [JSStringLiteral d2 s2]):fixLiterals xs + + fixLiterals (x:xs) = x:fixLiterals xs -- Sort out Semicolons @@ -238,7 +248,7 @@ _case0 :: JSNode _case0 = JSSourceElements [ - JSExpression [JSElement "assignmentExpression" [JSIdentifier "x",JSOperator "=",JSDecimal 1]], + JSExpression [JSElement "assignmentExpression" [JSIdentifier "x",JSOperator "=",JSDecimal "1"]], JSEmpty (JSLiteral ";") ] @@ -246,20 +256,11 @@ _case1 :: [JSNode] _case1 = [JSExpression [JSElement "assignmentExpression" - [JSIdentifier "a",JSOperator "=",JSDecimal 1] + [JSIdentifier "a",JSOperator "=",JSDecimal "1"] ] ,JSEmpty (JSLiteral ";") ] -_case2 :: JSNode -_case2 = JSFunctionExpression [] (JSFunctionBody - [JSSourceElements - [JSReturn [JSExpression - [JSLiteral "this",JSMemberDot [JSIdentifier "name"]], - JSLiteral ""]]] - ) - -- ]],JSEmpty (JSLiteral ";") - -- doParse expression "opTypeNames={'\\n':\"NEWLINE\",';':\"SEMICOLON\",',':\"COMMA\"}" _case4 :: JSNode @@ -292,7 +293,7 @@ JSExpressionBinary "!=" [JSStringLiteral '"' "string"] []]) (JSReturn [JSExpression [JSIdentifier "s"],JSLiteral ";"]) ,JSLiteral ";" - ,JSExpression [JSElement "assignmentExpression" [JSIdentifier "a",JSOperator "=",JSDecimal 1]] + ,JSExpression [JSElement "assignmentExpression" [JSIdentifier "a",JSOperator "=",JSDecimal "1"]] ] ] ) @@ -313,7 +314,7 @@ (JSExpression [JSUnary "typeof ",JSIdentifier "s",JSExpressionBinary "!=" [JSStringLiteral '"' "string"] []]) (JSReturn [JSExpression [JSIdentifier "s"],JSLiteral ";"]) , - JSExpression [JSIdentifier "evaluate",JSArguments [[JSDecimal 1]]] + JSExpression [JSIdentifier "evaluate",JSArguments [[JSDecimal "1"]]] ] ] ) @@ -321,51 +322,12 @@ --doParse program "for(i=0,j=assignOps.length;i=0)s+=t;" _case18 :: JSNode @@ -553,7 +448,7 @@ JSIf (JSExpression [JSUnary "typeof ",JSIdentifier "s",JSExpressionBinary "!=" [JSStringLiteral '"' "string"] []]) (JSReturn [JSLiteral ";"]), - JSWhile (JSExpression [JSUnary "--",JSIdentifier "n",JSExpressionBinary ">=" [JSDecimal 0] []]) + JSWhile (JSExpression [JSUnary "--",JSIdentifier "n",JSExpressionBinary ">=" [JSDecimal "0"] []]) (JSExpression [ JSElement "assignmentExpression" @@ -576,7 +471,7 @@ JSExpression [JSElement "assignmentExpression" [ - JSIdentifier "x",JSOperator "=",JSDecimal 1 + JSIdentifier "x",JSOperator "=",JSDecimal "1" ] ] ] @@ -589,7 +484,7 @@ _case20 = [ JSReturn [JSExpression [JSIdentifier "n"],JSLiteral ";"], JSExpression - [JSElement "assignmentExpression" [JSIdentifier "x",JSOperator "=",JSDecimal 1]] + [JSElement "assignmentExpression" [JSIdentifier "x",JSOperator "=",JSDecimal "1"]] ] --doParse program "if(!u)continue;t=n" @@ -603,30 +498,7 @@ --doParse program "if (!v.base){throw new ReferenceError(v.propertyName + \" is not defined\");};x=1" _case22 :: JSNode -_case22 = JSSourceElementsTop - [ - JSIf (JSExpression [JSUnary "!",JSIdentifier "v",JSMemberDot [JSIdentifier "base"]]) - (JSBlock (JSStatementList - [ - JSThrow (JSExpression - [ - JSLiteral "new ", - JSIdentifier "ReferenceError", - JSArguments - [ - [ - JSIdentifier "v", - JSMemberDot [JSIdentifier "propertyName"], - JSExpressionBinary "+" [JSStringLiteral '"' " is not defined"] [] - ] - ] - ] - ), - JSLiteral "" - ] - ) - ), - JSLiteral ";",JSExpression [JSElement "assignmentExpression" [JSIdentifier "x",JSOperator "=",JSDecimal 1]]] +_case22 = undefined --parseString program "{throw new TypeError(\"Function.prototype.apply called on\"+\n\" uncallable object\");}" _case23 :: JSNode @@ -697,5 +569,49 @@ ] ] +-- readJs "var newlines=spaces.match(/\\n/g);var newlines=spaces.match(/\\n/g);" +_case26 :: JSNode +_case26 = JSSourceElementsTop + [ + JSVariables "var" + [ + JSVarDecl (JSIdentifier "newlines") + [JSMemberDot [JSIdentifier "spaces"] (JSIdentifier "match"),JSArguments [[JSRegEx "/\\n/g"]]] + ], + JSVariables "var" + [ + JSVarDecl (JSIdentifier "newlines") [JSMemberDot [JSIdentifier "spaces"] (JSIdentifier "match"), + JSArguments [[JSRegEx "/\\n/g"]]] + ] + ] + +-- readJs "\"mary\"+\"had\"" +_case27 :: JSNode +_case27 = JSSourceElementsTop + [ + JSExpression [JSExpressionBinary "+" [JSStringLiteral '"' "mary"] [JSStringLiteral '"' "had"]] + ] + +-- readJs "throw new TypeError(\"Function.prototype.apply called on\"+\" uncallable object\")" +_case28 :: JSNode +_case28 = JSSourceElementsTop + [ + JSThrow + ( + JSExpression + [ + JSLiteral "new ", + JSIdentifier "TypeError", + JSArguments + [ + [ + JSExpressionBinary "+" + [JSStringLiteral '"' "Function.prototype.apply called on"] + [JSStringLiteral '"' " uncallable object"] + ] + ] + ] + ) + ] -- EOF diff --git a/hjsmin.cabal b/hjsmin.cabal --- a/hjsmin.cabal +++ b/hjsmin.cabal @@ -1,5 +1,5 @@ name: hjsmin -version: 0.0.4 +version: 0.0.5 license: BSD3 license-file: LICENSE author: Alan Zimmerman @@ -24,12 +24,13 @@ default: False library - build-depends: base >= 4 && < 5 - , bytestring >= 0.9 && < 0.10 - , attoparsec >= 0.8 && < 0.9 - , blaze-builder >= 0.2 && < 1 - , text >= 0.8 && < 1 - , containers >= 0.2 && < 0.5 + build-depends: base >= 4 && < 5 + , bytestring >= 0.9 && < 0.10 + , attoparsec >= 0.8 && < 0.9 + , blaze-builder >= 0.2 && < 1 + , text >= 0.8 && < 1 + , containers >= 0.2 && < 0.5 + , language-javascript >= 0.0 && < 0.5 exposed-modules: Text.Jasmine other-modules: Text.Jasmine.Parse, Text.Jasmine.Pretty, Text.Jasmine.Token ghc-options: -Wall @@ -42,6 +43,7 @@ HUnit, test-framework-hunit, test-framework + else Buildable: False main-is: runtests.hs diff --git a/runtests.hs b/runtests.hs --- a/runtests.hs +++ b/runtests.hs @@ -5,7 +5,8 @@ import Data.Char import Text.Jasmine -import Text.Jasmine.Parse hiding (main) +--import Text.Jasmine.Parse -- hiding (main) +import Language.JavaScript.Parser import Text.Jasmine.Pretty import qualified Data.ByteString.Lazy as LB import qualified Data.Text as T @@ -28,7 +29,7 @@ , testCase "0_f.js" case0_f , testCase "01_semi1.js" case01_semi1 , testCase "min_100_animals" case_min_100_animals - , testCase "nestedSquare" caseNestedSquare + , testCase "mergeStrings" caseMergeStrings ] testSuiteMin :: Test @@ -42,6 +43,7 @@ , testCase "01_semi1.js" caseMin01_semi1 , testCase "min_100_animals" caseMin_min_100_animals , testCase "minNestedSquare" caseMinNestedSquare + , testCase "minMergeStrings" caseMinMergeStrings , testCase "EitherLeft" caseEitherLeft , testCase "EitherRight" caseEitherRight ] @@ -112,60 +114,63 @@ srcHelloWorld = "function Hello(a) {}" caseHelloWorld = - "Done Empty JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [])" - @=? (show $ parseString functionDeclaration srcHelloWorld) + "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [])])" + @=? (show $ parseProgram srcHelloWorld) caseMinHelloWorld = -- "function Hello(a){}" @=? (minify (U.fromString srcHelloWorld)) testMinify "function Hello(a){}" srcHelloWorld srcHelloWorld2 = "function Hello(a) {b=1}" caseHelloWorld2 = - "Done Empty JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [JSSourceElements [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"b\",JSOperator \"=\",JSDecimal 1]]]])" - @=? (show $ parseString functionDeclaration srcHelloWorld2) + "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSFunctionBody [JSSourceElements [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"b\",JSOperator \"=\",JSDecimal \"1\"]]]])])" + @=? (show $ parseProgram srcHelloWorld2) caseMinHelloWorld2 = -- "function Hello(a){b=1}" @=? (minify (U.fromString srcHelloWorld2)) testMinify "function Hello(a){b=1}" srcHelloWorld2 srcSimpleAssignment = "a=1;" caseSimpleAssignment = - "Done Empty JSStatementList [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"a\",JSOperator \"=\",JSDecimal 1]],JSLiteral \";\"]" - @=? (show $ parseString statementList srcSimpleAssignment) + "Right (JSSourceElementsTop [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"a\",JSOperator \"=\",JSDecimal \"1\"]],JSLiteral \";\"])" + @=? (show $ parseProgram srcSimpleAssignment) caseMinSimpleAssignment = testMinify "a=1" srcSimpleAssignment srcEmptyFor = "for (i = 0;;){}" caseEmptyFor = - "Done Empty JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal 0]]] [] [] (JSLiteral \";\")" - @=? (show $ parseString iterationStatement srcEmptyFor) + "Right (JSSourceElementsTop [JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal \"0\"]]] [] [] (JSLiteral \";\")])" + @=? (show $ parseProgram srcEmptyFor) srcFullFor = "for (i = 0;i<10;i++){}" caseFullFor = - "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) + "Right (JSSourceElementsTop [JSFor [JSExpression [JSElement \"assignmentExpression\" [JSIdentifier \"i\",JSOperator \"=\",JSDecimal \"0\"]]] [JSExpression [JSExpressionBinary \"<\" [JSIdentifier \"i\"] [JSDecimal \"10\"]]] [JSExpression [JSExpressionPostfix \"++\" [JSIdentifier \"i\"]]] (JSLiteral \";\")])" + @=? (show $ parseProgram srcFullFor) srcForVarFull = "for(var i=0,j=tokens.length;i String trim = f . f where f = reverse . dropWhile isSpace +-- For language-javascript +parseProgram src = parse src "src" + -- EOF