@@ -129,6 +129,9 @@ compileJS (JSError exc) =
129129compileJS (JSBinOp op lhs rhs) =
130130 compileJS lhs ++ " " ++ op ++ " " ++ compileJS rhs
131131
132+compileJS (JSPreOp op val) =
133+ op ++ compileJS val
134+
132135compileJS (JSProj obj field)
133136 | JSFunction {} <- obj =
134137 concat ["(", compileJS obj, ").", field]
@@ -428,7 +431,8 @@ isJSConstantConstructor constants js
428431 all (isJSConstantConstructor constants) vals
429432 | JSNew "__IDRRT__Con" args <- js =
430433 all (isJSConstantConstructor constants) args
431− | JSIndex (JSProj (JSIdent _) "vars") (JSNum _) <- js =
434+ | JSIndex (JSProj (JSIdent name) "vars") (JSNum _) <- js
435+ , name `elem` constants =
432436 True
433437 | JSIdent name <- js
434438 , name `elem` constants =
@@ -1593,7 +1597,7 @@ translateExpression (SOp op vars)
15931597 | (LASHR _) <- op
15941598 , (lhs:rhs:_) <- vars = translateBinaryOp ">>" rhs lhs
15951599 | (LCompl _) <- op
1596− , (arg:_) <- vars = JSRaw $ '~' : translateVariableName arg
1600+ , (arg:_) <- vars = JSPreOp "~" (JSVar arg)
15971601
15981602 | LStrConcat <- op
15991603 , (lhs:rhs:_) <- vars = translateBinaryOp "+" lhs rhs
@@ -1662,7 +1666,10 @@ translateExpression (SOp op vars)
16621666 , (lhs:rhs:_) <- vars = JSIndex (JSVar lhs) (JSVar rhs)
16631667 | LStrTail <- op
16641668 , (arg:_) <- vars = let v = translateVariableName arg in
1665− JSRaw $ v ++ ".substr(1," ++ v ++ ".length-1)"
1669+ JSApp (JSProj (JSIdent v) "substr") [
1670+ JSNum (JSInt 1),
1671+ JSBinOp "-" (JSProj (JSIdent v) "length") (JSNum (JSInt 1))
1672+ ]
16661673 | LNullPtr <- op
16671674 , (_) <- vars = JSNull
16681675