tco working, update playground to self-hosted newt

src/Lib/Compile.newt

@@ -126,7 +126,7 @@ termToJS env (CBnd k) f = case getAt (cast k) env.jsenv of
   (Just e) => f e
   Nothing => fatalError "Bad bounds"
 termToJS env CErased f = f JUndefined
-termToJS env (CRaw str) f = f (Raw str)
+termToJS env (CRaw str _) f = f (Raw str)
 termToJS env (CLam nm t) f =
   let (nm',env') = freshName' nm env -- "\{nm}$\{show $ length env}"
   in f $ JLam (nm' :: Nil) (termToJS env' t JReturn)
@@ -334,18 +334,37 @@ getEntries acc name = do
 -- sort names by dependencies
 -- In JS this is only really needed for references that don't fall
 -- under a lambda.
-sortedNames : SortedMap QName Def → QName → List QName
+sortedNames : SortedMap QName CExp → QName → List QName
 sortedNames defs qn = go Nil Nil qn
   where
+    getBody : CAlt → CExp
+    getBody (CConAlt _ _ t) = t
+    getBody (CLitAlt _ t) = t
+    getBody (CDefAlt t) = t
+
+    getNames : List QName → CExp →  List QName
+    getNames acc (CLam _ t) = getNames acc t
+    getNames acc (CFun _ t) = getNames acc t
+    getNames acc (CApp t ts _) = foldl getNames acc (t :: ts)
+    getNames acc (CCase t alts) = foldl getNames acc $ t :: map getBody alts
+    getNames acc (CRef qn) = qn :: acc
+    getNames acc (CLet _ t u) = getNames (getNames acc t) u
+    getNames acc (CLetRec _ t u) = getNames (getNames acc t) u
+    getNames acc (CConstr _ ts) = foldl getNames acc ts
+    getNames acc (CRaw _ deps) = deps ++ acc
+    -- wrote these out so I get an error when I add a new constructor
+    getNames acc (CLit _) = acc
+    getNames acc (CMeta _) = acc
+    getNames acc (CBnd _) = acc
+    getNames acc CErased = acc
+
     go : List QName → List QName → QName → List QName
     go loop acc qn =
       -- O(n^2) it would be more efficient to drop qn from the map
       if elem qn loop || elem qn acc then acc else
       case lookupMap' qn defs of
         Nothing => acc
-        Just (Fn tm) => qn :: foldl (go $ qn :: loop) acc (getNames tm Nil)
-        Just (PrimFn src _ used) => qn :: foldl (go $ qn :: loop) acc used
-        Just def => qn :: acc
+        Just exp => qn :: foldl (go $ qn :: loop) acc (getNames Nil exp)
 
 eraseEntries : {{Ref2 Defs St}} → M Unit
 eraseEntries = do
@@ -372,11 +391,10 @@ process name = do
   eraseEntries
   liftWhere
   entries <- readIORef ref
-  let names = sortedNames entries name
   exprs <- mapM defToCExp $ toList entries
   let cexpMap = foldMap const EmptyMap exprs
-  -- TCO here on cexpMap
-  tailCallOpt cexpMap
+  cexpMap <- tailCallOpt cexpMap
+  let names = sortedNames cexpMap name
   pure $ map cexpToDoc $ mapMaybe (\x => lookupMap x cexpMap) names
 
 compile : M (List Doc)

src/Lib/CompileExp.newt

@@ -41,7 +41,7 @@ data CExp : U where
   -- Data / type constructor
   CConstr : Name -> List CExp -> CExp
   -- Raw javascript for `pfunc`
-  CRaw : String -> CExp
+  CRaw : String -> List QName -> CExp
 
 -- I'm counting Lam in the term for arity.  This matches what I need in
 -- code gen.
@@ -160,5 +160,5 @@ defToCExp (qn, Axiom)          = pure $ (qn, CErased)
 defToCExp (qn, DCon arity _)   = pure $ (qn, compileDCon qn arity)
 defToCExp (qn, TCon arity _)   = pure $ (qn, compileDCon qn arity)
 defToCExp (qn, PrimTCon arity) = pure $ (qn, compileDCon qn arity)
-defToCExp (qn, PrimFn src _ _) = pure $ (qn, CRaw src)
+defToCExp (qn, PrimFn src _ deps) = pure $ (qn, CRaw src deps)
 defToCExp (qn, Fn tm)          = (_,_ qn) <$> compileFun tm

src/Lib/TCO.newt

@@ -8,17 +8,17 @@ import Lib.Types
 import Lib.CompileExp
 import Data.SortedMap
 
--- We need CompileExp here, so we know if it's
--- fully applied, needs eta, etc.
--- Maybe we should move Ref2 Defs over to CExp?
--- But we'll need CExp for constructors, etc.
--- I _could_ collect a stack and look up arity, but
--- at the next stage, we'd need to fake up constructor
--- records
+/-
+  This is modeled after Idris' tail call optimization written by Stefan Hoeck.
 
+  We collect strongly connected components of the tail call graph,
+  defunctionalize it (make a data type modelling function calls and "return"),
+  and wrap it in a trampoline.
+
+-/
+
+-- Find names of applications in tail position
 tailNames : CExp → List QName
--- This is tricky, we need to skip the first CLam, but
--- a deeper one is a return value
 tailNames (CApp (CRef name) args 0) = name :: Nil
 tailNames (CCase _ alts) = join $ map altTailNames alts
   where
@@ -28,7 +28,7 @@ tailNames (CCase _ alts) = join $ map altTailNames alts
     altTailNames (CLitAlt _ exp) = tailNames exp
 tailNames (CLet _ _ t) = tailNames t
 tailNames (CLetRec _ _ t) = tailNames t
-tailNames (CConstr _ args) = Nil -- join $ map tailNames args
+tailNames (CConstr _ args) = Nil
 tailNames (CBnd _) = Nil
 tailNames (CFun _ tm) = tailNames tm
 tailNames (CLam _ _) = Nil
@@ -38,35 +38,72 @@ tailNames (CRef _) = Nil
 tailNames CErased = Nil
 tailNames (CLit _) = Nil
 tailNames (CMeta _) = Nil
-tailNames (CRaw _) = Nil
+tailNames (CRaw _ _) = Nil
 
-/-
-(CFun ["_", "_", "_$2", "_$3"]
-  (CCase (CBnd 0) [
-     (CConAlt "_::_" ["a$4", "_$5", "_$6"]
-       (CApp (CRef "Prelude.reverse.go")
-          [(CBnd 6), (CBnd 5), (CApp (CRef "Prelude._::_") [(CErased), (CBnd 1), (CBnd 4)] 0), (CBnd 0)] 0)), (CConAlt "Nil" ["a$4"] (CBnd 2))]))
+-- rewrite tail calls to return an object
+rewriteTailCalls : List QName → CExp → CExp
+rewriteTailCalls nms tm = case tm of
+  CApp (CRef nm) args 0 =>
+      if elem nm nms
+        then CConstr (show nm) args
+        else CConstr "return" (tm :: Nil)
+  CLetRec nm t u => CLetRec nm t $ rewriteTailCalls nms u
+  CLet nm t u => CLet nm t $ rewriteTailCalls nms u
+  CCase sc alts => CCase sc $ map rewriteAlt alts
+  tm => CConstr "return" (tm :: Nil)
+  where
+      rewriteAlt : CAlt -> CAlt
+      rewriteAlt (CConAlt nm args t) = CConAlt nm args $ rewriteTailCalls nms t
+      rewriteAlt (CDefAlt t) = CDefAlt $ rewriteTailCalls nms t
+      rewriteAlt (CLitAlt lit t) = CLitAlt lit $ rewriteTailCalls nms t
 
--/
+-- the name of our trampoline
+bouncer : QName
+bouncer = QN Nil "bouncer"
 
+doOptimize : List (QName × CExp) → M (List (QName × CExp))
+doOptimize fns = do
+  splitFuns <- traverse splitFun fns
+  let nms = map fst fns
+  let alts = CConAlt "return" ("rval" :: Nil) (CBnd 0) :: map (mkAlt nms) splitFuns
+  recName <- mkRecName nms
+  let recfun = CFun ("arg" :: Nil) $ CCase (CBnd 0) alts
+  wrapped <- traverse (mkWrap recName) fns
+  pure $ (recName, recfun) :: wrapped
+  where
+    mkWrap : QName → QName × CExp → M (QName × CExp)
+    mkWrap recName (qn, CFun args _) = do
+      let arglen = length' args
+      let arg = CConstr (show qn) $ map (\k => CBnd (arglen - k - 1)) (range 0 arglen)
+      let body = CApp (CRef bouncer) (CRef recName :: arg :: Nil) 0
+      pure $ (qn, CFun args body)
+    mkWrap _ (qn, _) = error emptyFC "error in mkWrap: \{show qn} not a CFun"
+
+    mkRecName : List QName → M QName
+    mkRecName Nil = error emptyFC "INTERNAL ERROR: Empty List in doOptimize"
+    mkRecName (QN ns nm :: _) = pure $ QN ns "REC_\{nm}"
+
+    mkAlt : List QName → (QName × List Name × CExp) -> CAlt
+    mkAlt nms (qn, args, tm) = CConAlt (show qn) args (rewriteTailCalls nms tm)
+
+    splitFun : (QName × CExp) → M (QName × List Name × CExp)
+    splitFun (qn, CFun args body) = pure (qn, args, body)
+    splitFun (qn, _) = error emptyFC "TCO error: \{show qn} not a function"
 
 ExpMap : U
 ExpMap = SortedMap QName CExp
 
--- Need to switch everything to QName
 tailCallOpt : ExpMap → M ExpMap
 tailCallOpt expMap = do
-  putStrLn "TODO TCO"
-  let blah = map (bimap id tailNames) (toList expMap)
-  let out = tarjan blah
-  for (toList expMap) $ \ foo => case foo of
-    (qn, cexp) => do
-      liftIO $ putStrLn "--- \{show qn}"
-      liftIO $ debugLog cexp
-      liftIO $ debugLog $ tailNames cexp
-  -- everything is pointing to itself, I don't want that unless it actually does..
-  for out $ \ names => liftIO $ debugLog names
-
-  -- liftIO $ debugLog out
-  pure expMap
+  let graph = map (bimap id tailNames) (toList expMap)
+  let groups = tarjan graph
+  foldlM processGroup expMap groups
+  where
+    doUpdate : ExpMap → QName × CExp → ExpMap
+    doUpdate acc (k,v) = updateMap k v acc
 
+    processGroup : ExpMap → List QName → M ExpMap
+    processGroup expMap names = do
+      let pairs = mapMaybe (flip lookupMap expMap) names
+      updates <- doOptimize pairs
+      pure $ foldl doUpdate expMap updates

src/Main.newt

@@ -52,7 +52,8 @@ writeSource fn = do
   docs <- compile
   let src = unlines $
         ( "\"use strict\";"
-        ::  "const PiType = (h0, h1) => ({ tag: \"PiType\", h0, h1 })"
+        :: "const PiType = (h0, h1) => ({ tag: \"PiType\", h0, h1 });"
+        :: "const bouncer = (f,ini) => { let obj = ini; while (obj.tag !== 'return') obj = f(obj); return obj.h0 };"
         :: Nil)
         ++ map (render 90 ∘ noAlt) docs
   (Right _) <- liftIO {M} $ writeFile fn src
@@ -229,7 +230,7 @@ cmdLine (fn :: args) = do
 
 main' : M Unit
 main' = do
-  let (arg0 :: args) = getArgs
+  (arg0 :: args) <- liftIO {M} $ getArgs
     | _ => error emptyFC "error reading args"
   (out, files) <- cmdLine args
   traverse processFile files

src/Node.newt

@@ -2,8 +2,7 @@ module Node
 
 import Prelude
 
--- REVIEW - should this be IO (List String)
-pfunc getArgs uses (arrayToList) : List String := `Prelude_arrayToList(null, process.argv.slice(1))`
+pfunc getArgs uses (arrayToList MkIORes) :  IO (List String) := `(w) => Prelude_MkIORes(null, Prelude_arrayToList(null, process.argv.slice(1)), w)`
 pfunc readFile uses (MkIORes Left Right) : (fn : String) -> IO (Either String String) := `(fn) => (w) => {
   let fs = require('fs')
   let result