diff --git a/design/mvp/Explainer.md b/design/mvp/Explainer.md index cd7841d8..e8043c55 100644 --- a/design/mvp/Explainer.md +++ b/design/mvp/Explainer.md @@ -616,9 +616,9 @@ canon ::= (canon lift core-prefix() * bind-id()) - | (realloc core-prefix()) - | (post-return core-prefix()) + | (memory ) + | (realloc ) + | (post-return ) ``` While the production `externdesc` accepts any `sort`, the validation rules for `canon lift` would only allow the `func` sort. In the future, other sorts @@ -697,7 +697,7 @@ takes a string, does some logging, then returns a string. (core instance $libc (instantiate $Libc)) (core func $log (canon lower (func $logging "log") - (memory (core memory $libc "mem")) (realloc (core func $libc "realloc")) + (memory (core memory $libc "mem")) (realloc (func $libc "realloc")) )) (core module $Main (import "libc" "memory" (memory 1)) @@ -713,7 +713,7 @@ takes a string, does some logging, then returns a string. )) (func $run (param string) (result string) (canon lift (core func $main "run") - (memory (core memory $libc "mem")) (realloc (core func $libc "realloc")) + (memory $libc "mem") (realloc (func $libc "realloc")) )) (export "run" (func $run)) ) @@ -770,7 +770,7 @@ exported string at instantiation time: (core instance $main (instantiate $Main (with "libc" (instance $libc)))) (func $start (param string) (result string) (canon lift (core func $main "start") - (memory (core memory $libc "mem")) (realloc (core func $libc "realloc")) + (memory $libc "mem") (realloc (func $libc "realloc")) )) (start $start (value $name) (result (value $greeting))) (export "greeting" (value $greeting)) diff --git a/design/mvp/examples/SharedEverythingDynamicLinking.md b/design/mvp/examples/SharedEverythingDynamicLinking.md index 2ccfd4b5..247d65ff 100644 --- a/design/mvp/examples/SharedEverythingDynamicLinking.md +++ b/design/mvp/examples/SharedEverythingDynamicLinking.md @@ -159,7 +159,7 @@ would look like: )) (func $zip (param (list u8)) (result (list u8)) (canon lift (func $main "zip") - (memory (memory $libc "memory")) (realloc (func $libc "realloc")) + (memory $libc "memory") (realloc (func $libc "realloc")) )) (export "zip" (func $zip)) ) @@ -238,7 +238,7 @@ component-aware `clang`, the resulting component would look like: )) (func $transform (param (list u8)) (result (list u8)) (canon lift (func $main "transform") - (memory (memory $libc "memory")) (realloc (func $libc "realloc")) + (memory $libc "memory") (realloc (func $libc "realloc")) )) (export "transform" (func $transform)) ) @@ -285,11 +285,11 @@ components. The resulting component could look like: (instance $libc (instantiate (module $Libc))) (func $zip (canon lower (func $zipper "zip") - (memory (memory $libc "memory")) (realloc (func $libc "realloc")) + (memory $libc "memory") (realloc (func $libc "realloc")) )) (func $transform (canon lower (func $imgmgk "transform") - (memory (memory $libc "memory")) (realloc (func $libc "realloc")) + (memory $libc "memory") (realloc (func $libc "realloc")) )) (instance $main (instantiate (module $Main) (with "libc" (instance $libc)) @@ -298,7 +298,7 @@ components. The resulting component could look like: )) (func $run (param string) (result string) (canon lift (func $main "run") - (memory (memory $libc "memory")) (realloc (func $libc "realloc")) + (memory $libc "memory") (realloc (func $libc "realloc")) )) (export "run" (func $run)) )