diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/README | 4 | ||||
| -rw-r--r-- | system/doc/design_principles/fsm.xml | 2 | ||||
| -rw-r--r-- | system/doc/reference_manual/expressions.xml | 23 | ||||
| -rw-r--r-- | system/doc/system_principles/system_principles.xml | 8 |
4 files changed, 25 insertions, 12 deletions
diff --git a/system/README b/system/README index 61277306f1..97ec9177c4 100644 --- a/system/README +++ b/system/README @@ -1,7 +1,7 @@ -Erlang/OTP Januari 25, 2013 +Erlang/OTP December 6, 2013 -Release of Erlang 5.10/OTP R16 +Release of Erlang 5.10.4/OTP R16B03 1. GENERAL diff --git a/system/doc/design_principles/fsm.xml b/system/doc/design_principles/fsm.xml index 7de96d44ec..9dce159dca 100644 --- a/system/doc/design_principles/fsm.xml +++ b/system/doc/design_principles/fsm.xml @@ -75,7 +75,7 @@ StateName(Event, StateData) -> -export([init/1, locked/2, open/2]). start_link(Code) -> - gen_fsm:start_link({local, code_lock}, code_lock, lists:reverse(Code, []). + gen_fsm:start_link({local, code_lock}, code_lock, lists:reverse(Code), []). button(Digit) -> gen_fsm:send_event(code_lock, {button, Digit}). diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml index 0dc6bfe576..e9de3e006e 100644 --- a/system/doc/reference_manual/expressions.xml +++ b/system/doc/reference_manual/expressions.xml @@ -954,19 +954,20 @@ Ei = Value | <title>Fun Expressions</title> <pre> fun - (Pattern11,...,Pattern1N) [when GuardSeq1] -> - Body1; + [Name](Pattern11,...,Pattern1N) [when GuardSeq1] -> + Body1; ...; - (PatternK1,...,PatternKN) [when GuardSeqK] -> - BodyK + [Name](PatternK1,...,PatternKN) [when GuardSeqK] -> + BodyK end</pre> <p>A fun expression begins with the keyword <c>fun</c> and ends with the keyword <c>end</c>. Between them should be a function declaration, similar to a - <seealso marker="functions#syntax">regular function declaration</seealso>, except that no function name is - specified.</p> - <p>Variables in a fun head shadow variables in the - function clause surrounding the fun expression, and + <seealso marker="functions#syntax">regular function declaration</seealso>, + except that the function name is optional and should be a variable if + any.</p> + <p>Variables in a fun head shadow the function name and both shadow + variables in the function clause surrounding the fun expression, and variables bound in a fun body are local to the fun body.</p> <p>The return value of the expression is the resulting fun.</p> <p>Examples:</p> @@ -978,7 +979,11 @@ end</pre> 3> <input>Fun2 = fun (X) when X>=5 -> gt; (X) -> lt end.</input> #Fun<erl_eval.6.39074546> 4> <input>Fun2(7).</input> -gt</pre> +gt +5> <input>Fun3 = fun Fact(1) -> 1; Fact(X) when X > 1 -> X * Fact(X - 1) end.</input> +#Fun<erl_eval.6.39074546> +6> <input>Fun3(4).</input> +24</pre> <p>The following fun expressions are also allowed:</p> <pre> fun Name/Arity diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml index dc826916f8..4f2202fdd1 100644 --- a/system/doc/system_principles/system_principles.xml +++ b/system/doc/system_principles/system_principles.xml @@ -105,6 +105,14 @@ init:stop()</pre> <p>Loads the code for and starts the applications Kernel, STDLIB and SASL.</p> </item> + <tag><c>no_dot_erlang.boot</c></tag> + <item> + <p>Loads the code for and starts the applications Kernel and + STDLIB, skips loading the <c>.erlang</c> file. + Useful for scripts and other tools that should be behave the + same irregardless of user preferences. + </p> + </item> </taglist> <p>Which of <c>start_clean</c> and <c>start_sasl</c> to use as default is decided by the user when installing Erlang/OTP using |