55e092d · rowtype-yoga/purescript-native

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

Revert "Remove runtime type checks #93"

This reverts commit f34cf92aa8356754ae32874fac10aafe02b855c9. Conflicts: psc/Main.hs psci/Main.hs src/Language/PureScript/Options.hs

commit55e092df771fc88ae9b39f4ef300afee5a6f0e26 authorPhil Freeman <paf31@cantab.net> dateThu 13 Mar 2014, 09:18 (13 years ago) parent5a4dac5

4 files changed+45−3

compare with golang

unifiedsplit

psc/Main.hs+5−1 psci/Main.hs+1−1 src/Language/PureScript/CodeGen/JS.hs+34 src/Language/PureScript/Options.hs+5−1

psc/Main.hs+5−1

@@ -83,6 +83,10 @@ tco :: Term Bool

8383tco = value $ flag $ (optInfo [ "tco" ])

8484 { optDoc = "Perform tail call optimizations" }

8585

86+performRuntimeTypeChecks :: Term Bool

87+performRuntimeTypeChecks = value $ flag $ (optInfo [ "runtime-type-checks" ])

88+ { optDoc = "Generate runtime type checks" }

89+

8690noPrelude :: Term Bool

8791noPrelude = value $ flag $ (optInfo [ "no-prelude" ])

8892 { optDoc = "Omit the Prelude" }

@@ -112,7 +116,7 @@ codeGenModules = value $ optAll [] $ (optInfo [ "codegen" ])

112116 { optDoc = "A list of modules for which Javascript and externs should be generated. This argument can be used multiple times." }

113117

114118options :: Term P.Options

115−options = P.Options <$> tco <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules

119+options = P.Options <$> tco <*> performRuntimeTypeChecks <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules

116120

117121stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])

118122stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles

psci/Main.hs+1−1

@@ -195,7 +195,7 @@ completion = completeWord Nothing " \t\n\r" findCompletions

195195-- | Compilation options.

196196--

197197options :: P.Options

198−options = P.Options True True (Just "Main") True "PS" [] []

198+options = P.Options True False True (Just "Main") True "PS" [] []

199199

200200-- |

201201-- Makes a volatile module to execute the current expression.

src/Language/PureScript/CodeGen/JS.hs+34

@@ -135,6 +135,7 @@ valueToJs opts m e (IfThenElse cond th el) = JSConditional (valueToJs opts m e c

135135valueToJs opts m e (Accessor prop val) = JSAccessor prop (valueToJs opts m e val)

136136valueToJs opts m e (App val arg) = JSApp (valueToJs opts m e val) [valueToJs opts m e arg]

137137valueToJs opts m e (Abs (Left arg) val) = JSFunction Nothing [identToJs arg] (JSBlock [JSReturn (valueToJs opts m (bindName m arg e) val)])

138+valueToJs opts m e (TypedValue _ (Abs (Left arg) val) ty) | optionsPerformRuntimeTypeChecks opts = let arg' = identToJs arg in JSFunction Nothing [arg'] (JSBlock $ runtimeTypeChecks arg' ty ++ [JSReturn (valueToJs opts m e val)])

138139valueToJs _ m _ (Var ident) = varToJs m ident

139140valueToJs opts m e (TypedValue _ val _) = valueToJs opts m e val

140141valueToJs _ _ _ (TypeClassDictionary _ _) = error "Type class dictionary was not replaced"

@@ -172,6 +173,39 @@ bindNames m idents env = env { names = M.fromList [ ((m, ident), (noType, LocalV

172173 where

173174 noType = error "Temporary lambda variable type was read"

174175

176+

177+-- |

178+-- Generate code in the simplified Javascript intermediate representation for runtime type checks.

179+--

180+runtimeTypeChecks :: String -> Type -> [JS]

181+runtimeTypeChecks arg ty =

182+ let

183+ argTy = getFunctionArgumentType ty

184+ in

185+ maybe [] (argumentCheck (JSVar arg)) argTy

186+ where

187+ getFunctionArgumentType :: Type -> Maybe Type

188+ getFunctionArgumentType (TypeApp (TypeApp t funArg) _) | t == tyFunction = Just funArg

189+ getFunctionArgumentType (ForAll _ ty' _) = getFunctionArgumentType ty'

190+ getFunctionArgumentType _ = Nothing

191+ argumentCheck :: JS -> Type -> [JS]

192+ argumentCheck val t | t == tyNumber = [typeCheck val "number"]

193+ argumentCheck val t | t == tyString = [typeCheck val "string"]

194+ argumentCheck val t | t == tyBoolean = [typeCheck val "boolean"]

195+ argumentCheck val (TypeApp t _) | t == tyArray = [arrayCheck val]

196+ argumentCheck val (Object row) =

197+ let

198+ (pairs, _) = rowToList row

199+ in

200+ typeCheck val "object" : concatMap (\(prop, ty') -> argumentCheck (JSAccessor prop val) ty') pairs

201+ argumentCheck val (TypeApp (TypeApp t _) _) | t == tyFunction = [typeCheck val "function"]

202+ argumentCheck val (ForAll _ ty' _) = argumentCheck val ty'

203+ argumentCheck _ _ = []

204+ typeCheck :: JS -> String -> JS

205+ typeCheck js ty' = JSIfElse (JSBinary NotEqualTo (JSTypeOf js) (JSStringLiteral ty')) (JSBlock [JSThrow (JSStringLiteral $ ty' ++ " expected")]) Nothing

206+ arrayCheck :: JS -> JS

207+ arrayCheck js = JSIfElse (JSUnary Not (JSApp (JSAccessor "isArray" (JSVar "Array")) [js])) (JSBlock [JSThrow (JSStringLiteral "Array expected")]) Nothing

208+

175209-- |

176210-- Generate code in the simplified Javascript intermediate representation for a reference to a

177211-- variable.

src/Language/PureScript/Options.hs+5−1

@@ -23,6 +23,10 @@ data Options = Options {

2323 -- Perform tail-call elimination

2424 --

2525 optionsTco :: Bool

26+ -- |

27+ -- Perform type checks at runtime

28+ --

29+ , optionsPerformRuntimeTypeChecks :: Bool

2630 -- |

2731 -- Inline calls to ret and bind for the Eff monad

2832 --

@@ -55,4 +59,4 @@ data Options = Options {

5559-- Default compiler options

5660--

5761defaultOptions :: Options

58−defaultOptions = Options False False Nothing False "PS" [] []

62+defaultOptions = Options False False False Nothing False "PS" [] []