763d0c3 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

insert space of negate only when apply to negative value

763d0c3philopon12 years ago

src/Language/PureScript/Pretty/JS.hs+13−4

compare with golang

unifiedsplit

@@ -209,15 +209,24 @@ instanceOf = mkPattern match

209 match (JSInstanceOf val ty) = Just (val, ty)

210 match _ = Nothing

211

212−unary :: UnaryOperator -> String -> Operator PrinterState JS String

212+unary' :: UnaryOperator -> (JS -> String) -> Operator PrinterState JS String

213−unary op str = Wrap match (++)

213+unary' op mkStr = Wrap match (++)

214 where

215 match :: Pattern PrinterState JS (String, JS)

216 match = mkPattern match'

217 where

218− match' (JSUnary op' val) | op' == op = Just (str, val)

218+ match' (JSUnary op' val) | op' == op = Just (mkStr val, val)

219 match' _ = Nothing

220

221+unary :: UnaryOperator -> String -> Operator PrinterState JS String

222+unary op str = unary' op (const str)

223+

224+negateOperator :: Operator PrinterState JS String

225+negateOperator = unary' Negate (\v -> if isNegative v then "- " else "-")

226+ where

227+ isNegative (JSNumericLiteral num) | either (<0) (<0) num = True

228+ isNegative _ = False

229+

221binary :: BinaryOperator -> String -> Operator PrinterState JS String

230binary :: BinaryOperator -> String -> Operator PrinterState JS String

222binary op str = AssocL match (\v1 v2 -> v1 ++ " " ++ str ++ " " ++ v2)

231binary op str = AssocL match (\v1 v2 -> v1 ++ " " ++ str ++ " " ++ v2)

223 where

232 where

@@ -271,7 +280,7 @@ prettyPrintJS' = A.runKleisli $ runPattern matchValue

271 , [ AssocR instanceOf $ \v1 v2 -> v1 ++ " instanceof " ++ v2 ]

280 , [ AssocR instanceOf $ \v1 v2 -> v1 ++ " instanceof " ++ v2 ]

272 , [ unary Not "!" ]

281 , [ unary Not "!" ]

273 , [ unary BitwiseNot "~" ]

282 , [ unary BitwiseNot "~" ]

274− , [ unary Negate "- " ]

283+ , [ negateOperator ]

275 , [ unary Positive "+" ]

284 , [ unary Positive "+" ]

276 , [ binary Multiply "*"

285 , [ binary Multiply "*"

277 , binary Divide "/"

286 , binary Divide "/"