diff options
| author | Raimo Niskanen <[email protected]> | 2017-03-03 11:35:59 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-03-03 11:35:59 +0100 |
| commit | 960b4e63c8fcfa8577ac877464e300959f20db12 (patch) | |
| tree | 27ef43a31fff3e83c3fe361d243a5f56cc904865 /lib/tools | |
| parent | 7b419c0a38bd4dbc749621535a81d0d34f76ec57 (diff) | |
| parent | 0f587ce17f4ad292f6f2d23d6244426046134f38 (diff) | |
| download | otp-960b4e63c8fcfa8577ac877464e300959f20db12.tar.gz otp-960b4e63c8fcfa8577ac877464e300959f20db12.tar.bz2 otp-960b4e63c8fcfa8577ac877464e300959f20db12.zip | |
Merge branch 'raimo/kernel/gen_statem-progress/OTP-14114' into maint
* raimo/kernel/gen_statem-progress/OTP-14114:
Make code_change/4 optional
Implement fallback for terminate/3
Clarify code_change and callback mode change
Stop pampering with stacktraces
Clean up timer handling
Remove event timer optimization
Clean up timer handling
Reduce number of loop variables hence code mass
Optimize by using async cancel_timer
Bugfix: callback mode not cached after code change
Implement repeat_state and repeat_state_and_data
Correct type checking function for action {next_event,,}
Change arity of type to init_result/1
Diffstat (limited to 'lib/tools')
| -rw-r--r-- | lib/tools/emacs/erlang-skels.el | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el index eeba7f34e9..bdb3d9ad4a 100644 --- a/lib/tools/emacs/erlang-skels.el +++ b/lib/tools/emacs/erlang-skels.el @@ -1,7 +1,7 @@ ;; ;; %CopyrightBegin% ;; -;; Copyright Ericsson AB 2010-2016. All Rights Reserved. +;; Copyright Ericsson AB 2010-2017. All Rights Reserved. ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); ;; you may not use this file except in compliance with the License. @@ -915,11 +915,7 @@ Please see the function `tempo-define-template'.") "%% process to initialize." n (erlang-skel-separator-end 2) "-spec init(Args :: term()) ->" n> - "{ok, State :: term(), Data :: term()} |" n> - "{ok, State :: term(), Data :: term()," n> - "[gen_statem:action()] | gen_statem:action()} |" n> - "ignore |" n> - "{stop, Reason :: term()}." n + "gen_statem:init_result(atom())." n "init([]) ->" n> "process_flag(trap_exit, true)," n> "{ok, state_name, #data{}}." n @@ -1028,11 +1024,7 @@ Please see the function `tempo-define-template'.") "%% process to initialize." n (erlang-skel-separator-end 2) "-spec init(Args :: term()) ->" n> - "{ok, State :: term(), Data :: term()} |" n> - "{ok, State :: term(), Data :: term()," n> - "[gen_statem:action()] | gen_statem:action()} |" n> - "ignore |" n> - "{stop, Reason :: term()}." n + "gen_statem:init_result(term())." n "init([]) ->" n> "process_flag(trap_exit, true)," n> "{ok, state_name, #data{}}." n |