Skip to content

Update for PureScript 0.9 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianbollinger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for PureScript 0.9 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,16 @@
"tests"
],
"dependencies": {
"purescript-control": "^0.3.0",
"purescript-eff": "^0.1.0",
"purescript-functions": "^0.1.0",
"purescript-context": "^1.0.0"
"purescript-context": "^1.0.0",
"purescript-control": "^1.0.0",
"purescript-eff": "^1.0.0",
"purescript-functions": "^1.0.1",
"purescript-prelude": "^1.0.1"
},
"devDependencies": {
"purescript-aff": "^0.11.3",
"purescript-random": "^0.2.2",
"purescript-spec": "^0.7.1",
"purescript-spec-quickcheck": "^0.3.0"
},
"resolutions": {
"purescript-spec": "^0.7.1"
"purescript-aff": "^1.0.0",
"purescript-random": "^1.0.0",
"purescript-spec": "^0.8.0",
"purescript-spec-quickcheck": "^0.9.1"
}
}
14 changes: 8 additions & 6 deletions src/Data/Foreign/OOFFI.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ module Data.Foreign.OOFFI

import Prelude

import Control.Bind ((<=<))
import Control.Monad.Eff (Eff())
import Data.Function -- runFnX
import Foreign.Context (getContext)
import Control.Bind ((<=<))
import Control.Monad.Eff (Eff())
import Data.Function.Uncurried (runFn0, runFn1, runFn2, runFn3, runFn4, runFn5)
import Foreign.Context (getContext)

-- Helper Functions -----------------------------------------------------------

Expand All @@ -30,8 +30,10 @@ foreign import instantiateImpl :: forall c fn ret eff. c -> fn (Eff eff ret)
foreign import mapEff :: forall fn ret eff. fn ret -> fn (Eff eff ret)
foreign import unsafeGetter :: forall o a. String -> o -> a

(..) :: forall a b c d. (c -> d) -> (a -> b -> c) -> a -> b -> d
(..) f g a b = f (g a b)
compose2 :: forall a b c d. (c -> d) -> (a -> b -> c) -> a -> b -> d
compose2 f g a b = f (g a b)

infixr 9 compose2 as ..

-- Property Access ------------------------------------------------------------

Expand Down
18 changes: 13 additions & 5 deletions test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,39 @@ import Prelude

import Control.Apply ((*>))
import Control.Monad.Aff (Aff()) -- MonadEff Aff
import Control.Monad.Eff.Console (CONSOLE(), log)
import Control.Monad.Eff.Console (CONSOLE())
import Control.Monad.Eff (Eff())
import Control.Monad.Eff.Class (liftEff)
import Control.Monad.Eff.Random (RANDOM(), random, randomBool)
import Foreign.Context (Context(), getContext)
import Node.Process (PROCESS())
import Test.Spec (describe, it)
import Test.Spec.Assertions (shouldEqual)
import Test.Spec.Reporter.Console (consoleReporter)
import Test.Spec.Runner (Process(), run)
import Test.Spec.QuickCheck (quickCheck)
import Test.Spec.Runner (run)

import Data.Foreign.OOFFI
import Data.Foreign.OOFFI ( method0, method0Eff, method1, method1Eff
, method2, method2Eff, method3, method3Eff
, method4, method4Eff, method5, method5Eff
, getter, modifier, setter
, instantiate0, instantiate1, instantiate2
, instantiate3, instantiate4, instantiate5
)

foreign import data TestObj :: *
foreign import data OOTEST :: !

foreign import obj :: TestObj
foreign import assignContext :: forall eff. Context -> Eff eff Unit

type Effit ret = Eff (ooTest :: OOTEST, random :: RANDOM, console :: CONSOLE, process :: Process) ret
type Affit ret = Aff (ooTest :: OOTEST, random :: RANDOM, console :: CONSOLE, process :: Process) ret
type Effit ret = Eff (ooTest :: OOTEST, random :: RANDOM, console :: CONSOLE, process :: PROCESS) ret
type Affit ret = Aff (ooTest :: OOTEST, random :: RANDOM, console :: CONSOLE, process :: PROCESS) ret

lift' :: forall a. Effit a -> Affit a
lift' = liftEff

main :: Effit Unit
main = (getContext >>= assignContext) *> run [consoleReporter] do
describe "OOFFI" do
describe "the method functions" do
Expand Down