aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-11-29 13:56:18 +0100
committerPatrik Nyblom <[email protected]>2010-11-29 13:56:18 +0100
commit23618d61985713b4c7b4a14001877f080bcc312b (patch)
tree38869f8c5b604f154d9403d6e80e6637e4690cdc
parent9d4fd926cb881dad5c15da4f63969ca72fe1dc98 (diff)
parent31f85c90ac02cfa8bd6c60fb8d940acbeeeea904 (diff)
downloadotp-23618d61985713b4c7b4a14001877f080bcc312b.tar.gz
otp-23618d61985713b4c7b4a14001877f080bcc312b.tar.bz2
otp-23618d61985713b4c7b4a14001877f080bcc312b.zip
Merge branch 'pan/auto-import-doc-fix/OTP-8848' into dev
* pan/auto-import-doc-fix/OTP-8848: Correct description of no_auto_import compiler directive
-rw-r--r--lib/compiler/doc/src/compile.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index e1f24b602d..c3d65b4cb5 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -310,9 +310,9 @@
(there will not even be a warning if there is a mismatch).</p>
</item>
- <tag><c>{no_auto_import,[F/A, ...]}</c></tag>
+ <tag><c>{no_auto_import,[{F,A}, ...]}</c></tag>
<item>
- <p>Makes the function <c>F/A</c> no longer beeing
+ <p>Makes the function <c>F/A</c> no longer being
auto-imported from the module <c>erlang</c>, which resolves
BIF name clashes. This option has to be used to resolve name
clashes with BIFs auto-imported before R14A, if one wants to
@@ -323,8 +323,12 @@
without module prefix to local or imported functions before
trying auto-imported BIFs. If the BIF is to be
called, use the <c>erlang</c> module prefix in the call, not
- <c>{ no_auto_import,[F/A, ...]}</c></p>
+ <c>{ no_auto_import,[{F,A}, ...]}</c></p>
</note>
+ <p>If this option is written in the source code, as a
+ <c>-compile</c> directive, the syntax <c>F/A</c> can be used instead
+ of <c>{F,A}</c>. Example:</p>
+ <code>-compile({no_auto_import,[error/1]}).</code>
</item>
</taglist>