git.iko.soy/Idris-dev
on master help sign in
Rely on generated runMain to test if a main method is present instead of hardcoded Main.main
a57ade6Jan Bessai
src/IRTS/CodegenJava.hs+2−8
compare with master
unifiedsplit
@@ -365,17 +365,11 @@ mkGlobalContext initExps = do
365
365
366addMainMethod :: [Decl] -> [Decl]
366addMainMethod :: [Decl] -> [Decl]
367addMainMethod decls
367addMainMethod decls
368− | findMain decls = mkMainMethod : decls
368+ | findMainMethod decls = mkMainMethod : decls
369 | otherwise = decls
369 | otherwise = decls
370 where
370 where
371− findMain ((MemberDecl (MemberClassDecl (ClassDecl _ name _ _ _ (ClassBody body)))):_)
372− | name == mangle' (sUN "Main") = findMainMethod body
373− findMain (_:decls) = findMain decls
374− findMain [] = False
375−
376− innerMainMethod = (either error id $ mangle (sUN "main"))
377 findMainMethod ((MemberDecl (MethodDecl _ _ _ name [] _ _)):_)
371 findMainMethod ((MemberDecl (MethodDecl _ _ _ name [] _ _)):_)
378− | name == mangle' (sUN "main") = True
372+ | name == mangle' (sMN 0 "runMain") = True
379 findMainMethod (_:decls) = findMainMethod decls
373 findMainMethod (_:decls) = findMainMethod decls
380 findMainMethod [] = False
374 findMainMethod [] = False
381
375