diff options
author | Micael Karlberg <[email protected]> | 2011-11-07 16:13:30 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-11-07 16:13:30 +0100 |
commit | 8149b970814848dc404767d5635529c61cf20b24 (patch) | |
tree | b829c0cf811b6f230653b75433d01657017c62c7 /system/doc/reference_manual | |
parent | 55ae4936f1afabc4475139d7d46d655b61e06b3b (diff) | |
parent | 2c18949bf1edfda523ae15229e94a8400bb1870c (diff) | |
download | otp-8149b970814848dc404767d5635529c61cf20b24.tar.gz otp-8149b970814848dc404767d5635529c61cf20b24.tar.bz2 otp-8149b970814848dc404767d5635529c61cf20b24.zip |
Merge branch 'master' of super:otp into bmk/megaco/r15_integration
Diffstat (limited to 'system/doc/reference_manual')
-rw-r--r-- | system/doc/reference_manual/code_loading.xml | 4 | ||||
-rw-r--r-- | system/doc/reference_manual/expressions.xml | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/system/doc/reference_manual/code_loading.xml b/system/doc/reference_manual/code_loading.xml index f56e1ff408..3ea72a4057 100644 --- a/system/doc/reference_manual/code_loading.xml +++ b/system/doc/reference_manual/code_loading.xml @@ -112,8 +112,8 @@ loop() -> <c>code_switch</c> to it. The process then will make a fully qualified call to <c>m:loop()</c> and change to current code. Note that <c>m:loop/0</c> must be exported.</p> - <p>For code replacement of funs to work, the tuple syntax - <c>{Module,FunctionName}</c> must be used to represent the fun.</p> + <p>For code replacement of funs to work, the syntax + <c>fun Module:FunctionName/Arity</c> should be used.</p> </section> <section> diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml index c24b1110a4..43d46d87cc 100644 --- a/system/doc/reference_manual/expressions.xml +++ b/system/doc/reference_manual/expressions.xml @@ -993,15 +993,19 @@ fun Module:Name/Arity</pre> <pre> fun (Arg1,...,ArgN) -> Name(Arg1,...,ArgN) end</pre> <p>In <c>Module:Name/Arity</c>, <c>Module</c> and <c>Name</c> are atoms - and <c>Arity</c> is an integer. + and <c>Arity</c> is an integer. Starting from the R15 release, + <c>Module</c>, <c>Name</c>, and <c>Arity</c> may also be variables. A fun defined in this way will refer to the function <c>Name</c> - with arity <c>Arity</c> in the <em>latest</em> version of module <c>Module</c>. + with arity <c>Arity</c> in the <em>latest</em> version of module + <c>Module</c>. A fun defined in this way will not be dependent on + the code for module in which it is defined. </p> <p>When applied to a number N of arguments, a tuple <c>{Module,FunctionName}</c> is interpreted as a fun, referring to the function <c>FunctionName</c> with arity N in the module <c>Module</c>. The function must be exported. - <em>This usage is deprecated.</em> + <em>This usage is deprecated.</em> Use <c>fun Module:Name/Arity</c> + instead. See <seealso marker="#calls">Function Calls</seealso> for an example.</p> <p>More examples can be found in <em>Programming Examples</em>.</p> </section> |