e0ebd9e · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Merge pull request #94 from bitonic/no-unsafe-calls

call functions safely in `(#)`, `jsf`, etc.

commite0ebd9ee64c7c523e8fa90db3cd2ff89d744d32d authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateWed 10 Jul 2019, 11:26 (7 years ago) parentc745863 b481073

2 files changed+3−3

compare with master

unifiedsplit

jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs+1−1 jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−2

jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs+1−1

@@ -50,7 +50,7 @@ eval :: (ToJSString script)

5050 -> JSM JSVal

5151#ifdef ghcjs_HOST_OS

5252eval script = liftIO $ js_eval (toJSString script)

53−foreign import javascript unsafe "$r = eval($1);"

53+foreign import javascript safe "$r = eval($1);"

5454 js_eval :: JSString -> IO JSVal

5555#else

5656eval = evaluateScript . toJSString

jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−2

@@ -557,7 +557,7 @@ objCallAsFunction :: MakeArgs args

557557objCallAsFunction f this args = do

558558 rargs <- makeArgs args >>= liftIO . Array.fromListIO

559559 liftIO $ js_apply f this rargs

560−foreign import javascript unsafe "$r = $1.apply($2, $3)"

560+foreign import javascript safe "$r = $1.apply($2, $3)"

561561 js_apply :: Object -> Object -> MutableJSArray -> IO JSVal

562562#else

563563objCallAsFunction f this args = do

@@ -577,7 +577,7 @@ objCallAsConstructor :: MakeArgs args

577577objCallAsConstructor f args = do

578578 rargs <- makeArgs args >>= liftIO . Array.fromListIO

579579 liftIO $ js_new f rargs

580−foreign import javascript unsafe "\

580+foreign import javascript safe "\

581581 switch($2.length) {\

582582 case 0 : $r = new $1(); break;\

583583 case 1 : $r = new $1($2[0]); break;\