jmacro 0.6.2 → 0.6.3

raw patch · 2 files changed

+7/−4 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Language/Javascript/JMacro/QQ.hs +6/−3
• jmacro.cabal +1/−1

@@ -605,7 +605,7 @@           let ans = (IfExpr e t el)           addIf ans <|> return ans     rawExpr = buildExpressionParser table dotExpr <?> "expression"-    table = [[pop "~", pop "!"],+    table = [[pop "~", pop "!", negop],              [iop "*", iop "/", iop "%"],              [pop "++", pop "--"],              [iop "++", iop "+", iop "-", iop "--"],@@ -628,6 +628,10 @@     consOp  = Infix (reservedOp ":|" >> return consAct) AssocRight     consAct x y = ApplExpr (ValExpr (JFunc [StrI "x",StrI "y"] (BlockStat [BlockStat [DeclStat (StrI "tmp") Nothing, AssignStat tmpVar (ApplExpr (SelExpr (ValExpr (JVar (StrI "x"))) (StrI "slice")) [ValExpr (JInt 0)]),ApplStat (SelExpr tmpVar (StrI "unshift")) [ValExpr (JVar (StrI "y"))],ReturnStat tmpVar]]))) [x,y]         where tmpVar = ValExpr (JVar (StrI "tmp"))+    negop   = Prefix (reservedOp "-" >> return negexp)+    negexp (ValExpr (JDouble n)) = ValExpr (JDouble (-n))+    negexp (ValExpr (JInt    n)) = ValExpr (JInt    (-n))+    negexp x                     = PPostExpr True "-" x  dotExpr :: JMParser JExpr dotExpr = do@@ -663,9 +667,8 @@                 (const (return x))                 (parseHSExp x) -    valExpr = ValExpr <$> (num <|> negnum <|> str <|> try regex <|> list <|> hash <|> func <|> var) <?> "value"+    valExpr = ValExpr <$> (num <|> str <|> try regex <|> list <|> hash <|> func <|> var) <?> "value"         where num = either JInt JDouble <$> try natFloat-              negnum = either (JInt . negate) (JDouble . negate) <$> try (char '-' >> natFloat)               str   = JStr   <$> (myStringLiteral '"' <|> myStringLiteral '\'')               regex = do                 s <- regexLiteral --myStringLiteralNoBr '/'

@@ -1,5 +1,5 @@ name:                jmacro-version:             0.6.2+version:             0.6.3 synopsis:            QuasiQuotation library for programmatic generation of Javascript code. description:         Javascript syntax, functional syntax, hygienic names, compile-time guarantees of syntactic correctness, limited typechecking. Additional documentation available at <http://www.haskell.org/haskellwiki/Jmacro> category:            Language