New text alignment functions align{Left,Right,Center}With

These use new calling conventions wordBoxDirect and wordWordBox direct.

Also added foreign convention for chars.

parser-typechecker/src/Unison/Runtime/Builtin.hs

@@ -1001,6 +1001,33 @@ boxToBool = inBx arg result
   where
     (arg, result) = fresh2
 
+-- Nat -> a -> c
+-- Works for an type that's packed into a word, just
+-- pass `wordBoxDirect Ty.natRef`, `wordBoxDirect Ty.floatRef`
+-- etc
+wordBoxDirect :: Reference -> ForeignOp
+wordBoxDirect wordType instr
+  = ([BX,BX],)
+  . TAbss [b1,b2]
+  . unbox b1 wordType ub1
+  $ TFOp instr [ub1,b2]
+  where
+  (b1,b2,ub1) = fresh3
+
+-- Nat -> Char -> a -> c
+-- Works for any types that are packed into a word, not just `Nat`.
+-- Example: wordWordBoxDirect Ty.natRef Ty.charRef
+--          wordWordBoxDirect Ty.floatRef Ty.natRef
+wordWordBoxDirect :: Reference -> Reference -> ForeignOp
+wordWordBoxDirect wordType1 wordType2 instr
+  = ([BX,BX,BX],)
+  . TAbss [b1,b2,b3]
+  . unbox b1 wordType1 ub1
+  . unbox b2 wordType2 ub2
+  $ TFOp instr [ub1,ub2,b3]
+  where
+  (b1,b2,b3,ub1,ub2) = fresh5
+
 -- a -> b -> c
 boxBoxDirect :: ForeignOp
 boxBoxDirect instr
@@ -1468,18 +1495,18 @@ declareForeigns = do
   declareForeign "MVar.tryRead.impl.v3" boxToEFBox
     . mkForeignIOF $ \(mv :: MVar Closure) -> tryReadMVar mv
 
-  declareForeign "Text.repeat" boxBoxDirect . mkForeign $
+  declareForeign "Text.repeat" (wordBoxDirect Ty.natRef) . mkForeign $
     \(n :: Word64, txt :: Text) -> pure (Text.replicate (fromIntegral n) txt)
 
-  declareForeign "Text.alignLeftWith" boxBoxBoxDirect . mkForeign $
+  declareForeign "Text.alignLeftWith" (wordWordBoxDirect Ty.natRef Ty.charRef) . mkForeign $
     \(n :: Word64, padChar :: Char, txt :: Text) ->
       pure (Text.justifyLeft (fromIntegral n) padChar txt)
 
-  declareForeign "Text.alignRightWith" boxBoxBoxDirect . mkForeign $
+  declareForeign "Text.alignRightWith" (wordWordBoxDirect Ty.natRef Ty.charRef) . mkForeign $
     \(n :: Word64, padChar :: Char, txt :: Text) ->
       pure (Text.justifyRight (fromIntegral n) padChar txt)
 
-  declareForeign "Text.alignCenterWith" boxBoxBoxDirect . mkForeign $
+  declareForeign "Text.alignCenterWith" (wordWordBoxDirect Ty.natRef Ty.charRef) . mkForeign $
     \(n :: Word64, padChar :: Char, txt :: Text) ->
       pure (Text.center (fromIntegral n) padChar txt)
 

parser-typechecker/src/Unison/Runtime/Foreign.hs

@@ -85,7 +85,6 @@ maybeUnwrapForeign rt (Wrap r e)
 class BuiltinForeign f where
   foreignRef :: Tagged f Reference
 
-instance BuiltinForeign Char where foreignRef = Tagged Ty.charRef
 instance BuiltinForeign Text where foreignRef = Tagged Ty.textRef
 instance BuiltinForeign Bytes where foreignRef = Tagged Ty.bytesRef
 instance BuiltinForeign Handle where foreignRef = Tagged Ty.fileHandleRef

parser-typechecker/src/Unison/Runtime/Foreign/Function.hs

@@ -16,6 +16,7 @@ import GHC.IO.Exception (IOException(..), IOErrorType(..))
 import Control.Concurrent (ThreadId)
 import Control.Concurrent.MVar (MVar)
 import Control.Concurrent.STM (TVar)
+import qualified Data.Char as Char
 import Data.Foldable (toList)
 import Data.Text (Text, pack, unpack)
 import Data.Time.Clock.POSIX (POSIXTime)
@@ -80,6 +81,13 @@ instance ForeignConvention Word64 where
     ustk <- bump ustk
     (ustk, bstk) <$ pokeN ustk n
 
+instance ForeignConvention Char where
+  readForeign (i:us) bs ustk _ = (us,bs,) . Char.chr <$> peekOff ustk i
+  readForeign [] _ _ _ = foreignCCError "Char"
+  writeForeign ustk bstk ch = do
+    ustk <- bump ustk
+    (ustk, bstk) <$ poke ustk (Char.ord ch)
+
 instance ForeignConvention Closure where
   readForeign us (i:bs) _ bstk = (us,bs,) <$> peekOff bstk i
   readForeign _  [    ] _ _    = foreignCCError "Closure"