balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed Loop.continue to Loop.resume.

Browse Source
This commit is contained in:
Christian Rinderknecht 2020-02-26 13:36:50 +01:00
parent 31a39bffbc
commit 623e16459f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gitlab-pages/docs/language-basics/loops.md
View File

@ -79,12 +79,12 @@ let gcd (x,y : nat * nat) : nat =
``` ```
To ease the writing and reading of the iterated functions (here, To ease the writing and reading of the iterated functions (here,
`iter`), two predefined functions are provided: `Loop.continue` and `iter`), two predefined functions are provided: `Loop.resume` and
`Loop.stop`: `Loop.stop`:
```cameligo group=a ```cameligo group=a
let iter (x,y : nat * nat) : bool * (nat * nat) = let iter (x,y : nat * nat) : bool * (nat * nat) =
if y = 0n then Loop.stop (x,y) else Loop.continue (y, x mod y) if y = 0n then Loop.stop (x,y) else Loop.resume (y, x mod y)
let gcd (x,y : nat * nat) : nat = let gcd (x,y : nat * nat) : nat =
let x,y = if x < y then y,x else x,y in let x,y = if x < y then y,x else x,y in
@ -92,7 +92,8 @@ let gcd (x,y : nat * nat) : nat =
in x in x
``` ```
> Note that `stop` and `continue` are *deprecated*. > Note that `stop` and `continue` (now `Loop.resume`) are
> *deprecated*.
You can call the function `gcd` defined above using the LIGO compiler You can call the function `gcd` defined above using the LIGO compiler
like so: like so:
@ -135,12 +136,12 @@ let gcd = ((x,y) : (nat, nat)) : nat => {
``` ```
To ease the writing and reading of the iterated functions (here, To ease the writing and reading of the iterated functions (here,
`iter`), two predefined functions are provided: `Loop.continue` and `iter`), two predefined functions are provided: `Loop.resume` and
`Loop.stop`: `Loop.stop`:
```reasonligo group=b ```reasonligo group=b
let iter = ((x,y) : (nat, nat)) : (bool, (nat, nat)) => let iter = ((x,y) : (nat, nat)) : (bool, (nat, nat)) =>
if (y == 0n) { Loop.stop ((x,y)); } else { Loop.continue ((y, x mod y)); }; if (y == 0n) { Loop.stop ((x,y)); } else { Loop.resume ((y, x mod y)); };
let gcd = ((x,y) : (nat, nat)) : nat => { let gcd = ((x,y) : (nat, nat)) : nat => {
let (x,y) = if (x < y) { (y,x); } else { (x,y); }; let (x,y) = if (x < y) { (y,x); } else { (x,y); };
@ -149,7 +150,8 @@ let gcd = ((x,y) : (nat, nat)) : nat => {
}; };
``` ```
> Note that `stop` and `continue` are *deprecated*. > Note that `stop` and `continue` (now `Loop.resume`) are
> *deprecated*.
<!--END_DOCUSAURUS_CODE_TABS--> <!--END_DOCUSAURUS_CODE_TABS-->

4
src/passes/operators/operators.ml
View File

@ -395,7 +395,7 @@ module Simplify = struct
(* Loop module *) (* Loop module *)
| "Loop.fold_while" -> ok C_FOLD_WHILE | "Loop.fold_while" -> ok C_FOLD_WHILE
| "Loop.continue" -> ok C_CONTINUE | "Loop.resume" -> ok C_CONTINUE
| "continue" -> ok C_CONTINUE (* Deprecated *) | "continue" -> ok C_CONTINUE (* Deprecated *)
| "Loop.stop" -> ok C_STOP | "Loop.stop" -> ok C_STOP
| "stop" -> ok C_STOP (* Deprecated *) | "stop" -> ok C_STOP (* Deprecated *)
@ -404,7 +404,7 @@ module Simplify = struct
| "assert" -> ok C_ASSERTION | "assert" -> ok C_ASSERTION
| _ -> simple_fail "Not a CameLIGO built-in." | _ -> simple_fail "Not a CameLIGO built-in."
let type_constants = type_constants let type_constants = type_constants
let type_operators = type_operators let type_operators = type_operators