Commit 292de133 authored by John C. Burnham's avatar John C. Burnham

Merge branch 'master' of gitlab.com:camlcase-dev/michelson-tutorial

parents 980c931f ffc5306e
......@@ -55,7 +55,7 @@ explicitly pushing data onto it, or by swapping around or duplicating elements.
We have control flow structures like `LOOP` or `IF`. We can perform some
cryptographic operations like hashing or checking signatures, and we can
interact with the blockchain by initiating token transfers or creating accounts.
Michelson has lot of different operations.
Michelson has lots of different operations.
### Types
......@@ -70,7 +70,7 @@ safely perform numerical addition on it, but that we can't safely perform list
indexing.
For the value `"foobar"` with type `string`, the situation is reversed. Adding a
number to a list `1 + "foobar"` is not well-defined, because addition is an
number to a string `1 + "foobar"` is not well-defined, because addition is an
operation on integers (in most languages, some languages overload the
`+` operator to mean numerical addition when its arguments are numbers and
concatenation when its arguments are strings)
......@@ -497,6 +497,3 @@ Outer single quotes only required for passing literals through the command line.
| `(option bool)` | `None` |
| `(or nat bool)` | `'(Left 100)'` |
| `(or nat bool)` | `'(Right False)'` |
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment