Skip to content

Commit d42a484

Browse files
committed
Simplify 'irProg2JSString'
There seems to be some unecessary complexity as a leftover of previous designs?
1 parent e8e4cf9 commit d42a484

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

compiler/src/Stack2JS.hs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,13 @@ irProg2JSString compileMode debugOut ir =
142142
let (fns, _, (_,_,konts)) = runRWS (toJS ir) debugOut initState
143143
inner = vcat (fns:konts)
144144
outer = vcat $
145-
stdlib
146-
++
147-
[ "function" <+> namespaceName <+> text "(rt) {" ]
148-
++
149-
[ nest 2 inner
150-
, text "}" ]
151-
++
152-
suffix
153-
in
154-
PP.render $
155-
case compileMode of
156-
Normal -> outer
157-
Export -> inner
158-
where -- TODO: should be generating a new namespace per received blob
159-
namespaceName = text "Top"
145+
[ "function" <+> text "Top" <+> text "(rt) {"
146+
, nest 2 inner
147+
, text "}"
148+
, "module.exports = Top"
149+
]
150+
in PP.render $ case compileMode of Normal -> outer
151+
Export -> inner
160152

161153

162154
stack2JSString :: StackUnit -> String
@@ -615,9 +607,6 @@ ppPosInfo :: GetPosInfo a => a -> PP.Doc
615607
ppPosInfo = PP.doubleQuotes . text . show . posInfo
616608

617609
pickle = PP.doubleQuotes.text.T.unpack.decodeUtf8.encode
618-
stdlib = [] -- "let runtime = require('../runtimeMonitored.js')"]
619-
suffix = [ "module.exports = Top "]
620-
621610

622611
jsClosure var env f =
623612
vcat [ ppLet var <+> ((text "rt.mkVal") <> (PP.parens ((text "rt.RawClosure") <> (PP.parens (PP.hsep $ PP.punctuate "," [ppId env, text "this", text "this." PP.<> ppId f])))))

0 commit comments

Comments
 (0)