git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Remove runtime type checks #93
f34cf92Phil Freeman
psc/Main.hs+1−5
@@ -83,10 +83,6 @@ tco :: Term Bool
83tco = value $ flag $ (optInfo [ "tco" ])
83tco = value $ flag $ (optInfo [ "tco" ])
84 { optDoc = "Perform tail call optimizations" }
84 { optDoc = "Perform tail call optimizations" }
85
85
86−performRuntimeTypeChecks :: Term Bool
87−performRuntimeTypeChecks = value $ flag $ (optInfo [ "runtime-type-checks" ])
88− { optDoc = "Generate runtime type checks" }
89−
90noPrelude :: Term Bool
86noPrelude :: Term Bool
91noPrelude = value $ flag $ (optInfo [ "no-prelude" ])
87noPrelude = value $ flag $ (optInfo [ "no-prelude" ])
92 { optDoc = "Omit the Prelude" }
88 { optDoc = "Omit the Prelude" }
@@ -112,7 +108,7 @@ dceModules = value $ optAll [] $ (optInfo [ "m", "module" ])
112 { optDoc = "Enables dead code elimination, all code which is not a transitive dependency of a specified module will be removed. This argument can be used multiple times." }
108 { optDoc = "Enables dead code elimination, all code which is not a transitive dependency of a specified module will be removed. This argument can be used multiple times." }
113
109
114options :: Term P.Options
110options :: Term P.Options
115−options = P.Options <$> tco <*> performRuntimeTypeChecks <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules
111+options = P.Options <$> tco <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules
116
112
117stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])
113stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])
118stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles
114stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles
psci/Main.hs+1−1
@@ -195,7 +195,7 @@ completion = completeWord Nothing " \t\n\r" findCompletions
195-- | Compilation options.
195-- | Compilation options.
196--
196--
197options :: P.Options
197options :: P.Options
198−options = P.Options True False True (Just "Main") True "PS" []
198+options = P.Options True True (Just "Main") True "PS" []
199
199
200-- |
200-- |
201-- Makes a volatile module to execute the current expression.
201-- Makes a volatile module to execute the current expression.
src/Language/PureScript/CodeGen/JS.hs−34
@@ -135,7 +135,6 @@ valueToJs opts m e (IfThenElse cond th el) = JSConditional (valueToJs opts m e c
135valueToJs opts m e (Accessor prop val) = JSAccessor prop (valueToJs opts m e val)
135valueToJs opts m e (Accessor prop val) = JSAccessor prop (valueToJs opts m e val)
136valueToJs opts m e (App val arg) = JSApp (valueToJs opts m e val) [valueToJs opts m e arg]
136valueToJs opts m e (App val arg) = JSApp (valueToJs opts m e val) [valueToJs opts m e arg]
137valueToJs opts m e (Abs (Left arg) val) = JSFunction Nothing [identToJs arg] (JSBlock [JSReturn (valueToJs opts m (bindName m arg e) val)])
137valueToJs 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)])
139valueToJs _ m _ (Var ident) = varToJs m ident
138valueToJs _ m _ (Var ident) = varToJs m ident
140valueToJs opts m e (TypedValue _ val _) = valueToJs opts m e val
139valueToJs opts m e (TypedValue _ val _) = valueToJs opts m e val
141valueToJs _ _ _ (TypeClassDictionary _ _) = error "Type class dictionary was not replaced"
140valueToJs _ _ _ (TypeClassDictionary _ _) = error "Type class dictionary was not replaced"
@@ -173,39 +172,6 @@ bindNames m idents env = env { names = M.fromList [ ((m, ident), (noType, LocalV
173 where
172 where
174 noType = error "Temporary lambda variable type was read"
173 noType = error "Temporary lambda variable type was read"
175
174
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−
209-- |
175-- |
210-- Generate code in the simplified Javascript intermediate representation for a reference to a
176-- Generate code in the simplified Javascript intermediate representation for a reference to a
211-- variable.
177-- variable.
src/Language/PureScript/Options.hs+1−5
@@ -23,10 +23,6 @@ data Options = Options {
23 -- Perform tail-call elimination
23 -- Perform tail-call elimination
24 --
24 --
25 optionsTco :: Bool
25 optionsTco :: Bool
26− -- |
27− -- Perform type checks at runtime
28− --
29− , optionsPerformRuntimeTypeChecks :: Bool
30 -- |
26 -- |
31 -- Inline calls to ret and bind for the Eff monad
27 -- Inline calls to ret and bind for the Eff monad
32 --
28 --
@@ -55,4 +51,4 @@ data Options = Options {
55-- Default compiler options
51-- Default compiler options
56--
52--
57defaultOptions :: Options
53defaultOptions :: Options
58−defaultOptions = Options False False False Nothing False "PS" []
54+defaultOptions = Options False False Nothing False "PS" []