Arborix -> Arboricx rename

src/FileEval.hs

@@ -162,7 +162,7 @@ nsVariable :: String -> String -> String
 nsVariable "" name = name
 nsVariable moduleName name = moduleName ++ "." ++ name
 
--- | Compile a tricu source file to a standalone Arborix bundle.
+-- | Compile a tricu source file to a standalone Arboricx bundle.
 -- Uses a temp content store so it does not collide with the global one.
 -- Supports multiple named exports; each is stored separately in the
 -- temp store so that resolveExportTarget can look them up by name.

src/Main.hs

@@ -97,7 +97,7 @@ compileMode = Compile
   , names = def &= help "Definition name(s) to export as bundle roots (comma-separated or repeated -x). Defaults to 'main'."
               &= name "x" &= typ "NAME"
   }
-  &= help "Compile a tricu source file into a standalone Arborix portable bundle."
+  &= help "Compile a tricu source file into a standalone Arboricx portable bundle."
   &= explicit
   &= name "compile"
 
@@ -106,7 +106,7 @@ serveMode = Serve
   { host = "127.0.0.1" &= help "Host to bind the server to." &= name "h" &= typ "HOST"
     , port = 8787 &= help "HTTP port to listen on." &= name "p" &= typ "PORT"
   }
-  &= help "Start a read-only HTTP server for exporting Arborix bundles."
+  &= help "Start a read-only HTTP server for exporting Arboricx bundles."
   &= explicit
   &= name "server"
 
@@ -182,10 +182,10 @@ main = do
       let exportNames = if null namesArg then [] else map T.pack namesArg
       in compileFile compileInputFile compileOutFile exportNames
     Serve { host = hostStr, port = portNum } -> do
-      putStrLn $ "Starting Arborix bundle server on " ++ hostStr ++ ":" ++ show portNum
+      putStrLn $ "Starting Arboricx bundle server on " ++ hostStr ++ ":" ++ show portNum
       putStrLn $ "  GET /bundle/hash/:hash   -- primary endpoint"
       putStrLn $ "  GET /bundle/name/:name   -- convenience endpoint"
-      putStrLn $ "  Content-Type: application/vnd.arborix.bundle"
+      putStrLn $ "  Content-Type: application/vnd.arboricx.bundle"
       runServer hostStr portNum
 
 runTricu :: String -> String

src/Research.hs

@@ -85,12 +85,12 @@ serializeNode (NFork l r) = BS.pack [0x02] <> go (decode (encodeUtf8 l)) <> go (
         go (Right bs) = bs
 
 -- | Hash a node per the Merkle content-addressing spec.
--- hash = SHA256( "arborix.merkle.node.v1" <> 0x00 <> node_payload )
+-- hash = SHA256( "arboricx.merkle.node.v1" <> 0x00 <> node_payload )
 nodeHash :: Node -> MerkleHash
 nodeHash node = decodeUtf8 (encode (sha256WithPrefix (serializeNode node)))
   where sha256WithPrefix payload =
           convert . (hash :: BS.ByteString -> Digest SHA256) $ utf8Tag <> BS.pack [0x00] <> payload
-        utf8Tag = BS.pack $ map fromIntegral $ BS.unpack "arborix.merkle.node.v1"
+        utf8Tag = BS.pack $ map fromIntegral $ BS.unpack "arboricx.merkle.node.v1"
 
 -- | Deserialize a Node from canonical bytes.
 deserializeNode :: BS.ByteString -> Node
@@ -138,7 +138,7 @@ toBytes t = case toList t of
   Left err -> Left err
   Right bs -> BS.pack <$> mapM toByte bs
 
--- | Convert a canonical Arborix node payload (ByteString) to a Tree
+-- | Convert a canonical Arboricx node payload (ByteString) to a Tree
 --   representation (a list of Byte trees).
 nodePayloadToTreeBytes :: BS.ByteString -> T
 nodePayloadToTreeBytes = ofBytes

src/Server.hs

@@ -23,7 +23,7 @@ import Data.ByteString.Char8 (unpack)
 import Data.ByteString.Lazy (fromStrict)
 import qualified Data.Text as T
 
--- | Start an HTTP server that serves Arborix bundles from the
+-- | Start an HTTP server that serves Arboricx bundles from the
 --   local content store.
 --
 -- This is a read-only export surface.  Clients fetch bundle bytes
@@ -133,10 +133,10 @@ rootsHandler request respond = do
     (fromStrict bundleData)
 
 -- | GET /bundle/name/:name
---   Resolve a stored term name, export it as an Arborix bundle,
+--   Resolve a stored term name, export it as an Arboricx bundle,
 --   and return the raw bundle bytes.
 --
---   Sets @Content-Type@ and @X-Arborix-Root-Hash@ headers.
+--   Sets @Content-Type@ and @X-Arboricx-Root-Hash@ headers.
 --   Returns 404 when the name does not resolve to any stored term.
 nameHandler :: Text -> IO Response
 nameHandler nameText = do
@@ -155,7 +155,7 @@ nameHandler nameText = do
       return $ responseLBS status200 (bundleHeaders th cd) (fromStrict bundleData)
 
 -- | GET /bundle/hash/:hash
---   Resolve a full Merkle hash and export the root as an Arborix
+--   Resolve a full Merkle hash and export the root as an Arboricx
 --   bundle.
 --
 --   - Malformed hash (non-hex or < 16 chars): 400
@@ -207,8 +207,8 @@ textResponse status body =
 
 bundleHeaders :: Text -> Text -> [Header]
 bundleHeaders root cd =
-  [ (hContentType, encodeUtf8 "application/vnd.arborix.bundle")
-  , ("X-Arborix-Root-Hash", encodeUtf8 root)
+  [ (hContentType, encodeUtf8 "application/vnd.arboricx.bundle")
+  , ("X-Arboricx-Root-Hash", encodeUtf8 root)
   , ("Content-Disposition", encodeUtf8 cd)
   ]
 

src/Wire.hs

@@ -71,7 +71,7 @@ bundleMinorVersion = 0
 
 -- | Header magic for the portable executable-object container.
 bundleMagic :: ByteString
-bundleMagic = BS.pack [0x41, 0x52, 0x42, 0x4f, 0x52, 0x49, 0x58, 0x00] -- "ARBORIX\0"
+bundleMagic = BS.pack [0x41, 0x52, 0x42, 0x4f, 0x52, 0x49, 0x43, 0x58] -- "ARBORICX"
 
 headerLength :: Int
 headerLength = 32
@@ -563,20 +563,20 @@ decodeSectionEntries count bytes = reverse <$> go count bytes []
 
 defaultManifest :: [(Text, MerkleHash)] -> BundleManifest
 defaultManifest namedRoots = BundleManifest
-  { manifestSchema = "arborix.bundle.manifest.v1"
+  { manifestSchema = "arboricx.bundle.manifest.v1"
   , manifestBundleType = "tree-calculus-executable-object"
   , manifestTree = TreeSpec
       { treeCalculus = "tree-calculus.v1"
       , treeNodeHash = NodeHashSpec
           { nodeHashAlgorithm = "sha256"
-          , nodeHashDomain = "arborix.merkle.node.v1"
+          , nodeHashDomain = "arboricx.merkle.node.v1"
           }
-      , treeNodePayload = "arborix.merkle.payload.v1"
+      , treeNodePayload = "arboricx.merkle.payload.v1"
       }
   , manifestRuntime = RuntimeSpec
       { runtimeSemantics = "tree-calculus.v1"
       , runtimeEvaluation = "normal-order"
-      , runtimeAbi = "arborix.abi.tree.v1"
+      , runtimeAbi = "arboricx.abi.tree.v1"
       , runtimeCapabilities = []
       }
   , manifestClosure = ClosureComplete
@@ -587,7 +587,7 @@ defaultManifest namedRoots = BundleManifest
       , metadataVersion   = Nothing
       , metadataDescription = Nothing
       , metadataLicense   = Nothing
-      , metadataCreatedBy = Just "arborix"
+      , metadataCreatedBy = Just "arboricx"
       }
   }
   where
@@ -597,7 +597,7 @@ defaultManifest namedRoots = BundleManifest
       { exportName = name
       , exportRoot = h
       , exportKind = "term"
-      , exportAbi = "arborix.abi.tree.v1"
+      , exportAbi = "arboricx.abi.tree.v1"
       }
 
 -- ---------------------------------------------------------------------------
@@ -672,7 +672,7 @@ verifyBundle bundle = do
 
 verifyManifest :: BundleManifest -> Either String ()
 verifyManifest manifest = do
-  when (manifestSchema manifest /= "arborix.bundle.manifest.v1") $
+  when (manifestSchema manifest /= "arboricx.bundle.manifest.v1") $
     Left $ "unsupported manifest schema: " ++ unpack (manifestSchema manifest)
   when (manifestBundleType manifest /= "tree-calculus-executable-object") $
     Left $ "unsupported bundle type: " ++ unpack (manifestBundleType manifest)
@@ -683,13 +683,13 @@ verifyManifest manifest = do
     Left $ "unsupported calculus: " ++ unpack (treeCalculus treeSpec)
   when (nodeHashAlgorithm hashSpec /= "sha256") $
     Left $ "unsupported node hash algorithm: " ++ unpack (nodeHashAlgorithm hashSpec)
-  when (nodeHashDomain hashSpec /= "arborix.merkle.node.v1") $
+  when (nodeHashDomain hashSpec /= "arboricx.merkle.node.v1") $
     Left $ "unsupported node hash domain: " ++ unpack (nodeHashDomain hashSpec)
-  when (treeNodePayload treeSpec /= "arborix.merkle.payload.v1") $
+  when (treeNodePayload treeSpec /= "arboricx.merkle.payload.v1") $
     Left $ "unsupported node payload: " ++ unpack (treeNodePayload treeSpec)
   when (runtimeSemantics runtimeSpec /= "tree-calculus.v1") $
     Left $ "unsupported runtime semantics: " ++ unpack (runtimeSemantics runtimeSpec)
-  when (runtimeAbi runtimeSpec /= "arborix.abi.tree.v1") $
+  when (runtimeAbi runtimeSpec /= "arboricx.abi.tree.v1") $
     Left $ "unsupported runtime ABI: " ++ unpack (runtimeAbi runtimeSpec)
   when (not (null (runtimeCapabilities runtimeSpec))) $
     Left "unsupported runtime capabilities"