Add constrained_t to fold

Co-authored-by: Radosław Rowicki <35342116+radrow@users.noreply.github.com>

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   aebuilder:
     docker:
-      - image: aeternity/builder:bionic-otp24
+      - image: aeternity/builder:xenial-otp21
         user: builder
     working_directory: ~/aesophia
 

.github/workflows/docs-develop.yml

@@ -13,6 +13,10 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.8
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip3
+          key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/requirements.txt') }}
       - run: pip3 install -r .github/workflows/requirements.txt -U
       - run: git config --global user.email "github-action@users.noreply.github.com"
       - run: git config --global user.name "GitHub Action"

.github/workflows/docs-release.yml

@@ -13,6 +13,10 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.8
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip3
+          key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/requirements.txt') }}
       - run: pip3 install -r .github/workflows/requirements.txt -U
       - run: git config --global user.email "github-action@users.noreply.github.com"
       - run: git config --global user.name "GitHub Action"

.github/workflows/requirements.txt

@@ -1,5 +1,5 @@
-mkdocs==1.4.2
+mkdocs==1.2.4
-mkdocs-simple-hooks==0.1.5
+mkdocs-simple-hooks==0.1.3
-mkdocs-material==9.0.9
+mkdocs-material==7.1.9
-mike==1.1.2
+mike==1.0.1
-pygments==2.14.0
+pygments==2.11.2

CHANGELOG.md

@@ -6,65 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-### Changed
+- Compiler warnings for the follwing: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value.
-### Removed
-### Fixed
-
-## [7.3.0]
-### Fixed
-- Fixed a bug with polymorphism that allowed functions with the same name but different type to be considered as implementations for their corresponding interface function.
-- Fixed a bug in the byte code optimization that incorrectly reordered dependent instructions.
-
-## [7.2.1]
-### Fixed
-- Fixed bugs with the newly added debugging symbols
-
-## [7.2.0]
-### Added
-- Toplevel compile-time constants
-  ```
-  namespace N =
-    let nc = 1
-  contract C =
-    let cc = 2
-  ```
-- API functions for encoding/decoding Sophia values to/from FATE.
-### Removed
-- Remove the mapping from variables to FATE registers from the compilation output.
-### Fixed
-- Warning about unused include when there is no include.
-
-## [7.1.0]
-### Added
-- Options to enable/disable certain optimizations.
-- The ability to call a different instance of the current contract
-  ```
-  contract Main =
-    entrypoint spend(x : int) : int = x
-    entrypoint f(c : Main) : int = c.spend(10)
-  ```
-- Return a mapping from variables to FATE registers in the compilation output.
-- Hole expression.
-### Changed
-- Type definitions serialised to ACI as `typedefs` field instead of `type_defs` to increase compatibility.
-- Check contracts and entrypoints modifiers when implementing interfaces.
-- Contracts can no longer be used as namespaces.
-- Do not show unused stateful warning for functions that call other contracts with a non-zero value argument.
-### Fixed
-- Typechecker crashes if Chain.create or Chain.clone are used without arguments.
-
-## [7.0.1]
-### Added
-- Add CONTRIBUTING.md file.
-### Changed
-- Update Sophia syntax docs to include missing information about existing syntax.
-### Fixed
-- [404](https://github.com/aeternity/aesophia/issues/404) Contract polymorphism crashes on non-obvious child contract typing.
-
-## [7.0.0]
-### Added
-- Added support for `EXIT` opcode via `exit : (string) => 'a` function (behaves same as `ABORT`, but consumes all gas).
-- Compiler warnings for the following: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value.
 - The pipe operator |>
   ```
   [1, 2, 3] |> List.first |> Option.is_some  // Option.is_some(List.first([1, 2, 3]))
@@ -74,7 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   function sum(l : list(int)) : int = foldl((+), 0, l)
   function logical_and(x, y) = (&&)(x, y)
   ```
-- Contract interfaces polymorphism
+- Add comparable typevar constraints (`ord` and `eq`)
+  ```
+  lt : 'a is ord ; ('a, 'a) => bool
+  lt(x, y) = x < y
+
+  is_eq : 'a is eq ; ('a, 'a) => bool
+  is_eq(x, y) = x == y
+  ```
 ### Changed
 - Error messages have been restructured (less newlines) to provide more unified errors. Also `pp_oneline/1` has been added.
 - Ban empty record definitions (e.g. `record r = {}` would give an error).
@@ -404,13 +353,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simplify calldata creation - instead of passing a compiled contract, simply
   pass a (stubbed) contract string.
 
-[Unreleased]: https://github.com/aeternity/aesophia/compare/v7.3.0...HEAD
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v6.1.0...HEAD
-[7.2.1]: https://github.com/aeternity/aesophia/compare/v7.2.1...v7.3.0
-[7.2.1]: https://github.com/aeternity/aesophia/compare/v7.2.0...v7.2.1
-[7.2.0]: https://github.com/aeternity/aesophia/compare/v7.1.0...v7.2.0
-[7.1.0]: https://github.com/aeternity/aesophia/compare/v7.0.1...v7.1.0
-[7.0.1]: https://github.com/aeternity/aesophia/compare/v7.0.0...v7.0.1
-[7.0.0]: https://github.com/aeternity/aesophia/compare/v6.1.0...v7.0.0
 [6.1.0]: https://github.com/aeternity/aesophia/compare/v6.0.2...v6.1.0
 [6.0.2]: https://github.com/aeternity/aesophia/compare/v6.0.1...v6.0.2
 [6.0.1]: https://github.com/aeternity/aesophia/compare/v6.0.0...v6.0.1

CONTRIBUTING.md

@@ -1,40 +0,0 @@
-# Contributing to Sophia
-
-## Checklist For Creating New Pull Requests
-
-The following points should be considered before creating a new PR to the Sophia compiler.
-
-### Documentation
-
-- The [Changelog](CHANGELOG.md) file should be updated for all PRs.
-- If a PR introduces a new feature that is relevant to the users of the language, the [Sophia Features Documentation](docs/sophia_features.md) should be updated to describe the new feature.
-- If a PR introduces new syntax (e.g. changes in [aeso_syntax.erl](src/aeso_syntax.erl), [aeso_scan.erl](src/aeso_scan.erl), or [aeso_parser.erl](src/aeso_parser.erl)), the [Sophia Syntax Documentation](docs/sophia_syntax.md) should be updated to include the new syntax.
-- If a PR introduces a new library, the public interface of the new library should be fully documented in the [Sophia Standard Library Documentation](docs/sophia_stdlib.md).
-- If a PR introduces a new compiler option, the new option should be documented in the file
-[aeso_compiler.md](docs/aeso_compiler.md).
-
-### Tests
-
-- If a PR introduces new syntax (e.g. changes in [aeso_syntax.erl](src/aeso_syntax.erl), [aeso_scan.erl](src/aeso_scan.erl), or [aeso_parser.erl](src/aeso_parser.erl)), the contract [all_syntax.aes](test/contracts/all_syntax.aes) should be updated to include the new syntax.
-- If a PR fixes a bug, the code that replicates the bug should be added as a new passing test contract.
-- If a PR introduces a new feature, add tests for both successful and failing usage of that feature. In order to run the entire compilation pipeline and to avoid erroring during intermediate steps, failing tests should not be mixed with the successful ones.
-
-### Source Code
-
-- If a PR introduces new syntax (e.g. changes in [aeso_syntax.erl](src/aeso_syntax.erl), [aeso_scan.erl](src/aeso_scan.erl), or [aeso_parser.erl](src/aeso_parser.erl)), the following code should be updated to handle the new syntax:
-    - The function `aeso_syntax_utils:fold/4` in the file [aeso_syntax_utils.erl](src/aeso_syntax_utils.erl).
-    - Any related pretty printing function in the file [aeso_pretty.erl](src/aeso_pretty.erl), depending on the type of the newly added syntax.
-
-## Checklist For Creating a Release
-
-- Update the version in the file [aesophia.app.src](src/aesophia.app.src).
-- Update the version in the file [rebar.config](rebar.config).
-- In the [Changelog](CHANGELOG.md):
-    - Update the `Unreleased` changes to be under the new version.
-    - Update the version at the bottom of the file.
-- Commit and the changes and create a new PR (check the commit of [v6.1.0](https://github.com/aeternity/aesophia/commit/5ad5270e381f6e810d7b8b5cdc168d283e7a90bb) for reference).
-- Create a release after merging the new PR to `master` branch.
-- After releasing `aesophia`, refer to each of the following repositories and create new releases as well, using the new `aesophia` release:
-    - [aesophia_cli](https://github.com/aeternity/aesophia_cli)
-    - [aesophia_http](https://github.com/aeternity/aesophia_http)
-    - [aerepl](https://github.com/aeternity/aerepl)

README.md

@@ -14,7 +14,6 @@ The compiler is currently being used three places
 * [Features](docs/sophia_features.md)
 * [Standard library](docs/sophia_stdlib.md)
 * [Contract examples](docs/sophia_examples.md)
-* [Contributing](CONTRIBUTING.md)
 
 Additionally you can check out the [contracts section](https://github.com/aeternity/protocol/blob/master/contracts/contracts.md) of the æternity blockchain specification.
 

docs/aeso_aci.md

@@ -67,7 +67,7 @@ generates the following JSON structure representing the contract interface:
         }
       ]
     },
-    "typedefs": [
+    "type_defs": [
       {
         "name": "answers",
         "typedef": {
@@ -138,7 +138,7 @@ be included inside another contract.
              state =>
                  #{record =>
                        [#{name => <<"a">>,type => <<"Answers.answers">>}]},
-             typedefs =>
+             type_defs =>
                  [#{name => <<"answers">>,
                     typedef => #{<<"map">> => [<<"string">>,<<"int">>]},
                     vars => []}]}}]}

docs/aeso_compiler.md

@@ -51,34 +51,6 @@ The **pp_** options all print to standard output the following:
 
 `pp_assembler` - print the generated assembler code
 
-The option `include_child_contract_symbols` includes the symbols of child contracts functions in the generated fate code. It is turned off by default to avoid making contracts bigger on chain.
-
-#### Options to control which compiler optimizations should run:
-
-By default all optimizations are turned on, to disable an optimization, it should be
-explicitly set to false and passed as a compiler option.
-
-List of optimizations:
-
-- optimize_inliner
-- optimize_inline_local_functions
-- optimize_bind_subexpressions
-- optimize_let_floating
-- optimize_simplifier
-- optimize_drop_unused_lets
-- optimize_push_consume
-- optimize_one_shot_var
-- optimize_write_to_dead_var
-- optimize_inline_switch_target
-- optimize_swap_push
-- optimize_swap_pop
-- optimize_swap_write
-- optimize_constant_propagation
-- optimize_prune_impossible_branches
-- optimize_single_successful_branch
-- optimize_inline_store
-- optimize_float_switch_bod
-
 #### check_call(ContractString, Options) -> CheckRet
 
 Types

docs/sophia_features.md

@@ -134,166 +134,6 @@ main contract IntHolderFactory =
 In case of a presence of child contracts (`IntHolder` in this case), the main
 contract must be pointed out with the `main` keyword as shown in the example.
 
-### Contract interfaces and polymorphism
-
-Contracts can implement one or multiple interfaces, the contract has to define
-every entrypoint from the implemented interface and the entrypoints in both
-the contract and implemented interface should have compatible types.
-
-```
-contract interface Animal =
-  entrypoint sound : () => string
-
- contract Cat : Animal =
-  entrypoint sound() = "Cat sound"
-```
-
-Contract interfaces can extend other interfaces. An extended interface has to
-declare all entrypoints from every parent interface. All the declarations in the extended
-interface must have types compatible with the declarations from the parent
-interface.
-
-```
-contract interface II =
-  entrypoint f : () => unit
-
-contract interface I : II =
-  entrypoint f : () => unit
-  entrypoint g : () => unit
-
-contract C : I =
-  entrypoint f() = ()
-  entrypoint g() = ()
-```
-
-It is only possible to implement (or extend) an interface that has been already
-defined earlier in the file (or in an included file). Therefore recursive
-interface implementation is not allowed in Sophia.
-
-```
-// The following code would show an error
-
-contract interface X : Z =
-     entrypoint x : () => int
-
- contract interface Y : X =
-     entrypoint x : () => int
-     entrypoint y : () => int
-
- contract interface Z : Y =
-     entrypoint x : () => int
-     entrypoint y : () => int
-     entrypoint z : () => int
-
- contract C : Z =
-     entrypoint x() = 1
-     entrypoint y() = 1
-     entrypoint z() = 1
-```
-
-#### Adding or removing modifiers
-
-When a `contract` or a `contract interface` implements another `contract interface`, the `payable` and `stateful` modifiers can be kept or changed, both in the contract and in the entrypoints, according to the following rules:
-
-1. A `payable` contract or interface can implement a `payable` interface or a non-`payable` interface.
-2. A non-`payable` contract or interface can only implement a non-`payable` interface, and cannot implement a `payable` interface.
-3. A `payable` entrypoint can implement a `payable` entrypoint or a non-`payable` entrypoint.
-4. A non-`payable` entrypoint can only implement a non-`payable` entrypoint, and cannot implement a `payable` entrypoint.
-5. A non-`stateful` entrypoint can implement a `stateful` entrypoint or a non-`stateful` entrypoint.
-6. A `stateful` entrypoint can only implement a `stateful` entrypoint, and cannot implement a non-`stateful` entrypoint.
-
-#### Subtyping and variance
-
-Subtyping in Sophia follows common rules that take type variance into account. As described by [Wikipedia](https://en.wikipedia.org/wiki/Covariance_and_contravariance_(computer_science)), 
-
->Variance refers to how subtyping between more complex types relates to subtyping between their components.
-
-This concept plays an important role in complex types such as tuples, `datatype`s and functions. Depending on the context, it can apply to positions in the structure of a type, or type parameters of generic types. There are four kinds of variances:
-
-- covariant
-- contravariant
-- invariant
-- bivariant
-
-A type is said to be on a "covariant" position when it describes output or a result of some computation. Analogously, position is "contravariant" when it is an input, or a parameter. Intuitively, when a part of the type is produced by values of it, it is covariant. When it is consumed, it is contravariant. When a type appears to be simultaneously input and output, it is described as invariant. If a type is neither of those (that is, it's unused) it's bivariant. Furthermore, whenever a complex type appears on a contravariant position, all its covariant components become contravariant and vice versa.
-
-Variance influences how subtyping is applied. Types on covariant positions are subtyped normally, while contravariant the opposite way. Invariant types have to be exactly the same in order for subtyping to work. Bivariant types are always compatible.
-
-A good example of where it matters can be pictured by subtyping of function types. Let us assume there is a contract interface `Animal` and two contracts that implement it: `Dog` and `Cat`.
-
-```sophia
-contract interface Animal =
-  entrypoint age : () => int
-  
-contract Dog : Animal =
-  entrypoint age() = // ...
-  entrypoint woof() = "woof"
-  
-contract Cat : Animal =
-  entrypoint age() = // ...
-  entrypoint meow() = "meow"
-```
-
-The assumption of this exercise is that cats do not bark (because `Cat` does not define the `woof` entrypoint). If subtyping rules were applied naively, that is if we let `Dog => Dog` be a subtype of `Animal => Animal`, the following code would break:
-
-```sophia
-let f : (Dog) => string  = d => d.woof()
-let g : (Animal) => string  = f
-let c : Cat = Chain.create()
-g(c)  // Cat barking!
-```
-
-That is because arguments of functions are contravariant, as opposed to return the type which is covariant. Because of that, the assignment of `f` to `g` is invalid - while `Dog` is a subtype of `Animal`, `Dog => string` is **not** a subtype of `Animal => string`. However, `Animal => string` **is** a subtype of `Dog => string`. More than that, `(Dog => Animal) => Dog` is a subtype of `(Animal => Dog) => Animal`.
-
-This has consequences on how user-defined generic types work. A type variable gains its variance from its role in the type definition as shown in the example:
-
-```sophia
-datatype co('a) = Co('a) // co is covariant on 'a
-datatype ct('a) = Ct('a => unit) // ct is contravariant on 'a
-datatype in('a) = In('a => 'a) // in is invariant on 'a
-datatype bi('a) = Bi // bi is bivariant on 'a
-```
-
-The following facts apply here:
-
-- `co('a)` is a subtype of `co('b)` when `'a` is a subtype of `'b`
-- `ct('a)` is a subtype of `ct('b)` when `'b` is a subtype of `'a`
-- `in('a)` is a subtype of `in('b)` when `'a` is equal to `'b`
-- `bi('a)` is a subtype of `bi('b)` always
-
-That altogether induce the following rules of subtyping in Sophia:
-
-- A function type `(Args1) => Ret1` is a subtype of `(Args2) => Ret2` when `Ret1`
-is a subtype of `Ret2` and each argument type from `Args2` is a subtype of its
-counterpart in `Args1`.
-
-- A list type `list(A)` is a subtype of `list(B)` if `A` is a subtype of `B`.
-
-- An option type `option(A)` is a subtype of `option(B)` if `A` is a subtype of `B`.
-
-- A map type `map(A1, A2)` is a subtype of `map(B1, B2)` if `A1` is a subtype
-of `B1`, and `A2` is a subtype of `B2`.
-
-- An oracle type `oracle(A1, A2)` is a subtype of `oracle(B1, B2)` if `B1` is
-a subtype of `A1`, and `A2` is a subtype of `B2`.
-
-- An oracle_query type `oracle_query(A1, A2)` is a subtype of `oracle_query(B1, B2)`
-if `A1` is a subtype of `B1`, and `A2` is a subtype of `B2`.
-
-- A user-defined datatype `t(Args1)` is a subtype of `t(Args2)`
-
-- When a user-defined type `t('a)` is covariant in `'a`, then `t(A)` is a
-subtype of `t(B)` when `A` is a subtype of `B`.
-
-- When a user-defined type `t('a)` is contravariant in `'a`, then `t(A)` is a
-subtype of `t(B)` when `B` is a subtype of `A`.
-
-- When a user-defined type `t('a)` is binvariant in `'a`, then `t(A)` is a
-subtype of `t(B)` when either `A` is a subtype of `B` or when `B` is a subtype
-of `A`.
-
-- When a user-defined type `t('a)` is invariant in `'a`, then `t(A)` can never be
-a subtype of `t(B)`.
 
 ## Mutable state
 
@@ -514,28 +354,29 @@ namespace C =
 ## Types
 Sophia has the following types:
 
-| Type                 | Description                                                                                 | Example                                                      |
+| Type                 | Description                                                                                 | Example                                                                       |
-|----------------------|---------------------------------------------------------------------------------------------|--------------------------------------------------------------|
+|----------------------|---------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|
-| int                  | A 2-complement integer                                                                      | ```-1```                                                     |
+| int                  | A 2-complement integer                                                                      | ```-1```                                                                      |
-| address              | æternity address, 32 bytes                                                                 | ```Call.origin```                                            |
+| char                 | A single character                                                                          | ```'c'```                                                                     |
-| bool                 | A Boolean                                                                                   | ```true```                                                   |
+| address              | æternity address, 32 bytes                                                                  | ```Call.origin``` ```ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt``` |
-| bits                 | A bit field                                                                                 | ```Bits.none```                                              |
+| bool                 | A Boolean                                                                                   | ```true```                                                                    |
-| bytes(n)             | A byte array with `n` bytes                                                                 | ```#fedcba9876543210```                                      |
+| bits                 | A bit field                                                                                 | ```Bits.none```                                                               |
-| string               | An array of bytes                                                                           | ```"Foo"```                                                  |
+| bytes(n)             | A byte array with `n` bytes                                                                 | ```#fedcba9876543210```                                                       |
-| list                 | A homogeneous immutable singly linked list.                                                 | ```[1, 2, 3]```                                              |
+| string               | An array of bytes                                                                           | ```"Foo"```                                                                   |
-| ('a, 'b) => 'c       | A function. Parentheses can be skipped if there is only one argument                        | ```(x : int, y : int) => x + y```                            |
+| list                 | A homogeneous immutable singly linked list.                                                 | ```[1, 2, 3]```                                                               |
-| tuple                | An ordered heterogeneous array                                                              | ```(42, "Foo", true)```                                      |
+| ('a, 'b) => 'c       | A function. Parentheses can be skipped if there is only one argument                        | ```(x : int, y : int) => x + y```                                             |
-| record               | An immutable key value store with fixed key names and typed values                          | ``` record balance = { owner: address, value: int } ```      |
+| tuple                | An ordered heterogeneous array                                                              | ```(42, "Foo", true)```                                                       |
-| map                  | An immutable key value store with dynamic mapping of keys of one type to values of one type | ```type accounts = map(string, address)```                   |
+| record               | An immutable key value store with fixed key names and typed values                          | ``` record balance = { owner: address, value: int } ```                       |
-| option('a)           | An optional value either None or Some('a)                                                   | ```Some(42)```                                               |
+| map                  | An immutable key value store with dynamic mapping of keys of one type to values of one type | ```type accounts = map(string, address)```                                    |
-| state                | A user defined type holding the contract state                                              | ```record state = { owner: address, magic_key: bytes(4) }``` |
+| option('a)           | An optional value either None or Some('a)                                                   | ```Some(42)```                                                                |
-| event                | An append only list of blockchain events (or log entries)                                   | ```datatype event = EventX(indexed int, string)```           |
+| state                | A user defined type holding the contract state                                              | ```record state = { owner: address, magic_key: bytes(4) }```                  |
-| hash                 | A 32-byte hash - equivalent to `bytes(32)`                                                  |                                                              |
+| event                | An append only list of blockchain events (or log entries)                                   | ```datatype event = EventX(indexed int, string)```                            |
-| signature            | A signature - equivalent to `bytes(64)`                                                     |                                                              |
+| hash                 | A 32-byte hash - equivalent to `bytes(32)`                                                  |                                                                               |
-| Chain.ttl            | Time-to-live (fixed height or relative to current block)                                    | ```FixedTTL(1050)``` ```RelativeTTL(50)```                   |
+| signature            | A signature - equivalent to `bytes(64)`                                                     |                                                                               |
-| oracle('a, 'b)       | And oracle answering questions of type 'a with answers of type 'b                           | ```Oracle.register(acct, qfee, ttl)```                       |
+| Chain.ttl            | Time-to-live (fixed height or relative to current block)                                    | ```FixedTTL(1050)``` ```RelativeTTL(50)```                                    |
-| oracle_query('a, 'b) | A specific oracle query                                                                     | ```Oracle.query(o, q, qfee, qttl, rttl)```                   |
+| oracle('a, 'b)       | And oracle answering questions of type 'a with answers of type 'b                           | ```Oracle.register(acct, qfee, ttl)```                                        |
-| contract             | A user defined, typed, contract address                                                     | ```function call_remote(r : RemoteContract) = r.fun()```     |
+| oracle_query('a, 'b) | A specific oracle query                                                                     | ```Oracle.query(o, q, qfee, qttl, rttl)```                                    |
+| contract             | A user defined, typed, contract address                                                     | ```function call_remote(r : RemoteContract) = r.fun()```                      |
 
 ## Literals
 | Type                 | Constant/Literal example(s)                                                                                                         |
@@ -560,45 +401,6 @@ Sophia has the following types:
 | oracle_query('a, 'b) | `oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY`                                                                             |
 | contract             | `ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ`                                                                              |
 
-## Hole expression
-
-Hole expressions, written as `???`, are expressions that are used as a placeholder. During compilation, the compiler will generate a type error indication the type of the hole expression.
-
-```
-include "List.aes"
-contract C =
-    entrypoint f() =
-        List.sum(List.map(???, [1,2,3]))
-```
-
-A hole expression found in the example above will generate the error `` Found a hole of type `(int) => int` ``. This says that the compiler expects a function from `int` to `int` in place of the `???` placeholder.
-
-## Constants
-
-Constants in Sophia are contract-level bindings that can be used in either contracts or namespaces. The value of a constant can be a literal, another constant, or arithmetic operations applied to other constants. Lists, tuples, maps, and records can also be used to define a constant as long as their elements are also constants.
-
-The following visibility rules apply to constants:
-*  Constants defined inside a contract are private in that contract. Thus, cannot be accessed through instances of their defining contract.
-* Constants defined inside a namespace are public. Thus, can be used in other contracts or namespaces.
-* Constants cannot be defined inside a contract interface.
-
-When a constant is shadowed, it can be accessed using its qualified name:
-
-```
-contract C =
-  let c = 1
-  entrypoint f() =
-    let c = 2
-    c + C.c  // the result is 3
-```
-
-The name of the constant must be an id; therefore, no pattern matching is allowed when defining a constant:
-
-```
-contract C
-  let x::y::_ = [1,2,3]  // this will result in an error
-```
-
 ## Arithmetic
 
 Sophia integers (`int`) are represented by arbitrary-sized signed words and support the following
@@ -700,6 +502,59 @@ function
 
 Guards cannot be stateful even when used inside a stateful function.
 
+## Comparable types
+
+Only certain types are allowed to be compared by equality (`==`, `!=`) and
+inequality (`<`, `>`, `=<`, `>=`). For instance, while it is legal to compare
+integers, comparing functions would lead to an error:
+
+```
+function f() = 
+  f == f  // type error
+```
+
+The rules apply as follows:
+
+- All types that are comparable by inequality are also comparable by equality.
+- The builtin types `bool`, `int`, `char`, `bits`, `bytes`, `string`, `unit`,
+  `hash`, `address` and `signature` are comparable by inequality (and thus by
+  equality).
+- The composite types `list`, `option`, and tuples are comparable by
+  equality/inequality if their type parameters are comparable by
+  equality/inequality.
+- The composite types `map`, `oracle`, and `oracle_query` are comparable by
+  equality if their type parameters are comparable by equality.
+- User-defined records and datatypes are comparable by equality if their type
+  parameters are comparable by equality.
+- Smart contracts are comparable by equality.
+- User-declared type variables are comparable according to the [type
+  constraints](#type-constraints) given in the function signature.
+
+In all other cases the types are not comparable.
+
+### Type constraints
+
+Polymorphic types are not declared as comparable by default. If the user
+specifies the type signature for a function, they need to manually declare type
+constraints in order to allow the variables to be compared. This can only be
+done if the type declaration is separated from the function definition. The
+constraints have to be prepended to the type declaration and separated with a
+semicolon:
+
+```
+
+function eq(x : 'a, y : 'a) = x == y  // Type error, 'a is not comparable
+
+function
+  eq : 'a is eq ; ('a, 'a) => bool
+  eq(x, y) = x == y                   // Compiles
+
+function eq(x, y) = x == y            // Compiles as the constraints are inferred
+```
+
+Currently only two constraints are allowed: `eq` for equality and `ord` for
+inequality. Declaring a type as `ord` automatically implies `eq`.
+
 ## Lists
 
 A Sophia list is a dynamically sized, homogenous, immutable, singly
@@ -1061,16 +916,6 @@ function require(b : bool, err : string) =
     if(!b) abort(err)
 ```
 
-Aside from that, there is an almost equivalent function `exit`
-
-```sophia
-exit(reason : string) : 'a
-```
-
-Just like `abort`, it breaks the execution with the given reason. The difference
-however is in the gas consumption — while `abort` returns unused gas, a call to
-`exit` burns it all.
-
 ## Delegation signature
 
 Some chain operations (`Oracle.<operation>` and `AENS.<operation>`) have an

docs/sophia_stdlib.md

@@ -190,7 +190,7 @@ using the private key of the `owner` account for signing.
 ##### update
 ```
 AENS.update(owner : address, name : string, expiry : option(Chain.ttl), client_ttl : option(int),
-            new_ptrs : option(map(string, AENS.pointee)), <signature : signature>) : unit
+            new_ptrs : map(string, AENS.pointee), <signature : signature>) : unit
 ```
 
 Updates the name. If the optional parameters are set to `None` that parameter
@@ -470,6 +470,38 @@ Chain.block_height : int"
 The height of the current block (i.e. the block in which the current call will be included).
 
 
+##### coinbase
+```
+Chain.coinbase : address
+```
+
+The address of the account that mined the current block.
+
+
+##### timestamp
+```
+Chain.timestamp : int
+```
+
+The timestamp of the current block.
+
+
+##### difficulty
+```
+Chain.difficulty : int
+```
+
+The difficulty of the current block.
+
+
+##### gas
+```
+Chain.gas_limit : int
+```
+
+The gas limit of the current block.
+
+
 ##### bytecode_hash
 ```
 Chain.bytecode_hash : 'c => option(hash)
@@ -533,7 +565,6 @@ main contract Market =
 The typechecker must be certain about the created contract's type, so it is
 worth writing it explicitly as shown in the example.
 
-
 ##### clone
 ```
 Chain.clone : ( ref : 'c, gas : int, value : int, protected : bool, ...
@@ -592,54 +623,11 @@ implementation of the `init` function does not actually return `state`, but
 calls `put` instead. Moreover, FATE prevents even handcrafted calls to `init`.
 
 
-##### coinbase
-```
-Chain.coinbase : address
-```
-
-The address of the account that mined the current block.
-
-
-##### difficulty
-```
-Chain.difficulty : int
-```
-
-The difficulty of the current block.
-
-
 ##### event
 ```
 Chain.event(e : event) : unit
 ```
-
+Emits the event. To use this function one needs to define the `event` type as a `datatype` in the contract.
-Emits the event. To use this function one needs to define the `event` type as a
-`datatype` in the contract.
-
-
-##### gas\_limit
-```
-Chain.gas_limit : int
-```
-
-The gas limit of the current block.
-
-
-##### spend
-```
-Chain.spend(to : address, amount : int) : unit
-```
-
-Spend `amount` tokens to `to`. Will fail (and abort the contract) if contract
-doesn't have `amount` tokens to transfer, or, if `to` is not `payable`.
-
-
-##### timestamp
-```
-Chain.timestamp : int
-```
-
-The timestamp of the current block (unix time, milliseconds).
 
 
 ### Char
@@ -824,8 +812,8 @@ Registers new oracle answering questions of type `'a` with answers of type `'b`.
   private key of the account, proving you have the private key of the oracle to be. If the
   address is the same as the contract `sign` is ignored and can be left out entirely.
 * The `qfee` is the minimum query fee to be paid by a user when asking a question of the oracle.
-* The `ttl` is the Time To Live for the oracle in key blocks, either relative to the current
+* The `ttl` is the Time To Live for the oracle, either relative to the current
-  key block height (`RelativeTTL(delta)`) or a fixed key block height (`FixedTTL(height)`).
+  height (`RelativeTTL(delta)`) or a fixed height (`FixedTTL(height)`).
 * The type `'a` is the type of the question to ask.
 * The type `'b` is the type of the oracle answers.
 

docs/sophia_syntax.md

@@ -10,9 +10,8 @@ and `*/` and can be nested.
 ### Keywords
 
 ```
-contract include let switch type record datatype if elif else function
+contract elif else entrypoint false function if import include let mod namespace
-stateful payable true false mod public entrypoint private indexed namespace
+private payable stateful switch true type record datatype main interface
-interface main using as for hiding
 ```
 
 ### Tokens
@@ -92,31 +91,18 @@ A Sophia file consists of a sequence of *declarations* in a layout block.
 ```c
 File ::= Block(TopDecl)
 
-TopDecl ::= ['payable'] ['main'] 'contract' Con [Implement] '=' Block(Decl)
+TopDecl ::= ['payable'] 'contract' Con '=' Block(Decl)
-          | 'contract' 'interface' Con [Implement] '=' Block(Decl)
+       | 'namespace' Con '=' Block(Decl)
-          | 'namespace' Con '=' Block(Decl)
+       | '@compiler' PragmaOp Version
-          | '@compiler' PragmaOp Version
+       | 'include' String
-          | 'include' String
-          | Using
-
-Implement ::= ':' Sep1(Con, ',')
 
 Decl ::= 'type'     Id ['(' TVar* ')'] '=' TypeAlias
        | 'record'   Id ['(' TVar* ')'] '=' RecordType
        | 'datatype' Id ['(' TVar* ')'] '=' DataType
-       | 'let'      Id [':' Type]      '=' Expr
        | (EModifier* 'entrypoint' | FModifier* 'function') Block(FunDecl)
-       | Using
 
 FunDecl ::= Id ':' Type                             // Type signature
           | Id Args [':' Type] '=' Block(Stmt)      // Definition
-          | Id Args [':' Type] Block(GuardedDef)    // Guarded definitions
-
-GuardedDef ::= '|' Sep1(Expr, ',') '=' Block(Stmt)
-
-Using ::= 'using' Con ['as' Con] [UsingParts]
-UsingParts ::= 'for' '[' Sep1(Id, ',') ']'
-             | 'hiding' '[' Sep1(Id, ',') ']'
 
 PragmaOp ::= '<' | '=<' | '==' | '>=' | '>'
 Version  ::= Sep1(Int, '.')
@@ -186,17 +172,12 @@ Stmt ::= 'switch' '(' Expr ')' Block(Case)
        | 'elif' '(' Expr ')' Block(Stmt)
        | 'else' Block(Stmt)
        | 'let' LetDef
-       | Using
        | Expr
 
 LetDef ::= Id Args [':' Type] '=' Block(Stmt)   // Function definition
          | Pattern '=' Block(Stmt)              // Value definition
 
 Case    ::= Pattern '=>' Block(Stmt)
-          | Pattern Block(GuardedCase)
-
-GuardedCase ::= '|' Sep1(Expr, ',') '=>' Block(Stmt)
-
 Pattern ::= Expr
 ```
 
@@ -234,12 +215,10 @@ Expr ::= '(' LamArgs ')' '=>' Block(Stmt)   // Anonymous function    (x) => x +
        | '[' Expr '..' Expr ']'             // List range            [1..n]
        | '{' Sep(FieldUpdate, ',') '}'      // Record or map value   {x = 0, y = 1}, {[key] = val}
        | '(' Expr ')'                       // Parens                (1 + 2) * 3
-       | '(' Expr '=' Expr ')'              // Assign pattern        (y = x::_)
        | Id | Con | QId | QCon              // Identifiers           x, None, Map.member, AELib.Token
        | Int | Bytes | String | Char        // Literals              123, 0xff, #00abc123, "foo", '%'
        | AccountAddress | ContractAddress   // Chain identifiers
        | OracleAddress | OracleQueryId      // Chain identifiers
-       | '???'                              // Hole expression       1 + ???
 
 Generator ::= Pattern '<-' Expr   // Generator
             | 'if' '(' Expr ')'   // Guard
@@ -265,12 +244,12 @@ UnOp  ::= '-' | '!'
 | Operators | Type
 | --- | ---
 | `-` `+` `*` `/` `mod` `^` | arithmetic operators
-| `!` `&&` `||` | logical operators
+| `!` `&&` `\|\|` | logical operators
 | `==` `!=` `<` `>` `=<` `>=` | comparison operators
 | `::` `++` | list operators
-| `|>` | functional operators
+| `\|>` | functional operators
 
-## Operator precedence
+## Operator precendences
 
 In order of highest to lowest precedence.
 
@@ -284,5 +263,5 @@ In order of highest to lowest precedence.
 | `::` `++` | right
 | `<` `>` `=<` `>=` `==` `!=` | none
 | `&&` | right
-| `||` | right
+| `\|\|` | right
-| `|>` | left
+| `\|>` | left

priv/stdlib/List.aes

@@ -29,9 +29,11 @@ namespace List =
     []   => abort("drop_last_unsafe: list empty")
 
 
-  function contains(e : 'a, l : list('a)) = switch(l)
+  function
-    []   => false
+    contains : 'a is eq; ('a, list('a)) => bool
-    h::t => h == e || contains(e, t)
+    contains(e, l) = switch(l)
+      []   => false
+      h::t => h == e || contains(e, t)
 
 /** Finds first element of `l` fulfilling predicate `p` as `Some` or `None`
  * if no such element exists.

priv/stdlib/Option.aes

@@ -30,7 +30,9 @@ namespace Option =
     None    => abort(err)
     Some(x) => x
 
-  function contains(e : 'a, o : option('a)) = o == Some(e)
+  function
+    contains : 'a is eq; ('a, option('a)) => bool
+    contains(e, o) = o == Some(e)
 
   function on_elem(o : option('a), f : 'a => unit) : unit = match((), f, o)
 

priv/stdlib/String.aes

@@ -90,6 +90,7 @@ namespace String =
           Some(ix)
 
   private function
+    is_prefix : (list(char), list(char)) => option(list(char))
     is_prefix([], ys) = Some(ys)
     is_prefix(_, [])  = None
     is_prefix(x :: xs, y :: ys) =
@@ -98,10 +99,10 @@ namespace String =
 
   private function
     to_int_([], _, x, _) = Some(x)
-    to_int_(i :: is, value, x, b) =
+    to_int_(i :: ints, value, x, b) =
       switch(value(i))
         None => None
-        Some(n) => to_int_(is, value, x * b + n, b)
+        Some(i) => to_int_(ints, value, x * b + i, b)
 
   private function ch_to_int_10(ch) =
     let c = Char.to_int(ch)

rebar.config

@@ -2,9 +2,11 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.3.0"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"0699f35"}}}
+       , {getopt, "1.0.1"}
        , {eblake2, "1.0.0"}
-       , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
+       , {jsx, {git, "https://github.com/talentdeficit/jsx.git",
+                     {tag, "2.8.0"}}}
        ]}.
 
 {dialyzer, [
@@ -13,7 +15,7 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {aesophia, "7.3.0"},
+{relx, [{release, {aesophia, "6.1.0"},
          [aesophia, aebytecode, getopt]},
 
         {dev_mode, true},

rebar.lock

@@ -1,11 +1,11 @@
-{"1.2.0",
+{"1.1.0",
 [{<<"aebytecode">>,
   {git,"https://github.com/aeternity/aebytecode.git",
-       {ref,"b38349274fc2bed98d7fe86877e6e1a2df302109"}},
+       {ref,"0699f35b0398bac6cd4468da654d608375bd853d"}},
   0},
  {<<"aeserialization">>,
   {git,"https://github.com/aeternity/aeserialization.git",
-       {ref,"177bf604b2a05e940f92cf00e96e6e269e708245"}},
+       {ref,"47aaa8f5434b365c50a35bfd1490340b19241991"}},
   1},
  {<<"base58">>,
   {git,"https://github.com/aeternity/erl-base58.git",
@@ -14,9 +14,9 @@
  {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0},
  {<<"enacl">>,
   {git,"https://github.com/aeternity/enacl.git",
-       {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
+       {ref,"26180f42c0b3a450905d2efd8bc7fd5fd9cece75"}},
   2},
- {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},1},
+ {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
  {<<"jsx">>,
   {git,"https://github.com/talentdeficit/jsx.git",
        {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},
@@ -24,8 +24,5 @@
 [
 {pkg_hash,[
  {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>},
- {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]},
+ {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}
-{pkg_hash_ext,[
- {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>},
- {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]}
 ].

src/aeso_aci.erl

@@ -83,7 +83,7 @@ from_typed_ast(Type, TypedAst) ->
         string -> do_render_aci_json(JArray)
     end.
 
-encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HEAD(Head) ->
+encode_contract(Contract = {Head, _, {con, _, Name}, _}) when ?IS_CONTRACT_HEAD(Head) ->
     C0 = #{name => encode_name(Name)},
 
     Tdefs0 = [ encode_typedef(T) || T <- sort_decls(contract_types(Contract)) ],
@@ -91,7 +91,7 @@ encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HE
     {Es, Tdefs1} = lists:partition(FilterT(<<"event">>), Tdefs0),
     {Ss, Tdefs}  = lists:partition(FilterT(<<"state">>), Tdefs1),
 
-    C1 = C0#{typedefs => Tdefs},
+    C1 = C0#{type_defs => Tdefs},
 
     C2 = case Es of
              []                 -> C1;
@@ -111,7 +111,7 @@ encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HE
 encode_contract(Namespace = {namespace, _, {con, _, Name}, _}) ->
     Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(Namespace)) ],
     #{namespace => #{name => encode_name(Name),
-                     typedefs => Tdefs}}.
+                     type_defs => Tdefs}}.
 
 %%  Encode a function definition. Currently we are only interested in
 %%  the interface and type.
@@ -234,7 +234,7 @@ do_render_aci_json(Json) ->
 decode_contract(#{contract := #{name := Name,
                                 kind := Kind,
                                 payable := Payable,
-                                typedefs := Ts0,
+                                type_defs := Ts0,
                                 functions := Fs} = C}) ->
     MkTDef = fun(N, T) -> #{name => N, vars => [], typedef => T} end,
     Ts = [ MkTDef(<<"state">>, maps:get(state, C)) || maps:is_key(state, C) ] ++
@@ -246,7 +246,7 @@ decode_contract(#{contract := #{name := Name,
                        end,
      io_lib:format("~s", [Name])," =\n",
      decode_tdefs(Ts), decode_funcs(Fs)];
-decode_contract(#{namespace := #{name := Name, typedefs := Ts}}) when Ts /= [] ->
+decode_contract(#{namespace := #{name := Name, type_defs := Ts}}) when Ts /= [] ->
     ["namespace ", io_lib:format("~s", [Name])," =\n",
      decode_tdefs(Ts)];
 decode_contract(_) -> [].
@@ -341,12 +341,10 @@ stateful(false) -> "".
 
 %% #contract{Ann, Con, [Declarations]}.
 
-contract_funcs({C, _, _, _, Decls}) when ?IS_CONTRACT_HEAD(C) ->
+contract_funcs({C, _, _, Decls}) when ?IS_CONTRACT_HEAD(C); C == namespace ->
     [ D || D <- Decls, is_fun(D)].
 
-contract_types({namespace, _, _, Decls}) ->
+contract_types({C, _, _, Decls}) when ?IS_CONTRACT_HEAD(C); C == namespace ->
-    [ D || D <- Decls, is_type(D) ];
-contract_types({C, _, _, _, Decls}) when ?IS_CONTRACT_HEAD(C) ->
     [ D || D <- Decls, is_type(D) ].
 
 is_fun({letfun, _, _, _, _, _}) -> true;

src/aeso_code_errors.erl

@@ -0,0 +1,94 @@
+%%%-------------------------------------------------------------------
+%%% @author Ulf Norell
+%%% @copyright (C) 2019, Aeternity Anstalt
+%%% @doc
+%%%     Formatting of code generation errors.
+%%% @end
+%%%
+%%%-------------------------------------------------------------------
+-module(aeso_code_errors).
+
+-export([format/1, pos/1]).
+
+format({last_declaration_must_be_main_contract, Decl = {Kind, _, {con, _, C}, _}}) ->
+    Msg = io_lib:format("Expected a main contract as the last declaration instead of the ~p '~s'",
+                        [Kind, C]),
+    mk_err(pos(Decl), Msg);
+format({missing_init_function, Con}) ->
+    Msg = io_lib:format("Missing init function for the contract '~s'.", [pp_expr(Con)]),
+    Cxt = "The 'init' function can only be omitted if the state type is 'unit'.",
+    mk_err(pos(Con), Msg, Cxt);
+format({missing_definition, Id}) ->
+    Msg = io_lib:format("Missing definition of function '~s'.", [pp_expr(Id)]),
+    mk_err(pos(Id), Msg);
+format({parameterized_state, Decl}) ->
+    Msg = "The state type cannot be parameterized.",
+    mk_err(pos(Decl), Msg);
+format({parameterized_event, Decl}) ->
+    Msg = "The event type cannot be parameterized.",
+    mk_err(pos(Decl), Msg);
+format({invalid_entrypoint, Why, Ann, {id, _, Name}, Thing}) ->
+    What = case Why of higher_order -> "higher-order (contains function types)";
+                       polymorphic  -> "polymorphic (contains type variables)" end,
+    ThingS = case Thing of
+                 {argument, X, T} -> io_lib:format("argument\n~s\n", [pp_typed(X, T)]);
+                 {result, T}      -> io_lib:format("return type\n~s\n", [pp_type(2, T)])
+             end,
+    Bad = case Thing of
+              {argument, _, _} -> io_lib:format("has a ~s type", [What]);
+              {result, _}      -> io_lib:format("is ~s", [What])
+          end,
+    Msg = io_lib:format("The ~sof entrypoint '~s' ~s.",
+                        [ThingS, Name, Bad]),
+    case Why of
+        higher_order -> mk_err(pos(Ann), Msg)
+    end;
+format({invalid_aens_resolve_type, Ann, T}) ->
+    Msg = io_lib:format("Invalid return type of AENS.resolve:\n"
+                        "~s\n"
+                        "It must be a string or a pubkey type (address, oracle, etc).",
+                        [pp_type(2, T)]),
+    mk_err(pos(Ann), Msg);
+format({invalid_oracle_type, Why, What, Ann, Type}) ->
+    WhyS = case Why of higher_order -> "higher-order (contain function types)";
+                       polymorphic  -> "polymorphic (contain type variables)" end,
+    Msg = io_lib:format("Invalid oracle type\n~s", [pp_type(2, Type)]),
+    Cxt = io_lib:format("The ~s type must not be ~s.", [What, WhyS]),
+    mk_err(pos(Ann), Msg, Cxt);
+format({var_args_not_set, Expr}) ->
+    mk_err( pos(Expr), "Could not deduce type of variable arguments list"
+          , "When compiling " ++ pp_expr(Expr)
+          );
+format({found_void, Ann}) ->
+    mk_err(pos(Ann), "Found a void-typed value.", "`void` is a restricted, uninhabited type. Did you mean `unit`?");
+
+format(Err) ->
+    mk_err(aeso_errors:pos(0, 0), io_lib:format("Unknown error: ~p\n", [Err])).
+
+pos(Ann) ->
+    File = aeso_syntax:get_ann(file, Ann, no_file),
+    Line = aeso_syntax:get_ann(line, Ann, 0),
+    Col  = aeso_syntax:get_ann(col, Ann, 0),
+    aeso_errors:pos(File, Line, Col).
+
+pp_typed(E, T) ->
+    prettypr:format(prettypr:nest(2,
+    lists:foldr(fun prettypr:beside/2, prettypr:empty(),
+                [aeso_pretty:expr(E), prettypr:text(" : "),
+                 aeso_pretty:type(T)]))).
+
+pp_expr(E) ->
+    pp_expr(0, E).
+
+pp_expr(N, E) ->
+    prettypr:format(prettypr:nest(N, aeso_pretty:expr(E))).
+
+pp_type(N, T) ->
+    prettypr:format(prettypr:nest(N, aeso_pretty:type(T))).
+
+mk_err(Pos, Msg) ->
+    aeso_errors:new(code_error, Pos, lists:flatten(Msg)).
+
+mk_err(Pos, Msg, Cxt) ->
+    aeso_errors:new(code_error, Pos, lists:flatten(Msg), lists:flatten(Cxt)).
+

src/aeso_compiler.erl

@@ -12,8 +12,6 @@
         , file/2
         , from_string/2
         , check_call/4
-        , decode_value/4
-        , encode_value/4
         , create_calldata/3
         , create_calldata/4
         , version/0
@@ -114,12 +112,10 @@ from_string(ContractString, Options) ->
 
 from_string1(ContractString, Options) ->
     #{ fcode := FCode
-     , fcode_env := FCodeEnv
+     , fcode_env := #{child_con_env := ChildContracts}
      , folded_typed_ast := FoldedTypedAst
      , warnings := Warnings } = string_to_code(ContractString, Options),
-    #{ child_con_env := ChildContracts } = FCodeEnv,
+    FateCode = aeso_fcode_to_fate:compile(ChildContracts, FCode, Options),
-    SavedFreshNames = maps:get(saved_fresh_names, FCodeEnv, #{}),
-    FateCode = aeso_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
     pp_assembler(FateCode, Options),
     ByteCode = aeb_fate_code:serialize(FateCode, []),
     {ok, Version} = version(),
@@ -184,55 +180,30 @@ check_call(Source, FunName, Args, Options) ->
     check_call1(Source, FunName, Args, Options).
 
 check_call1(ContractString0, FunName, Args, Options) ->
-    case add_extra_call(ContractString0, {call, FunName, Args}, Options) of
-        {ok, CallName, Code} ->
-            {def, _, _, FcodeArgs} = get_call_body(CallName, Code),
-            {ok, FunName, [ aeso_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
-        Err = {error, _} ->
-            Err
-    end.
-
-add_extra_call(Contract0, Call, Options) ->
     try
         %% First check the contract without the __call function
         #{fcode := OrgFcode
         , fcode_env := #{child_con_env := ChildContracts}
-        , ast := Ast} = string_to_code(Contract0, Options),
+        , ast := Ast} = string_to_code(ContractString0, Options),
-        FateCode = aeso_fcode_to_fate:compile(ChildContracts, OrgFcode, #{}, []),
+        FateCode = aeso_fcode_to_fate:compile(ChildContracts, OrgFcode, []),
         %% collect all hashes and compute the first name without hash collision to
         SymbolHashes = maps:keys(aeb_fate_code:symbols(FateCode)),
         CallName = first_none_match(?CALL_NAME, SymbolHashes,
                                     lists:seq($1, $9) ++ lists:seq($A, $Z) ++ lists:seq($a, $z)),
-        Contract = insert_call_function(Ast, Contract0, CallName, Call),
+        ContractString = insert_call_function(Ast, ContractString0, CallName, FunName, Args),
-        {ok, CallName, string_to_code(Contract, Options)}
+        #{fcode := Fcode} = string_to_code(ContractString, Options),
+        CallArgs = arguments_of_body(CallName, FunName, Fcode),
+
+        {ok, FunName, CallArgs}
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-get_call_body(CallName, #{fcode := Fcode}) ->
+arguments_of_body(CallName, _FunName, Fcode) ->
     #{body := Body} = maps:get({entrypoint, list_to_binary(CallName)}, maps:get(functions, Fcode)),
-    Body.
+    {def, _FName, Args} = Body,
-
+    %% FName is either {entrypoint, list_to_binary(FunName)} or 'init'
-encode_value(Contract0, Type, Value, Options) ->
+    [ aeso_fcode_to_fate:term_to_fate(A) || A <- Args ].
-    case add_extra_call(Contract0, {value, Type, Value}, Options) of
-        {ok, CallName, Code} ->
-            Body = get_call_body(CallName, Code),
-            {ok, aeb_fate_encoding:serialize(aeso_fcode_to_fate:term_to_fate(Body))};
-        Err = {error, _} ->
-            Err
-    end.
-
-decode_value(Contract0, Type, FateValue, Options) ->
-    case add_extra_call(Contract0, {type, Type}, Options) of
-        {ok, CallName, Code} ->
-            #{ unfolded_typed_ast := TypedAst
-             , type_env           := TypeEnv} = Code,
-            {ok, _, Type0} = get_decode_type(CallName, TypedAst),
-            Type1 = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-            fate_data_to_sophia_value(Type0, Type1, FateValue);
-        Err = {error, _} ->
-            Err
-    end.
 
 first_none_match(_CallName, _Hashes, []) ->
     error(unable_to_find_unique_call_name);
@@ -245,31 +216,14 @@ first_none_match(CallName, Hashes, [Char|Chars]) ->
     end.
 
 %% Add the __call function to a contract.
--spec insert_call_function(aeso_syntax:ast(), string(), string(),
+-spec insert_call_function(aeso_syntax:ast(), string(), string(), string(), [string()]) -> string().
-                           {call, string(), [string()]} | {value, string(), string()} | {type, string()}) -> string().
+insert_call_function(Ast, Code, Call, FunName, Args) ->
-insert_call_function(Ast, Code, Call, {call, FunName, Args}) ->
     Ind = last_contract_indent(Ast),
     lists:flatten(
         [ Code,
           "\n\n",
           lists:duplicate(Ind, " "),
           "stateful entrypoint ", Call, "() = ", FunName, "(", string:join(Args, ","), ")\n"
-        ]);
-insert_call_function(Ast, Code, Call, {value, Type, Value}) ->
-    Ind = last_contract_indent(Ast),
-    lists:flatten(
-        [ Code,
-          "\n\n",
-          lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "() : ", Type, " = ", Value, "\n"
-        ]);
-insert_call_function(Ast, Code, Call, {type, Type}) ->
-    Ind = last_contract_indent(Ast),
-    lists:flatten(
-        [ Code,
-          "\n\n",
-          lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "(val : ", Type, ") = val\n"
         ]).
 
 -spec insert_init_function(string(), options()) -> string().
@@ -284,8 +238,8 @@ insert_init_function(Code, Options) ->
 
 last_contract_indent(Decls) ->
     case lists:last(Decls) of
-        {_, _, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
+        {_, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
-        _                        -> 0
+        _                     -> 0
     end.
 
 -spec to_sophia_value(string(), string(), ok | error | revert, binary()) ->
@@ -312,25 +266,22 @@ to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
         {ok, _, Type0} = get_decode_type(FunName, TypedAst),
         Type   = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
 
-        fate_data_to_sophia_value(Type0, Type, Data)
+        try
+            {ok, aeso_vm_decode:from_fate(Type, aeb_fate_encoding:deserialize(Data))}
+        catch throw:cannot_translate_to_sophia ->
+                Type1 = prettypr:format(aeso_pretty:type(Type0)),
+                Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s",
+                                    [aeb_fate_encoding:deserialize(Data), Type1]),
+                {error, [aeso_errors:new(data_error, Msg)]};
+              _:_ ->
+                Type1 = prettypr:format(aeso_pretty:type(Type0)),
+                Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
+                {error, [aeso_errors:new(data_error, Msg)]}
+        end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-fate_data_to_sophia_value(Type, UnfoldedType, FateData) ->
-    try
-        {ok, aeso_vm_decode:from_fate(UnfoldedType, aeb_fate_encoding:deserialize(FateData))}
-    catch throw:cannot_translate_to_sophia ->
-            Type1 = prettypr:format(aeso_pretty:type(Type)),
-            Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s",
-                                [aeb_fate_encoding:deserialize(FateData), Type1]),
-            {error, [aeso_errors:new(data_error, Msg)]};
-          _:_ ->
-            Type1 = prettypr:format(aeso_pretty:type(Type)),
-            Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
-            {error, [aeso_errors:new(data_error, Msg)]}
-    end.
-
 -spec create_calldata(string(), string(), [string()]) ->
           {ok, binary()} | {error, [aeso_errors:error()]}.
 create_calldata(Code, Fun, Args) ->
@@ -387,7 +338,7 @@ decode_calldata(ContractString, FunName, Calldata, Options0) ->
     end.
 
 -dialyzer({nowarn_function, get_decode_type/2}).
-get_decode_type(FunName, [{Contract, Ann, _, _, Defs}]) when ?IS_CONTRACT_HEAD(Contract) ->
+get_decode_type(FunName, [{Contract, Ann, _, Defs}]) when ?IS_CONTRACT_HEAD(Contract) ->
     GetType = fun({letfun, _, {id, _, Name}, Args, Ret, _})               when Name == FunName -> [{Args, Ret}];
                  ({fun_decl, _, {id, _, Name}, {fun_t, _, _, Args, Ret}}) when Name == FunName -> [{Args, Ret}];
                  (_) -> [] end,
@@ -398,7 +349,7 @@ get_decode_type(FunName, [{Contract, Ann, _, _, Defs}]) when ?IS_CONTRACT_HEAD(C
                 "init" -> {ok, [], {tuple_t, [], []}};
                  _ ->
                     Msg = io_lib:format("Function '~s' is missing in contract", [FunName]),
-                    Pos = aeso_errors:pos(Ann),
+                    Pos = aeso_code_errors:pos(Ann),
                     aeso_errors:throw(aeso_errors:new(data_error, Pos, Msg))
             end
     end;

src/aeso_errors.erl

@@ -34,7 +34,6 @@
         , new/2
         , new/3
         , new/4
-        , pos/1
         , pos/2
         , pos/3
         , pp/1
@@ -54,12 +53,6 @@ new(Type, Pos, Msg) ->
 new(Type, Pos, Msg, Ctxt) ->
     #err{ type = Type, pos = Pos, message = Msg, context = Ctxt }.
 
-pos(Ann) ->
-    File = aeso_syntax:get_ann(file, Ann, no_file),
-    Line = aeso_syntax:get_ann(line, Ann, 0),
-    Col  = aeso_syntax:get_ann(col, Ann, 0),
-    pos(File, Line, Col).
-
 pos(Line, Col) ->
     #pos{ line = Line, col = Col }.
 

src/aeso_fcode_to_fate.erl

@@ -9,7 +9,7 @@
 %%%-------------------------------------------------------------------
 -module(aeso_fcode_to_fate).
 
--export([compile/3, compile/4, term_to_fate/1, term_to_fate/2]).
+-export([compile/2, compile/3, term_to_fate/1, term_to_fate/2]).
 
 -ifdef(TEST).
 -export([optimize_fun/4, to_basic_blocks/1]).
@@ -45,15 +45,7 @@
 -define(s(N), {store, N}).
 -define(void, {var, 9999}).
 
--record(env, { contract,
+-record(env, { contract, vars = [], locals = [], current_function, tailpos = true, child_contracts = #{}, options = []}).
-               vars              = [],
-               locals            = [],
-               current_function,
-               tailpos           = true,
-               child_contracts   = #{},
-               saved_fresh_names = #{},
-               options           = [],
-               debug_info        = false }).
 
 %% -- Debugging --------------------------------------------------------------
 
@@ -72,26 +64,21 @@ debug(Tag, Options, Fun) ->
 
 -dialyzer({nowarn_function, [code_error/1]}).
 code_error(Err) ->
-    Pos = aeso_errors:pos(0, 0),
+    aeso_errors:throw(aeso_code_errors:format(Err)).
-    Msg = lists:flatten(io_lib:format("Unknown error: ~p\n", [Err])),
-    aeso_errors:throw(aeso_errors:new(code_error, Pos, Msg)).
 
 %% -- Main -------------------------------------------------------------------
 
 %% @doc Main entry point.
-compile(FCode, SavedFreshNames, Options) ->
+compile(FCode, Options) ->
-    compile(#{}, FCode, SavedFreshNames, Options).
+    compile(#{}, FCode, Options).
-compile(ChildContracts, FCode, SavedFreshNames, Options) ->
+compile(ChildContracts, FCode, Options) ->
     #{ contract_name := ContractName,
        functions     := Functions } = FCode,
-    SFuns  = functions_to_scode(ChildContracts, ContractName, Functions, SavedFreshNames, Options),
+    SFuns  = functions_to_scode(ChildContracts, ContractName, Functions, Options),
     SFuns1 = optimize_scode(SFuns, Options),
     FateCode = to_basic_blocks(SFuns1),
     ?debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]),
-    case proplists:get_value(include_child_contract_symbols, Options, false) of
+    FateCode.
-        false -> FateCode;
-        true  -> add_child_symbols(ChildContracts, FateCode)
-    end.
 
 make_function_id(X) ->
     aeb_fate_code:symbol_identifier(make_function_name(X)).
@@ -100,31 +87,21 @@ make_function_name(event)              -> <<"Chain.event">>;
 make_function_name({entrypoint, Name}) -> Name;
 make_function_name({local_fun, Xs})    -> list_to_binary("." ++ string:join(Xs, ".")).
 
-add_child_symbols(ChildContracts, FateCode) ->
+functions_to_scode(ChildContracts, ContractName, Functions, Options) ->
-    Funs = lists:flatten([ maps:keys(ChildFuns) || {_, #{functions := ChildFuns}} <- maps:to_list(ChildContracts) ]),
-    Symbols = maps:from_list([ {make_function_id(FName), make_function_name(FName)} || FName <- Funs ]),
-    aeb_fate_code:update_symbols(FateCode, Symbols).
-
-functions_to_scode(ChildContracts, ContractName, Functions, SavedFreshNames, Options) ->
     FunNames = maps:keys(Functions),
     maps:from_list(
-        [ {make_function_name(Name), function_to_scode(ChildContracts, ContractName, FunNames, Name, Attrs, Args, Body, Type, SavedFreshNames, Options)}
+        [ {make_function_name(Name), function_to_scode(ChildContracts, ContractName, FunNames, Name, Attrs, Args, Body, Type, Options)}
         || {Name, #{args   := Args,
                     body   := Body,
                     attrs  := Attrs,
                     return := Type}} <- maps:to_list(Functions)]).
 
-function_to_scode(ChildContracts, ContractName, Functions, Name, Attrs0, Args, Body, ResType, SavedFreshNames, Options) ->
+function_to_scode(ChildContracts, ContractName, Functions, Name, Attrs0, Args, Body, ResType, Options) ->
     {ArgTypes, ResType1} = typesig_to_scode(Args, ResType),
-    Attrs = [ A || A <- Attrs0, A == private orelse A == payable ],
+    Attrs = Attrs0 -- [stateful], %% Only track private and payable from here.
-    Env = init_env(ChildContracts, ContractName, Functions, Name, Args, SavedFreshNames, Options),
+    Env = init_env(ChildContracts, ContractName, Functions, Name, Args, Options),
-    ArgsNames = [ X || {X, _} <- lists:reverse(Env#env.vars) ],
-
-    %% DBG_LOC is added before the function body to make it possible to break
-    %% at the function signature
     SCode = to_scode(Env, Body),
-    DbgSCode = dbg_contract(Env) ++ dbg_loc(Env, Attrs0) ++ dbg_scoped_vars(Env, ArgsNames, SCode),
+    {Attrs, {ArgTypes, ResType1}, SCode}.
-    {Attrs, {ArgTypes, ResType1}, DbgSCode}.
 
 -define(tvars, '$tvars').
 
@@ -170,16 +147,14 @@ types_to_scode(Ts) -> lists:map(fun type_to_scode/1, Ts).
 
 %% -- Environment functions --
 
-init_env(ChildContracts, ContractName, FunNames, Name, Args, SavedFreshNames, Options) ->
+init_env(ChildContracts, ContractName, FunNames, Name, Args, Options) ->
-    #env{ vars              = [ {X, {arg, I}} || {I, {X, _}} <- with_ixs(Args) ],
+    #env{ vars      = [ {X, {arg, I}} || {I, {X, _}} <- with_ixs(Args) ],
-          contract          = ContractName,
+          contract  = ContractName,
-          child_contracts   = ChildContracts,
+          child_contracts = ChildContracts,
-          locals            = FunNames,
+          locals    = FunNames,
-          current_function  = Name,
+          current_function = Name,
-          options           = Options,
+          options = Options,
-          tailpos           = true,
+          tailpos   = true }.
-          saved_fresh_names = SavedFreshNames,
-          debug_info        = proplists:get_value(debug_info, Options, false) }.
 
 next_var(#env{ vars = Vars }) ->
     1 + lists:max([-1 | [J || {_, {var, J}} <- Vars]]).
@@ -208,10 +183,9 @@ serialize_contract_code(Env, C) ->
             end,
     case maps:get(C, Cache, none) of
         none ->
-            Options = Env#env.options,
+            Options  = Env#env.options,
-            SavedFreshNames = Env#env.saved_fresh_names,
+            FCode    = maps:get(C, Env#env.child_contracts),
-            FCode = maps:get(C, Env#env.child_contracts),
+            FateCode = compile(Env#env.child_contracts, FCode, Options),
-            FateCode = compile(Env#env.child_contracts, FCode, SavedFreshNames, Options),
             ByteCode = aeb_fate_code:serialize(FateCode, []),
             {ok, Version} = aeso_compiler:version(),
             OriginalSourceCode = proplists:get_value(original_src, Options, ""),
@@ -245,44 +219,44 @@ lit_to_fate(Env, L) ->
 term_to_fate(E) -> term_to_fate(#env{}, #{}, E).
 term_to_fate(GlobEnv, E) -> term_to_fate(GlobEnv, #{}, E).
 
-term_to_fate(GlobEnv, _Env, {lit, _, L}) ->
+term_to_fate(GlobEnv, _Env, {lit, L}) ->
     lit_to_fate(GlobEnv, L);
 %% negative literals are parsed as 0 - N
-term_to_fate(_GlobEnv, _Env, {op, _, '-', [{lit, _, {int, 0}}, {lit, _, {int, N}}]}) ->
+term_to_fate(_GlobEnv, _Env, {op, '-', [{lit, {int, 0}}, {lit, {int, N}}]}) ->
     aeb_fate_data:make_integer(-N);
-term_to_fate(_GlobEnv, _Env, {nil, _}) ->
+term_to_fate(_GlobEnv, _Env, nil) ->
     aeb_fate_data:make_list([]);
-term_to_fate(GlobEnv, Env, {op, _, '::', [Hd, Tl]}) ->
+term_to_fate(GlobEnv, Env, {op, '::', [Hd, Tl]}) ->
     %% The Tl will translate into a list, because FATE lists are just lists
     [term_to_fate(GlobEnv, Env, Hd) | term_to_fate(GlobEnv, Env, Tl)];
-term_to_fate(GlobEnv, Env, {tuple, _, As}) ->
+term_to_fate(GlobEnv, Env, {tuple, As}) ->
     aeb_fate_data:make_tuple(list_to_tuple([ term_to_fate(GlobEnv, Env, A) || A<-As]));
-term_to_fate(GlobEnv, Env, {con, _, Ar, I, As}) ->
+term_to_fate(GlobEnv, Env, {con, Ar, I, As}) ->
     FateAs = [ term_to_fate(GlobEnv, Env, A) || A <- As ],
     aeb_fate_data:make_variant(Ar, I, list_to_tuple(FateAs));
-term_to_fate(_GlobEnv, _Env, {builtin, _, bits_all, []}) ->
+term_to_fate(_GlobEnv, _Env, {builtin, bits_all, []}) ->
     aeb_fate_data:make_bits(-1);
-term_to_fate(_GlobEnv, _Env, {builtin, _, bits_none, []}) ->
+term_to_fate(_GlobEnv, _Env, {builtin, bits_none, []}) ->
     aeb_fate_data:make_bits(0);
-term_to_fate(GlobEnv, _Env, {op, _, bits_set, [B, I]}) ->
+term_to_fate(GlobEnv, _Env, {op, bits_set, [B, I]}) ->
     {bits, N} = term_to_fate(GlobEnv, B),
     J         = term_to_fate(GlobEnv, I),
     {bits, N bor (1 bsl J)};
-term_to_fate(GlobEnv, _Env, {op, _, bits_clear, [B, I]}) ->
+term_to_fate(GlobEnv, _Env, {op, bits_clear, [B, I]}) ->
     {bits, N} = term_to_fate(GlobEnv, B),
     J         = term_to_fate(GlobEnv, I),
     {bits, N band bnot (1 bsl J)};
-term_to_fate(GlobEnv, Env, {'let', _, X, E, Body}) ->
+term_to_fate(GlobEnv, Env, {'let', X, E, Body}) ->
     Env1 = Env#{ X => term_to_fate(GlobEnv, Env, E) },
     term_to_fate(GlobEnv, Env1, Body);
-term_to_fate(_GlobEnv, Env, {var, _, X}) ->
+term_to_fate(_GlobEnv, Env, {var, X}) ->
     case maps:get(X, Env, undefined) of
         undefined -> throw(not_a_fate_value);
         V         -> V
     end;
-term_to_fate(_GlobEnv, _Env, {builtin, _, map_empty, []}) ->
+term_to_fate(_GlobEnv, _Env, {builtin, map_empty, []}) ->
     aeb_fate_data:make_map(#{});
-term_to_fate(GlobEnv, Env, {op, _, map_set, [M, K, V]}) ->
+term_to_fate(GlobEnv, Env, {op, map_set, [M, K, V]}) ->
     Map = term_to_fate(GlobEnv, Env, M),
     Map#{term_to_fate(GlobEnv, Env, K) => term_to_fate(GlobEnv, Env, V)};
 term_to_fate(_GlobEnv, _Env, _) ->
@@ -290,59 +264,52 @@ term_to_fate(_GlobEnv, _Env, _) ->
 
 to_scode(Env, T) ->
     try term_to_fate(Env, T) of
-        V ->
+        V -> [push(?i(V))]
-            FAnn = element(2, T),
-            [dbg_loc(Env, FAnn), push(?i(V))]
     catch throw:not_a_fate_value ->
         to_scode1(Env, T)
     end.
 
-to_scode1(Env, {lit, Ann, L}) ->
+to_scode1(Env, {lit, L}) ->
-    [ dbg_loc(Env, Ann), push(?i(lit_to_fate(Env, L))) ];
+    [push(?i(lit_to_fate(Env, L)))];
 
-to_scode1(Env, {nil, Ann}) ->
+to_scode1(_Env, nil) ->
-    [ dbg_loc(Env, Ann), aeb_fate_ops:nil(?a) ];
+    [aeb_fate_ops:nil(?a)];
 
-to_scode1(Env, {var, Ann, X}) ->
+to_scode1(Env, {var, X}) ->
-    [ dbg_loc(Env, Ann), push(lookup_var(Env, X)) ];
+    [push(lookup_var(Env, X))];
 
-to_scode1(Env, {con, Ann, Ar, I, As}) ->
+to_scode1(Env, {con, Ar, I, As}) ->
     N = length(As),
-    [ dbg_loc(Env, Ann),
+    [[to_scode(notail(Env), A) || A <- As],
-      [to_scode(notail(Env), A) || A <- As],
+     aeb_fate_ops:variant(?a, ?i(Ar), ?i(I), ?i(N))];
-      aeb_fate_ops:variant(?a, ?i(Ar), ?i(I), ?i(N)) ];
 
-to_scode1(Env, {tuple, Ann, As}) ->
+to_scode1(Env, {tuple, As}) ->
     N = length(As),
-    [ dbg_loc(Env, Ann),
+    [[ to_scode(notail(Env), A) || A <- As ],
-      [ to_scode(notail(Env), A) || A <- As ],
+     tuple(N)];
-      tuple(N) ];
 
-to_scode1(Env, {proj, Ann, E, I}) ->
+to_scode1(Env, {proj, E, I}) ->
-    [ dbg_loc(Env, Ann),
+    [to_scode(notail(Env), E),
-      to_scode(notail(Env), E),
+     aeb_fate_ops:element_op(?a, ?i(I), ?a)];
-      aeb_fate_ops:element_op(?a, ?i(I), ?a) ];
 
-to_scode1(Env, {set_proj, Ann, R, I, E}) ->
+to_scode1(Env, {set_proj, R, I, E}) ->
-    [ dbg_loc(Env, Ann),
+    [to_scode(notail(Env), E),
-      to_scode(notail(Env), E),
+     to_scode(notail(Env), R),
-      to_scode(notail(Env), R),
+     aeb_fate_ops:setelement(?a, ?i(I), ?a, ?a)];
-      aeb_fate_ops:setelement(?a, ?i(I), ?a, ?a) ];
 
-to_scode1(Env, {op, Ann, Op, Args}) ->
+to_scode1(Env, {op, Op, Args}) ->
-    [ dbg_loc(Env, Ann) | call_to_scode(Env, op_to_scode(Op), Args) ];
+    call_to_scode(Env, op_to_scode(Op), Args);
 
-to_scode1(Env, {'let', Ann, X, {var, _, Y}, Body}) ->
+to_scode1(Env, {'let', X, {var, Y}, Body}) ->
     Env1 = bind_var(X, lookup_var(Env, Y), Env),
-    [ dbg_loc(Env, Ann) | dbg_scoped_vars(Env1, [X], to_scode(Env1, Body)) ];
+    to_scode(Env1, Body);
-to_scode1(Env, {'let', Ann, X, Expr, Body}) ->
+to_scode1(Env, {'let', X, Expr, Body}) ->
     {I, Env1} = bind_local(X, Env),
-    SCode = [ to_scode(notail(Env), Expr),
+    [ to_scode(notail(Env), Expr),
-              aeb_fate_ops:store({var, I}, {stack, 0}),
+      aeb_fate_ops:store({var, I}, {stack, 0}),
-              to_scode(Env1, Body) ],
+      to_scode(Env1, Body) ];
-    [ dbg_loc(Env, Ann) | dbg_scoped_vars(Env1, [X], SCode) ];
 
-to_scode1(Env = #env{ current_function = Fun, tailpos = true, debug_info = false }, {def, Ann, Fun, Args}) ->
+to_scode1(Env = #env{ current_function = Fun, tailpos = true }, {def, Fun, Args}) ->
     %% Tail-call to current function, f(e0..en). Compile to
     %%      [ let xi = ei ]
     %%      [ STORE argi xi ]
@@ -355,62 +322,61 @@ to_scode1(Env = #env{ current_function = Fun, tailpos = true, debug_info = false
                                 aeb_fate_ops:store({var, I}, ?a)],
                         {[I | Is], Acc1, Env2}
                     end, {[], [], Env}, Args),
-    [ dbg_loc(Env, Ann),
+    [ Code,
-      Code,
       [ aeb_fate_ops:store({arg, I}, {var, J})
         || {I, J} <- lists:zip(lists:seq(0, length(Vars) - 1),
                                lists:reverse(Vars)) ],
       loop ];
-to_scode1(Env, {def, Ann, Fun, Args}) ->
+to_scode1(Env, {def, Fun, Args}) ->
     FName = make_function_id(Fun),
     Lbl   = aeb_fate_data:make_string(FName),
-    [ dbg_loc(Env, Ann) | call_to_scode(Env, local_call(Env, ?i(Lbl)), Args) ];
+    call_to_scode(Env, local_call(Env, ?i(Lbl)), Args);
-to_scode1(Env, {funcall, Ann, Fun, Args}) ->
+to_scode1(Env, {funcall, Fun, Args}) ->
-    [ dbg_loc(Env, Ann) | call_to_scode(Env, [to_scode(Env, Fun), local_call(Env, ?a)], Args) ];
+    call_to_scode(Env, [to_scode(Env, Fun), local_call(Env, ?a)], Args);
 
-to_scode1(Env, {builtin, Ann, B, Args}) ->
+to_scode1(Env, {builtin, B, Args}) ->
-    [ dbg_loc(Env, Ann) | builtin_to_scode(Env, B, Args) ];
+    builtin_to_scode(Env, B, Args);
 
-to_scode1(Env, {remote, Ann, ArgsT, RetT, Ct, Fun, [Gas, Value, Protected | Args]}) ->
+to_scode1(Env, {remote, ArgsT, RetT, Ct, Fun, [Gas, Value, Protected | Args]}) ->
     Lbl = make_function_id(Fun),
     {ArgTypes, RetType0} = typesig_to_scode([{"_", T} || T <- ArgsT], RetT),
     ArgType = ?i(aeb_fate_data:make_typerep({tuple, ArgTypes})),
     RetType = ?i(aeb_fate_data:make_typerep(RetType0)),
-    SCode = case Protected of
+    case Protected of
-        {lit, _, {bool, false}} ->
+        {lit, {bool, false}} ->
             case Gas of
-                {builtin, _, call_gas_left, _} ->
+                {builtin, call_gas_left, _} ->
                     Call = aeb_fate_ops:call_r(?a, Lbl, ArgType, RetType, ?a),
                     call_to_scode(Env, Call, [Ct, Value | Args]);
                 _ ->
                     Call = aeb_fate_ops:call_gr(?a, Lbl, ArgType, RetType, ?a, ?a),
                     call_to_scode(Env, Call, [Ct, Value, Gas | Args])
             end;
-        {lit, _, {bool, true}} ->
+        {lit, {bool, true}} ->
             Call = aeb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?i(true)),
             call_to_scode(Env, Call, [Ct, Value, Gas | Args]);
         _ ->
             Call = aeb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?a),
             call_to_scode(Env, Call, [Ct, Value, Gas, Protected | Args])
-    end,
+    end;
-    [ dbg_loc(Env, Ann) | SCode ];
 
-to_scode1(Env, {get_state, Ann, Reg}) ->
+to_scode1(_Env, {get_state, Reg}) ->
-    [ dbg_loc(Env, Ann), push(?s(Reg)) ];
+    [push(?s(Reg))];
-to_scode1(Env, {set_state, Ann, Reg, Val}) ->
+to_scode1(Env, {set_state, Reg, Val}) ->
-    [ dbg_loc(Env, Ann) | call_to_scode(Env, [{'STORE', ?s(Reg), ?a}, tuple(0)], [Val]) ];
+    call_to_scode(Env, [{'STORE', ?s(Reg), ?a},
+                        tuple(0)], [Val]);
 
-to_scode1(Env, {closure, Ann, Fun, FVs}) ->
+to_scode1(Env, {closure, Fun, FVs}) ->
-    [ to_scode(Env, {tuple, Ann, [{lit, Ann, {string, make_function_id(Fun)}}, FVs]}) ];
+    to_scode(Env, {tuple, [{lit, {string, make_function_id(Fun)}}, FVs]});
 
-to_scode1(Env, {switch, Ann, Case}) ->
+to_scode1(Env, {switch, Case}) ->
-    [ dbg_loc(Env, Ann) | split_to_scode(Env, Case) ].
+    split_to_scode(Env, Case).
 
-local_call( Env = #env{debug_info = false}, Fun) when Env#env.tailpos -> aeb_fate_ops:call_t(Fun);
+local_call( Env, Fun) when Env#env.tailpos -> aeb_fate_ops:call_t(Fun);
-local_call(_Env, Fun)                                                 -> aeb_fate_ops:call(Fun).
+local_call(_Env, Fun)                      -> aeb_fate_ops:call(Fun).
 
-split_to_scode(Env, {nosplit, Renames, Expr}) ->
+split_to_scode(Env, {nosplit, Expr}) ->
-    [switch_body, dbg_scoped_vars(Env, Renames, to_scode(Env, Expr))];
+    [switch_body, to_scode(Env, Expr)];
 split_to_scode(Env, {split, {tuple, _}, X, Alts}) ->
     {Def, Alts1} = catchall_to_scode(Env, X, Alts),
     Arg = lookup_var(Env, X),
@@ -541,8 +507,6 @@ builtin_to_scode(Env, bytes_split, [_, _] = Args) ->
     call_to_scode(Env, aeb_fate_ops:bytes_split(?a, ?a, ?a), Args);
 builtin_to_scode(Env, abort, [_] = Args) ->
     call_to_scode(Env, aeb_fate_ops:abort(?a), Args);
-builtin_to_scode(Env, exit, [_] = Args) ->
-    call_to_scode(Env, aeb_fate_ops:exit(?a), Args);
 builtin_to_scode(Env, chain_spend, [_, _] = Args) ->
     call_to_scode(Env, [aeb_fate_ops:spend(?a, ?a),
                         tuple(0)], Args);
@@ -634,7 +598,7 @@ builtin_to_scode(Env, chain_bytecode_hash, [_Addr] = Args) ->
 builtin_to_scode(Env, chain_clone,
                  [InitArgsT, GasCap, Value, Prot, Contract | InitArgs]) ->
     case GasCap of
-        {builtin, _, call_gas_left, _} ->
+        {builtin, call_gas_left, _} ->
             call_to_scode(Env, aeb_fate_ops:clone(?a, ?a, ?a, ?a),
                           [Contract, InitArgsT, Value, Prot | InitArgs]
                          );
@@ -736,83 +700,12 @@ push(A) -> {'STORE', ?a, A}.
 tuple(0) -> push(?i({tuple, {}}));
 tuple(N) -> aeb_fate_ops:tuple(?a, N).
 
-%% -- Debug info functions --
-
-dbg_contract(#env{debug_info = false}) ->
-    [];
-dbg_contract(#env{contract = Contract}) ->
-    [{'DBG_CONTRACT', {immediate, Contract}}].
-
-dbg_loc(#env{debug_info = false}, _) ->
-    [];
-dbg_loc(_Env, Ann) ->
-    File = case proplists:get_value(file, Ann, no_file) of
-                no_file -> "";
-                F       -> F
-            end,
-    Line = proplists:get_value(line, Ann, undefined),
-    case Line of
-        undefined -> [];
-        _         -> [{'DBG_LOC', {immediate, File}, {immediate, Line}}]
-    end.
-
-dbg_scoped_vars(#env{debug_info = false}, _, SCode) ->
-    SCode;
-dbg_scoped_vars(_Env, [], SCode) ->
-    SCode;
-dbg_scoped_vars(Env, [{SavedVarName, Var} | Rest], SCode) ->
-    dbg_scoped_vars(Env, Rest, dbg_scoped_var(Env, SavedVarName, Var, SCode));
-dbg_scoped_vars(Env = #env{saved_fresh_names = SavedFreshNames}, [Var | Rest], SCode) ->
-    SavedVarName = maps:get(Var, SavedFreshNames, Var),
-    dbg_scoped_vars(Env, Rest, dbg_scoped_var(Env, SavedVarName, Var, SCode)).
-
-dbg_scoped_var(Env, SavedVarName, Var, SCode) ->
-    case SavedVarName == "_" orelse is_fresh_name(SavedVarName) of
-        true ->
-            SCode;
-        false ->
-            Register = lookup_var(Env, Var),
-            Def      = [{'DBG_DEF',   {immediate, SavedVarName}, Register}],
-            Undef    = [{'DBG_UNDEF', {immediate, SavedVarName}, Register}],
-            Def ++ dbg_undef(Undef, SCode)
-    end.
-
-is_fresh_name([$% | _]) ->
-    true;
-is_fresh_name(_) ->
-    false.
-
-dbg_undef(_Undef, missing) ->
-    missing;
-dbg_undef(Undef, loop) ->
-    [Undef, loop];
-dbg_undef(Undef, switch_body) ->
-    [switch_body, Undef];
-dbg_undef(Undef, {switch, Arg, Type, Alts, Catch}) ->
-    NewAlts   = [ dbg_undef(Undef, Alt) || Alt <- Alts ],
-    NewCatch  = dbg_undef(Undef, Catch),
-    NewSwitch = {switch, Arg, Type, NewAlts, NewCatch},
-    NewSwitch;
-dbg_undef(Undef, SCode) when is_list(SCode) ->
-    lists:droplast(SCode) ++ [dbg_undef(Undef, lists:last(SCode))];
-dbg_undef(Undef, SCode) when is_tuple(SCode); is_atom(SCode) ->
-    [Mnemonic | _] =
-        case is_tuple(SCode) of
-            true  -> tuple_to_list(SCode);
-            false -> [SCode]
-        end,
-    Op = aeb_fate_opcodes:m_to_op(Mnemonic),
-    case aeb_fate_opcodes:end_bb(Op) of
-        true  -> [Undef, SCode];
-        false -> [SCode, Undef]
-    end.
-
 %% -- Phase II ---------------------------------------------------------------
 %%  Optimize
 
 optimize_scode(Funs, Options) ->
     maps:map(fun(Name, Def) -> optimize_fun(Funs, Name, Def, Options) end,
-            Funs).
+             Funs).
 
 flatten(missing) -> missing;
 flatten(Code)    -> lists:map(fun flatten_s/1, lists:flatten(Code)).
@@ -942,10 +835,6 @@ attributes(I) ->
         loop                                  -> Impure(pc, []);
         switch_body                           -> Pure(none, []);
         'RETURN'                              -> Impure(pc, []);
-        {'DBG_LOC', _, _}                     -> Impure(none, []);
-        {'DBG_DEF', _, _}                     -> Impure(none, []);
-        {'DBG_UNDEF', _, _}                   -> Impure(none, []);
-        {'DBG_CONTRACT', _}                   -> Impure(none, []);
         {'RETURNR', A}                        -> Impure(pc, A);
         {'CALL', A}                           -> Impure(?a, [A]);
         {'CALL_R', A, _, B, C, D}             -> Impure(?a, [A, B, C, D]);
@@ -1141,16 +1030,11 @@ independent({i, _, I}, {i, _, J}) ->
     StackI = lists:member(?a, [WI | RI]),
     StackJ = lists:member(?a, [WJ | RJ]),
 
-    ReadStoreI = [] /= [ x || {store, _} <- RI ],
+    if  WI == pc; WJ == pc   -> false;     %% no jumps
-    ReadStoreJ = [] /= [ x || {store, _} <- RJ ],
+        not (PureI or PureJ) -> false;     %% at least one is pure
-
+        StackI and StackJ    -> false;     %% cannot both use the stack
-    if  WI == pc; WJ == pc       -> false;  %% no jumps
+        WI == WJ             -> false;     %% cannot write to the same register
-        not (PureI or PureJ)     -> false;  %% at least one is pure
+        true                 ->
-        StackI and StackJ        -> false;  %% cannot both use the stack
-        WI == WJ                 -> false;  %% cannot write to the same register
-        ReadStoreI and not PureJ -> false;  %% can't read store/state if other is impure
-        ReadStoreJ and not PureI -> false;  %% can't read store/state if other is impure
-        true                     ->
             %% and cannot write to each other's inputs
             not lists:member(WI, RJ) andalso
             not lists:member(WJ, RI)
@@ -1204,8 +1088,7 @@ simpl_top(I, Code, Options) ->
 simpl_top(0, I, Code, _Options) ->
     code_error({optimizer_out_of_fuel, I, Code});
 simpl_top(Fuel, I, Code, Options) ->
-    Rules = [R || R = {Rule, _} <- rules(), proplists:get_value(Rule, Options, true)],
+    apply_rules(Fuel, rules(), I, Code, Options).
-    apply_rules(Fuel, Rules, I, Code, Options).
 
 apply_rules(Fuel, Rules, I, Code, Options) ->
     Cons = fun(X, Xs) -> simpl_top(Fuel - 1, X, Xs, Options) end,
@@ -1232,29 +1115,29 @@ apply_rules_once([{RName, Rule} | Rules], I, Code) ->
 -define(RULE(Name), {Name, fun Name/2}).
 
 merge_rules() ->
-    [?RULE(optimize_push_consume),
+    [?RULE(r_push_consume),
-     ?RULE(optimize_one_shot_var),
+     ?RULE(r_one_shot_var),
-     ?RULE(optimize_write_to_dead_var),
+     ?RULE(r_write_to_dead_var),
-     ?RULE(optimize_inline_switch_target)
+     ?RULE(r_inline_switch_target)
     ].
 
 rules() ->
     merge_rules() ++
-    [?RULE(optimize_swap_push),
+    [?RULE(r_swap_push),
-     ?RULE(optimize_swap_pop),
+     ?RULE(r_swap_pop),
-     ?RULE(optimize_swap_write),
+     ?RULE(r_swap_write),
-     ?RULE(optimize_constant_propagation),
+     ?RULE(r_constant_propagation),
-     ?RULE(optimize_prune_impossible_branches),
+     ?RULE(r_prune_impossible_branches),
-     ?RULE(optimize_single_successful_branch),
+     ?RULE(r_single_successful_branch),
-     ?RULE(optimize_inline_store),
+     ?RULE(r_inline_store),
-     ?RULE(optimize_float_switch_body)
+     ?RULE(r_float_switch_body)
     ].
 
 %% Removing pushes that are immediately consumed.
-optimize_push_consume({i, Ann1, {'STORE', ?a, A}}, Code) ->
+r_push_consume({i, Ann1, {'STORE', ?a, A}}, Code) ->
     inline_push(Ann1, A, 0, Code, []);
 %% Writing directly to memory instead of going through the accumulator.
-optimize_push_consume({i, Ann1, I}, [{i, Ann2, {'STORE', R, ?a}} | Code]) ->
+r_push_consume({i, Ann1, I}, [{i, Ann2, {'STORE', R, ?a}} | Code]) ->
     IsPush =
         case op_view(I) of
             {_, ?a, _} -> true;
@@ -1266,7 +1149,7 @@ optimize_push_consume({i, Ann1, I}, [{i, Ann2, {'STORE', R, ?a}} | Code]) ->
         end,
     if IsPush -> {[{i, merge_ann(Ann1, Ann2), setelement(2, I, R)}], Code};
        true   -> false end;
-optimize_push_consume(_, _) -> false.
+r_push_consume(_, _) -> false.
 
 inline_push(Ann, Arg, Stack, [{i, _, switch_body} = AI | Code], Acc) ->
     {AI1, {i, Ann1, _}} = swap_instrs({i, Ann, {'STORE', ?a, Arg}}, AI),
@@ -1299,7 +1182,7 @@ split_stack_arg(N, [A | As], Acc) ->
     split_stack_arg(N1, As, [A | Acc]).
 
 %% Move PUSHes past non-stack instructions.
-optimize_swap_push(Push = {i, _, PushI}, [I | Code]) ->
+r_swap_push(Push = {i, _, PushI}, [I | Code]) ->
     case op_view(PushI) of
         {_, ?a, _} ->
             case independent(Push, I) of
@@ -1310,10 +1193,10 @@ optimize_swap_push(Push = {i, _, PushI}, [I | Code]) ->
             end;
         _ -> false
     end;
-optimize_swap_push(_, _) -> false.
+r_swap_push(_, _) -> false.
 
 %% Move non-stack instruction past POPs.
-optimize_swap_pop(IA = {i, _, I}, [JA = {i, _, J} | Code]) ->
+r_swap_pop(IA = {i, _, I}, [JA = {i, _, J} | Code]) ->
     case independent(IA, JA) of
         true ->
             case {op_view(I), op_view(J)} of
@@ -1321,7 +1204,7 @@ optimize_swap_pop(IA = {i, _, I}, [JA = {i, _, J} | Code]) ->
                 {_, false} -> false;
                 {{_, IR, IAs}, {_, RJ, JAs}} ->
                     NonStackI = not lists:member(?a, [IR | IAs]),
-                    %% RJ /= ?a to not conflict with optimize_swap_push
+                    %% RJ /= ?a to not conflict with r_swap_push
                     PopJ      = RJ /= ?a andalso lists:member(?a, JAs),
                     case NonStackI andalso PopJ of
                         false -> false;
@@ -1332,22 +1215,22 @@ optimize_swap_pop(IA = {i, _, I}, [JA = {i, _, J} | Code]) ->
             end;
         false -> false
     end;
-optimize_swap_pop(_, _) -> false.
+r_swap_pop(_, _) -> false.
 
 %% Match up writes to variables with instructions further down.
-optimize_swap_write(I = {i, _, _}, [J | Code]) ->
+r_swap_write(I = {i, _, _}, [J | Code]) ->
     case {var_writes(I), independent(I, J)} of
         {[_], true} ->
             {J1, I1} = swap_instrs(I, J),
-            optimize_swap_write([J1], I1, Code);
+            r_swap_write([J1], I1, Code);
         _ -> false
     end;
-optimize_swap_write(_, _) -> false.
+r_swap_write(_, _) -> false.
 
-optimize_swap_write(Pre, I, [{i, _, switch_body} = J | Code]) ->
+r_swap_write(Pre, I, [{i, _, switch_body} = J | Code]) ->
     {J1, I1} = swap_instrs(I, J),
-    optimize_swap_write([J1 | Pre], I1, Code);
+    r_swap_write([J1 | Pre], I1, Code);
-optimize_swap_write(Pre, I, Code0 = [J | Code]) ->
+r_swap_write(Pre, I, Code0 = [J | Code]) ->
     case apply_rules_once(merge_rules(), I, Code0) of
         {_Rule, New, Rest} ->
             {lists:reverse(Pre) ++ New, Rest};
@@ -1356,27 +1239,27 @@ optimize_swap_write(Pre, I, Code0 = [J | Code]) ->
                 false -> false;
                 true  ->
                     {J1, I1} = swap_instrs(I, J),
-                    optimize_swap_write([J1 | Pre], I1, Code)
+                    r_swap_write([J1 | Pre], I1, Code)
             end
     end;
-optimize_swap_write(_, _, _) -> false.
+r_swap_write(_, _, _) -> false.
 
 %% Precompute instructions with known values
-optimize_constant_propagation(Cons = {i, Ann1, {'CONS', R, X, Xs}}, [{i, Ann, {'IS_NIL', S, R}} | Code]) ->
+r_constant_propagation(Cons = {i, Ann1, {'CONS', R, X, Xs}}, [{i, Ann, {'IS_NIL', S, R}} | Code]) ->
     Store = {i, Ann, {'STORE', S, ?i(false)}},
     Cons1 = case R of
                 ?a -> {i, Ann1, {'CONS', ?void, X, Xs}};
                 _  -> Cons
             end,
     {[Cons1, Store], Code};
-optimize_constant_propagation(Nil = {i, Ann1, {'NIL', R}}, [{i, Ann, {'IS_NIL', S, R}} | Code]) ->
+r_constant_propagation(Nil = {i, Ann1, {'NIL', R}}, [{i, Ann, {'IS_NIL', S, R}} | Code]) ->
     Store = {i, Ann, {'STORE', S, ?i(true)}},
     Nil1 = case R of
                ?a -> {i, Ann1, {'NIL', ?void}};
                _  -> Nil
            end,
     {[Nil1, Store], Code};
-optimize_constant_propagation({i, Ann, I}, Code) ->
+r_constant_propagation({i, Ann, I}, Code) ->
     case op_view(I) of
         false -> false;
         {Op, R, As} ->
@@ -1390,7 +1273,7 @@ optimize_constant_propagation({i, Ann, I}, Code) ->
                     end
             end
     end;
-optimize_constant_propagation(_, _) -> false.
+r_constant_propagation(_, _) -> false.
 
 eval_op('ADD', [X, Y]) when is_integer(X), is_integer(Y) -> X + Y;
 eval_op('SUB', [X, Y]) when is_integer(X), is_integer(Y) -> X - Y;
@@ -1409,12 +1292,12 @@ eval_op('NOT', [false]) -> true;
 eval_op(_, _)           -> no_eval.   %% TODO: bits?
 
 %% Prune impossible branches from switches
-optimize_prune_impossible_branches({switch, ?i(V), Type, Alts, missing}, Code) ->
+r_prune_impossible_branches({switch, ?i(V), Type, Alts, missing}, Code) ->
     case pick_branch(Type, V, Alts) of
         false -> false;
         Alt   -> {Alt, Code}
     end;
-optimize_prune_impossible_branches({switch, ?i(V), boolean, [False, True] = Alts, Def}, Code) when V == true; V == false ->
+r_prune_impossible_branches({switch, ?i(V), boolean, [False, True] = Alts, Def}, Code) when V == true; V == false ->
     Alts1 = [if V -> missing; true -> False   end,
              if V -> True;    true -> missing end],
     case Alts == Alts1 of
@@ -1425,7 +1308,7 @@ optimize_prune_impossible_branches({switch, ?i(V), boolean, [False, True] = Alts
                 _                  -> {[{switch, ?i(V), boolean, Alts1, Def}], Code}
             end
     end;
-optimize_prune_impossible_branches(Variant = {i, _, {'VARIANT', R, ?i(_), ?i(Tag), ?i(_)}},
+r_prune_impossible_branches(Variant = {i, _, {'VARIANT', R, ?i(_), ?i(Tag), ?i(_)}},
                             [{switch, R, Type = {variant, _}, Alts, missing} | Code]) when is_integer(Tag) ->
     case {R, lists:nth(Tag + 1, Alts)} of
         {_, missing} ->
@@ -1441,7 +1324,7 @@ optimize_prune_impossible_branches(Variant = {i, _, {'VARIANT', R, ?i(_), ?i(Tag
                 false -> {Alt, Code}
             end
     end;
-optimize_prune_impossible_branches(_, _) -> false.
+r_prune_impossible_branches(_, _) -> false.
 
 pick_branch(boolean, V, [False, True]) when V == true; V == false ->
     Alt = if V -> True; true -> False end,
@@ -1454,7 +1337,7 @@ pick_branch(_Type, _V, _Alts) ->
 
 %% If there's a single branch that doesn't abort we can push the code for that
 %% out of the switch.
-optimize_single_successful_branch({switch, R, Type, Alts, Def}, Code) ->
+r_single_successful_branch({switch, R, Type, Alts, Def}, Code) ->
     case push_code_out_of_switch([Def | Alts]) of
         {_, none} -> false;
         {_, many} -> false;
@@ -1462,7 +1345,7 @@ optimize_single_successful_branch({switch, R, Type, Alts, Def}, Code) ->
         {[Def1 | Alts1], PushedOut} ->
             {[{switch, R, Type, Alts1, Def1} | PushedOut], Code}
     end;
-optimize_single_successful_branch(_, _) -> false.
+r_single_successful_branch(_, _) -> false.
 
 push_code_out_of_switch([]) -> {[], none};
 push_code_out_of_switch([Alt | Alts]) ->
@@ -1498,7 +1381,7 @@ does_abort({switch, _, _, Alts, Def}) ->
 does_abort(_) -> false.
 
 %% STORE R A, SWITCH R --> SWITCH A
-optimize_inline_switch_target({i, Ann, {'STORE', R, A}}, [{switch, R, Type, Alts, Def} | Code]) ->
+r_inline_switch_target({i, Ann, {'STORE', R, A}}, [{switch, R, Type, Alts, Def} | Code]) ->
     Ann1   =
         case is_reg(A) of
             true  -> Ann#{ live_out := ordsets:add_element(A, maps:get(live_out, Ann)) };
@@ -1517,18 +1400,18 @@ optimize_inline_switch_target({i, Ann, {'STORE', R, A}}, [{switch, R, Type, Alts
             end;
         _        -> false %% impossible
     end;
-optimize_inline_switch_target(_, _) -> false.
+r_inline_switch_target(_, _) -> false.
 
 %% Float switch-body to closest switch
-optimize_float_switch_body(I = {i, _, _}, [J = {i, _, switch_body} | Code]) ->
+r_float_switch_body(I = {i, _, _}, [J = {i, _, switch_body} | Code]) ->
     {J1, I1} = swap_instrs(I, J),
     {[], [J1, I1 | Code]};
-optimize_float_switch_body(_, _) -> false.
+r_float_switch_body(_, _) -> false.
 
 %% Inline stores
-optimize_inline_store({i, _, {'STORE', R, R}}, Code) ->
+r_inline_store({i, _, {'STORE', R, R}}, Code) ->
     {[], Code};
-optimize_inline_store(I = {i, _, {'STORE', R = {var, _}, A}}, Code) ->
+r_inline_store(I = {i, _, {'STORE', R = {var, _}, A}}, Code) ->
     %% Not when A is var unless updating the annotations properly.
     Inline = case A of
                  {arg, _}   -> true;
@@ -1536,13 +1419,13 @@ optimize_inline_store(I = {i, _, {'STORE', R = {var, _}, A}}, Code) ->
                  {store, _} -> true;
                  _          -> false
              end,
-    if Inline -> optimize_inline_store([I], false, R, A, Code);
+    if Inline -> r_inline_store([I], false, R, A, Code);
        true   -> false end;
-optimize_inline_store(_, _) -> false.
+r_inline_store(_, _) -> false.
 
-optimize_inline_store(Acc, Progress, R, A, [I = {i, _, switch_body} | Code]) ->
+r_inline_store(Acc, Progress, R, A, [I = {i, _, switch_body} | Code]) ->
-    optimize_inline_store([I | Acc], Progress, R, A, Code);
+    r_inline_store([I | Acc], Progress, R, A, Code);
-optimize_inline_store(Acc, Progress, R, A, [{i, Ann, I} | Code]) ->
+r_inline_store(Acc, Progress, R, A, [{i, Ann, I} | Code]) ->
     #{ write := W } = attributes(I),
     Inl = fun(X) when X == R -> A; (X) -> X end,
     case live_in(R, Ann) of
@@ -1562,14 +1445,14 @@ optimize_inline_store(Acc, Progress, R, A, [{i, Ann, I} | Code]) ->
             case lists:member(W, [R, A]) of
                 true when Progress1 -> {lists:reverse(Acc1), Code};
                 true                -> false;
-                false               -> optimize_inline_store(Acc1, Progress1, R, A, Code)
+                false               -> r_inline_store(Acc1, Progress1, R, A, Code)
             end
     end;
-optimize_inline_store(Acc, true, _, _, Code) -> {lists:reverse(Acc), Code};
+r_inline_store(Acc, true, _, _, Code) -> {lists:reverse(Acc), Code};
-optimize_inline_store(_, false, _, _, _) -> false.
+r_inline_store(_, false, _, _, _) -> false.
 
 %% Shortcut write followed by final read
-optimize_one_shot_var({i, Ann1, I}, [{i, Ann2, J} | Code]) ->
+r_one_shot_var({i, Ann1, I}, [{i, Ann2, J} | Code]) ->
     case op_view(I) of
         {Op, R = {var, _}, As} ->
             Copy = case J of
@@ -1583,11 +1466,11 @@ optimize_one_shot_var({i, Ann1, I}, [{i, Ann2, J} | Code]) ->
             end;
         _ -> false
     end;
-optimize_one_shot_var(_, _) -> false.
+r_one_shot_var(_, _) -> false.
 
 %% Remove writes to dead variables
-optimize_write_to_dead_var({i, _, {'STORE', ?void, ?a}}, _) -> false; %% Avoid looping
+r_write_to_dead_var({i, _, {'STORE', ?void, ?a}}, _) -> false; %% Avoid looping
-optimize_write_to_dead_var({i, Ann, I}, Code) ->
+r_write_to_dead_var({i, Ann, I}, Code) ->
     #{ pure := Pure } = attributes(I),
     case op_view(I) of
         {_Op, R, As} when R /= ?a, Pure ->
@@ -1600,10 +1483,9 @@ optimize_write_to_dead_var({i, Ann, I}, Code) ->
             end;
         _ -> false
     end;
-optimize_write_to_dead_var(_, _) -> false.
+r_write_to_dead_var(_, _) -> false.
 
 op_view({'ABORT', R}) -> {'ABORT', none, [R]};
-op_view({'EXIT', R}) -> {'EXIT', none, [R]};
 op_view(T) when is_tuple(T) ->
     [Op, R | As] = tuple_to_list(T),
     CheckReads = fun(Rs, X) -> case [] == Rs -- [dst, src] of true -> X; false -> false end end,
@@ -1670,23 +1552,7 @@ bb(_Name, Code) ->
     Blocks  = lists:flatmap(fun split_calls/1, Blocks1),
     Labels  = maps:from_list([ {Ref, I} || {I, {Ref, _}} <- with_ixs(Blocks) ]),
     BBs     = [ set_labels(Labels, B) || B <- Blocks ],
-    maps:from_list(dbg_loc_filter(BBs)).
+    maps:from_list(BBs).
-
-%% Filter DBG_LOC instructions to keep one instruction per line
-dbg_loc_filter(BBs) ->
-    dbg_loc_filter(BBs, [], [], sets:new()).
-
-dbg_loc_filter([], _, AllBlocks, _) ->
-    lists:reverse(AllBlocks);
-dbg_loc_filter([{I, []} | Rest], AllOps, AllBlocks, DbgLocs) ->
-    dbg_loc_filter(Rest, [], [{I, lists:reverse(AllOps)} | AllBlocks], DbgLocs);
-dbg_loc_filter([{I, [Op = {'DBG_LOC', _, _} | Ops]} | Rest], AllOps, AllBlocks, DbgLocs) ->
-    case sets:is_element(Op, DbgLocs) of
-        true  -> dbg_loc_filter([{I, Ops} | Rest], AllOps, AllBlocks, DbgLocs);
-        false -> dbg_loc_filter([{I, Ops} | Rest], [Op | AllOps], AllBlocks, sets:add_element(Op, DbgLocs))
-    end;
-dbg_loc_filter([{I, [Op | Ops]} | Rest], AllOps, AllBlocks, DbgLocs) ->
-    dbg_loc_filter([{I, Ops} | Rest], [Op | AllOps], AllBlocks, DbgLocs).
 
 %% -- Break up scode into basic blocks --
 

src/aeso_parser.erl

@@ -96,29 +96,17 @@ decl() ->
     choice(
       %% Contract declaration
     [ ?RULE(token(main), keyword(contract),
-            con(), tok('='), maybe_block(decl()), {contract_main, _2, _3, [], _5})
+            con(), tok('='), maybe_block(decl()), {contract_main, _2, _3, _5})
-    , ?RULE(token(main), keyword(contract),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), {contract_main, _2, _3, _5, _7})
     , ?RULE(keyword(contract),
-            con(), tok('='), maybe_block(decl()), {contract_child, _1, _2, [], _4})
+            con(), tok('='), maybe_block(decl()), {contract_child, _1, _2, _4})
-    , ?RULE(keyword(contract),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), {contract_child, _1, _2, _4, _6})
     , ?RULE(keyword(contract), token(interface),
-            con(), tok('='), maybe_block(decl()), {contract_interface, _1, _3, [], _5})
+            con(), tok('='), maybe_block(decl()), {contract_interface, _1, _3, _5})
-    , ?RULE(keyword(contract), token(interface),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), {contract_interface, _1, _3, _5, _7})
     , ?RULE(token(payable), token(main), keyword(contract),
-            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_main, _3, _4, [], _6}))
+            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_main, _3, _4, _6}))
-    , ?RULE(token(payable), token(main), keyword(contract),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_main, _3, _4, _6, _8}))
     , ?RULE(token(payable), keyword(contract),
-            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_child, _2, _3, [], _5}))
+            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_child, _2, _3, _5}))
-    , ?RULE(token(payable), keyword(contract),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_child, _2, _3, _5, _7}))
     , ?RULE(token(payable), keyword(contract), token(interface),
-            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_interface, _2, _4, [], _6}))
+            con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_interface, _2, _4, _6}))
-    , ?RULE(token(payable), keyword(contract), token(interface),
-            con(), tok(':'), comma_sep(con()), tok('='), maybe_block(decl()), add_modifiers([_1], {contract_interface, _2, _4, _6, _8}))
 
 
     , ?RULE(keyword(namespace), con(), tok('='), maybe_block(decl()), {namespace, _1, _2, _4})
@@ -146,9 +134,19 @@ fun_block(Mods, Kind, [Decl]) ->
 fun_block(Mods, Kind, Decls) ->
     {block, get_ann(Kind), [ add_modifiers(Mods, Kind, Decl) || Decl <- Decls ]}.
 
+typevar_constraint() ->
+    ?RULE(tvar(), keyword(is), id(), {constraint, get_ann(_1), _1, _3}).
+
+typevars_constraints() ->
+    ?RULE(comma_sep1(typevar_constraint()), tok(';'), _1).
+
+fundecl() ->
+    choice([?RULE(id(), tok(':'), typevars_constraints(), type(),
+                  {fun_decl, get_ann(_1), _1, {constrained_t, get_ann(_1), _3, _4}}),
+            ?RULE(id(), tok(':'), type(), {fun_decl, get_ann(_1), _1, _3})]).
+
 fundef_or_decl() ->
-    choice([?RULE(id(), tok(':'), type(), {fun_decl, get_ann(_1), _1, _3}),
+    choice([fundecl(), fundef()]).
-            fundef()]).
 
 using() ->
     Alias = {keyword(as), con()},
@@ -359,12 +357,9 @@ exprAtom() ->
         , ?RULE(tok('['), Expr, binop('..'), Expr, tok(']'), _3(_2, _4))
         , ?RULE(keyword('('), comma_sep(Expr), tok(')'), tuple_e(_1, _2))
         , letpat()
-        , hole()
         ])
     end).
 
-hole() -> ?RULE(token('???'), {id, get_ann(_1), "???"}).
-
 comprehension_exp() ->
     ?LAZY_P(choice(
       [ comprehension_bind()
@@ -542,6 +537,7 @@ parens(P)   -> between(tok('('), P, tok(')')).
 braces(P)   -> between(tok('{'), P, tok('}')).
 brackets(P) -> between(tok('['), P, tok(']')).
 comma_sep(P) -> sep(P, tok(',')).
+comma_sep1(P) -> sep1(P, tok(',')).
 
 paren_list(P)   -> parens(comma_sep(P)).
 brace_list(P)   -> braces(comma_sep(P)).

src/aeso_pretty.erl

@@ -151,16 +151,12 @@ decl(D, Options) ->
     with_options(Options, fun() -> decl(D) end).
 
 -spec decl(aeso_syntax:decl()) -> doc().
-decl({Con, Attrs, C, Is, Ds}) when ?IS_CONTRACT_HEAD(Con) ->
+decl({Con, Attrs, C, Ds}) when ?IS_CONTRACT_HEAD(Con) ->
     Mod = fun({Mod, true}) when Mod == payable ->
                   text(atom_to_list(Mod));
              (_) -> empty() end,
-    ImplsList = case Is of
-                    [] -> [empty()];
-                    _  -> [text(":"), par(punctuate(text(","), lists:map(fun name/1, Is)), 0)]
-                end,
     block(follow( hsep(lists:map(Mod, Attrs) ++ [contract_head(Con)])
-                , hsep([name(C)] ++ ImplsList ++ [text("=")])), decls(Ds));
+                , hsep(name(C), text("="))), decls(Ds));
 decl({namespace, _, C, Ds}) ->
     block(follow(text("namespace"), hsep(name(C), text("="))), decls(Ds));
 decl({pragma, _, Pragma}) -> pragma(Pragma);
@@ -261,8 +257,6 @@ type(Type, Options) ->
     with_options(Options, fun() -> type(Type) end).
 
 -spec type(aeso_syntax:type()) -> doc().
-type(F = {fun_t, _, _, var_args, _}) ->
-    type(setelement(4, F, [var_args]));
 type({fun_t, _, Named, Args, Ret}) ->
     follow(hsep(args_type(Named ++ Args), text("=>")), type(Ret));
 type({type_sig, _, Named, Args, Ret}) ->
@@ -291,8 +285,8 @@ type(T = {qid, _, _})  -> name(T);
 type(T = {con, _, _})  -> name(T);
 type(T = {qcon, _, _}) -> name(T);
 type(T = {tvar, _, _}) -> name(T);
-
+type({constrained_t, _, Cs, T}) ->
-type(var_args) -> text("var_args").
+    beside([name(T), text(" is "), tuple(lists:map(fun expr/1, Cs))]).
 
 -spec args_type([aeso_syntax:type()]) -> doc().
 args_type(Args) ->
@@ -434,7 +428,6 @@ lc_bind(Let) ->
 bin_prec('..')   -> {  0,   0,   0};  %% Always printed inside '[ ]'
 bin_prec('=')    -> {  0,   0,   0};  %% Always printed inside '[ ]'
 bin_prec('@')    -> {  0,   0,   0};  %% Only in error messages
-bin_prec('|>')   -> {150, 150, 200};
 bin_prec('||')   -> {200, 300, 200};
 bin_prec('&&')   -> {300, 400, 300};
 bin_prec('<')    -> {400, 500, 500};

src/aeso_scan.erl

@@ -45,7 +45,7 @@ lexer() ->
 
     Keywords = ["contract", "include", "let", "switch", "type", "record", "datatype", "if", "elif", "else", "function",
                 "stateful", "payable", "true", "false", "mod", "public", "entrypoint", "private", "indexed", "namespace",
-                "interface", "main", "using", "as", "for", "hiding"
+                "interface", "main", "using", "as", "for", "hiding", "is"
                ],
     KW = string:join(Keywords, "|"),
 

src/aeso_syntax.erl

@@ -10,10 +10,10 @@
 
 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).
 
--export_type([ann_file/0, ann_line/0, ann_col/0, ann_origin/0, ann_format/0, ann/0]).
+-export_type([ann_line/0, ann_col/0, ann_origin/0, ann_format/0, ann/0]).
 -export_type([name/0, id/0, con/0, qid/0, qcon/0, tvar/0, op/0]).
 -export_type([bin_op/0, un_op/0]).
--export_type([decl/0, letbind/0, typedef/0, pragma/0, fundecl/0]).
+-export_type([decl/0, letbind/0, typedef/0, pragma/0]).
 -export_type([arg/0, field_t/0, constructor_t/0, named_arg_t/0]).
 -export_type([type/0, constant/0, expr/0, arg_expr/0, field/1, stmt/0, alt/0, lvalue/0, elim/0, pat/0]).
 -export_type([ast/0]).
@@ -24,10 +24,9 @@
 -type ann_col()    :: integer().
 -type ann_origin() :: system | user.
 -type ann_format() :: '?:' | hex | infix | prefix | elif.
--type ann_file()   :: string() | no_file.
 
--type ann() :: [ {file, ann_file()} | {line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()}
+-type ann() :: [ {line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()}
-               | stateful | private | payable | main | interface | entrypoint].
+               | stateful | private | payable | main | interface].
 
 -type name() :: string().
 -type id()   :: {id,   ann(), name()}.
@@ -39,11 +38,10 @@
 -type namespace_alias() :: none | con().
 -type namespace_parts() :: none | {for, [id()]} | {hiding, [id()]}.
 
--type decl() :: {contract_main, ann(), con(), [con()], [decl()]}
+-type decl() :: {contract_main, ann(), con(), [decl()]}
-              | {contract_child, ann(), con(), [con()], [decl()]}
+              | {contract_child, ann(), con(), [decl()]}
-              | {contract_interface, ann(), con(), [con()], [decl()]}
+              | {contract_interface, ann(), con(), [decl()]}
               | {namespace, ann(), con(), [decl()]}
-              | {include, ann(), {string, ann(), string()}}
               | {pragma, ann(), pragma()}
               | {type_decl, ann(), id(), [tvar()]} % Only for error msgs
               | {type_def, ann(), id(), [tvar()], typedef()}
@@ -81,11 +79,14 @@
 
 -type constructor_t() :: {constr_t, ann(), con(), [type()]}.
 
+-type tvar_constraint() :: {constraint, ann(), tvar(), id()}.
+
 -type type() :: {fun_t, ann(), [named_arg_t()], [type()], type()}
               | {app_t, ann(), type(), [type()]}
               | {tuple_t, ann(), [type()]}
               | {args_t, ann(), [type()]}   %% old tuple syntax, old for error messages
               | {bytes_t, ann(), integer() | any}
+              | {constrained_t, ann(), [tvar_constraint()], type()}
               | id()  | qid()
               | con() | qcon()  %% contracts
               | tvar().
@@ -107,7 +108,7 @@
 
 -type bin_op() :: '+' | '-' | '*' | '/' | mod | '^'
                 | '++' | '::' | '<' | '>' | '=<' | '>=' | '==' | '!='
-                | '||' | '&&' | '..' | '|>'.
+                | '||' | '&&' | '..'.
 -type un_op() :: '-' | '!'.
 
 -type expr()

src/aeso_syntax_utils.erl

@@ -31,13 +31,11 @@
             | aeso_syntax:field(aeso_syntax:expr())
             | aeso_syntax:stmt().
 fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
-    ExprKind = if K == bind_expr -> bind_expr; true -> expr end,
-    TypeKind = if K == bind_type -> bind_type; true -> type end,
     Sum  = fun(Xs) -> lists:foldl(Plus, Zero, Xs) end,
     Same = fun(A) -> fold(Alg, Fun, K, A) end,
     Decl = fun(D) -> fold(Alg, Fun, decl, D) end,
-    Type = fun(T) -> fold(Alg, Fun, TypeKind, T) end,
+    Type = fun(T) -> fold(Alg, Fun, type, T) end,
-    Expr = fun(E) -> fold(Alg, Fun, ExprKind, E) end,
+    Expr = fun(E) -> fold(Alg, Fun, expr, E) end,
     BindExpr = fun(P) -> fold(Alg, Fun, bind_expr, P) end,
     BindType = fun(T) -> fold(Alg, Fun, bind_type, T) end,
     Top = Fun(K, X),
@@ -63,6 +61,7 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
             {fun_t, _, Named, Args, Ret} -> Type([Named, Args, Ret]);
             {app_t, _, T, Ts}            -> Type([T | Ts]);
             {tuple_t, _, Ts}             -> Type(Ts);
+            {constrained_t, _, _, T}     -> Type(T);
             %% named_arg_t()
             {named_arg_t, _, _, T, E} -> Plus(Type(T), Expr(E));
             %% expr()
@@ -157,3 +156,4 @@ used(D) ->
                (_, _)             -> #{}
             end, decl, D)),
     lists:filter(NotBound, Xs).
+

src/aesophia.app.src

@@ -1,6 +1,6 @@
 {application, aesophia,
  [{description, "Compiler for Aeternity Sophia language"},
-  {vsn, "7.3.0"},
+  {vsn, "6.1.0"},
   {registered, []},
   {applications,
    [kernel,

test/aeso_aci_tests.erl

@@ -21,7 +21,7 @@ test_cases(1) ->
 		 "  payable stateful entrypoint a(i : int) = i+1\n">>,
     MapACI = #{contract =>
 		   #{name => <<"C">>,
-		     typedefs => [],
+		     type_defs => [],
          payable => true,
          kind => contract_main,
 		     functions =>
@@ -43,7 +43,7 @@ test_cases(2) ->
     MapACI = #{contract =>
                    #{name => <<"C">>, payable => false,
                      kind => contract_main,
-                     typedefs =>
+                     type_defs =>
                          [#{name => <<"allan">>,
                             typedef => <<"int">>,
                             vars => []}],
@@ -76,7 +76,7 @@ test_cases(3) ->
 		     name => <<"C">>, payable => false, kind => contract_main,
          event => #{variant => [#{<<"SingleEventDefined">> => []}]},
          state => <<"unit">>,
-		     typedefs =>
+		     type_defs =>
              [#{name => <<"bert">>,
                 typedef =>
                     #{variant =>
@@ -127,7 +127,7 @@ check_stub(Stub, Options) ->
         Ast ->
             try
                 %% io:format("AST: ~120p\n", [Ast]),
-                aeso_ast_infer_types:infer(Ast, [no_code])
+                aeso_ast_infer_types:infer(Ast, [])
             catch throw:{type_errors, TE} ->
                 io:format("Type error:\n~s\n", [TE]),
                 error(TE);

test/aeso_calldata_tests.erl

@@ -29,7 +29,7 @@ calldata_aci_test_() ->
      [ {"Testing " ++ ContractName ++ " contract calling " ++ Fun,
         fun() ->
            ContractString       = aeso_test_utils:read_contract(ContractName),
-           {ok, ContractACIBin} = aeso_aci:contract_interface(string, ContractString, [no_code]),
+           {ok, ContractACIBin} = aeso_aci:contract_interface(string, ContractString),
            ContractACI = binary_to_list(ContractACIBin),
            io:format("ACI:\n~s\n", [ContractACIBin]),
            FateExprs = ast_exprs(ContractACI, Fun, Args),
@@ -39,7 +39,7 @@ calldata_aci_test_() ->
         end} || {ContractName, Fun, Args} <- compilable_contracts()].
 
 parse_args(Fun, Args) ->
-    [{contract_main, _, _, _, [{letfun, _, _, _, _, [{guarded, _, [], {app, _, _, AST}}]}]}] =
+    [{contract_main, _, _, [{letfun, _, _, _, _, [{guarded, _, [], {app, _, _, AST}}]}]}] =
         aeso_parser:string("main contract Temp = function foo() = " ++ Fun ++ "(" ++ string:join(Args, ", ") ++ ")"),
     strip_ann(AST).
 

test/aeso_compiler_tests.erl

@@ -45,6 +45,12 @@ simple_compile_test_() ->
            check_errors(ExpectedErrors, Errors)
        end} ||
            {ContractName, ExpectedErrors} <- failing_contracts() ] ++
+    [ {"Testing code generation error messages of " ++ ContractName,
+       fun() ->
+               Errors = compile(ContractName),
+               check_errors([ExpectedError], Errors)
+       end} ||
+           {ContractName, ExpectedError} <- failing_code_gen_contracts()] ++
     [ {"Testing include with explicit files",
        fun() ->
            FileSystem = maps:from_list(
@@ -69,7 +75,6 @@ simple_compile_test_() ->
     [ {"Testing warning messages",
        fun() ->
            #{ warnings := Warnings } = compile("warnings", [warn_all]),
-           #{ warnings := [] } = compile("warning_unused_include_no_include", [warn_all]),
            check_warnings(warnings(), Warnings)
        end} ] ++
     [].
@@ -197,32 +202,6 @@ compilable_contracts() ->
      "assign_patterns",
      "patterns_guards",
      "pipe_operator",
-     "polymorphism_contract_implements_interface",
-     "polymorphism_contract_multi_interface",
-     "polymorphism_contract_interface_extends_interface",
-     "polymorphism_contract_interface_extensions",
-     "polymorphism_contract_interface_same_decl_multi_interface",
-     "polymorphism_contract_interface_same_name_same_type",
-     "polymorphism_variance_switching_chain_create",
-     "polymorphism_variance_switching_void_supertype",
-     "polymorphism_variance_switching_unify_with_interface_decls",
-     "polymorphism_preserve_or_add_payable_contract",
-     "polymorphism_preserve_or_add_payable_entrypoint",
-     "polymorphism_preserve_or_remove_stateful_entrypoint",
-     "missing_init_fun_state_unit",
-     "complex_compare_leq",
-     "complex_compare",
-     "higher_order_compare",
-     "higher_order_map_keys",
-     "higher_order_state",
-     "polymorphic_compare",
-     "polymorphic_entrypoint",
-     "polymorphic_entrypoint_return",
-     "polymorphic_map_keys",
-     "unapplied_contract_call",
-     "unapplied_named_arg_builtin",
-     "resolve_field_constraint_by_arity",
-     "toplevel_constants",
      "test" % Custom general-purpose test file. Keep it last on the list.
     ].
 
@@ -286,12 +265,10 @@ warnings() ->
         "The function `called_unused_function2` is defined but never used.">>,
       <<?PosW(48, 5)
         "Unused return value.">>,
-      <<?PosW(60, 5)
+      <<?PosW(53, 44)
-        "The function `dec` is defined but never used.">>,
+        "The constraint on the type variable `'a` is a duplication of the constraint at line 53, column 34">>,
-      <<?PosW(73, 9)
+      <<?PosW(65, 5)
-        "The definition of `const` shadows an older definition at line 70, column 3.">>,
+        "The function `dec` is defined but never used.">>
-      <<?PosW(84, 7)
-        "The constant `c` is defined but never used.">>
      ]).
 
 failing_contracts() ->
@@ -308,26 +285,34 @@ failing_contracts() ->
 
     %% Type errors
     , ?TYPE_ERROR(name_clash,
-       [<<?Pos(4, 3)
+       [<<?Pos(14, 3)
-          "Duplicate definitions of `double_def` at\n"
-          "  - line 3, column 3\n"
-          "  - line 4, column 3">>,
-        <<?Pos(7, 3)
           "Duplicate definitions of `abort` at\n"
           "  - (builtin location)\n"
-          "  - line 7, column 3">>,
+          "  - line 14, column 3">>,
-        <<?Pos(8, 3)
+        <<?Pos(15, 3)
           "Duplicate definitions of `require` at\n"
           "  - (builtin location)\n"
+          "  - line 15, column 3">>,
+        <<?Pos(11, 3)
+          "Duplicate definitions of `double_def` at\n"
+          "  - line 10, column 3\n"
+          "  - line 11, column 3">>,
+        <<?Pos(5, 3)
+          "Duplicate definitions of `double_proto` at\n"
+          "  - line 4, column 3\n"
+          "  - line 5, column 3">>,
+        <<?Pos(8, 3)
+          "Duplicate definitions of `proto_and_def` at\n"
+          "  - line 7, column 3\n"
           "  - line 8, column 3">>,
-        <<?Pos(9, 3)
+        <<?Pos(16, 3)
           "Duplicate definitions of `put` at\n"
           "  - (builtin location)\n"
-          "  - line 9, column 3">>,
+          "  - line 16, column 3">>,
-        <<?Pos(10, 3)
+        <<?Pos(17, 3)
           "Duplicate definitions of `state` at\n"
           "  - (builtin location)\n"
-          "  - line 10, column 3">>])
+          "  - line 17, column 3">>])
     , ?TYPE_ERROR(type_errors,
        [<<?Pos(17, 23)
           "Unbound variable `zz`">>,
@@ -581,7 +566,7 @@ failing_contracts() ->
       ])
     , ?TYPE_ERROR(list_comp_bad_shadow,
       [<<?Pos(2, 53)
-         "Cannot unify `string` and `int`\n"
+         "Cannot unify `int` and `string`\n"
          "when checking the type of the pattern `x : int` against the expected type `string`">>
       ])
     , ?TYPE_ERROR(map_as_map_key,
@@ -663,6 +648,10 @@ failing_contracts() ->
          [<<?Pos(5, 28)
             "Invalid call to contract entrypoint `Foo.foo`.\n"
             "It must be called as `c.foo` for some `c : Foo`.">>])
+    , ?TYPE_ERROR(toplevel_let,
+                  [<<?Pos(2, 7)
+                     "Toplevel \"let\" definitions are not supported. "
+                     "Value `this_is_illegal` could be replaced by 0-argument function.">>])
     , ?TYPE_ERROR(empty_typedecl,
                   [<<?Pos(2, 8)
                      "Empty type declarations are not supported. "
@@ -739,22 +728,10 @@ failing_contracts() ->
                      "Conflicting updates for field 'foo'">>])
     , ?TYPE_ERROR(factories_type_errors,
                   [<<?Pos(10,18)
-                     "Chain.clone requires `ref` named argument of contract type.">>,
+                    "Chain.clone requires `ref` named argument of contract type.">>,
                    <<?Pos(11,18)
-                     "Cannot unify `(gas : int, value : int, protected : bool) => if(protected, option(void), void)` and `(gas : int, value : int, protected : bool, int, bool) => if(protected, option(void), void)`\n"
+                     "Cannot unify `(gas : int, value : int, protected : bool) => if(protected, option(void), void)` and `(gas : int, value : int, protected : bool, int, bool) => 'b`\n"
-                     "when checking contract construction of type\n"
+                     "when checking contract construction of type\n  (gas : int, value : int, protected : bool) =>\n    if(protected, option(void), void) (at line 11, column 18)\nagainst the expected type\n  (gas : int, value : int, protected : bool, int, bool) => 'b">>,
-                     "  (gas : int, value : int, protected : bool) =>\n"
-                     "    if(protected, option(void), void) (at line 11, column 18)\n"
-                     "against the expected type\n"
-                     "  (gas : int, value : int, protected : bool, int, bool) =>\n"
-                     "    if(protected, option(void), void)">>,
-                   <<?Pos(11,18)
-                     "Cannot unify `Bakoom` and `Kaboom`\n"
-                     "when checking that contract construction of type\n"
-                     "  Bakoom\n"
-                     "arising from resolution of variadic function `Chain.clone`\n"
-                     "matches the expected type\n"
-                     "  Kaboom">>,
                    <<?Pos(12,37)
                      "Cannot unify `int` and `bool`\n"
                      "when checking named argument `gas : int` against inferred type `bool`">>,
@@ -830,6 +807,88 @@ failing_contracts() ->
                      "to arguments\n"
                      "  `1 : int`">>
                   ])
+    , ?TYPE_ERROR(comparable_typevar_constraints,
+                  [<<?Pos(21,30)
+                     "Values of type `'a` are not comparable by equality">>,
+                   <<?Pos(25,38)
+                     "The type variable `'b` is constrained but never used">>,
+                   <<?Pos(29,41)
+                     "Unknown constraint `foo` used on the type variable `'a`">>,
+                   <<?Pos(63,58)
+                     "Values of type `Chain.ttl` are not comparable by inequality">>,
+                   <<?Pos(66,45)
+                     "Values of type `A` are not comparable by inequality">>,
+                   <<?Pos(73,47)
+                     "Values of type `(int, char) => bool` are not comparable by inequality">>,
+                   <<?Pos(74,47)
+                     "Values of type `(int, char) => bool` are not comparable by equality">>,
+                   <<?Pos(89,59)
+                     "Values of type `list(A)` are not comparable by inequality">>,
+                   <<?Pos(92,65)
+                     "Values of type `option(A)` are not comparable by inequality">>,
+                   <<?Pos(95,64)
+                     "Values of type `(A * int)` are not comparable by inequality">>,
+                   <<?Pos(96,64)
+                     "Values of type `(A * int)` are not comparable by equality">>,
+                   <<?Pos(100,68)
+                     "Values of type `list((int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(101,68)
+                     "Values of type `list((int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(103,74)
+                     "Values of type `option((int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(104,74)
+                     "Values of type `option((int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(106,73)
+                     "Values of type `((int, char) => bool * int)` are not comparable by inequality">>,
+                   <<?Pos(107,73)
+                     "Values of type `((int, char) => bool * int)` are not comparable by equality">>,
+                   <<?Pos(111,71)
+                     "Values of type `map(int, int)` are not comparable by inequality">>,
+                   <<?Pos(114,80)
+                     "Values of type `oracle(int, int)` are not comparable by inequality">>,
+                   <<?Pos(117,98)
+                     "Values of type `oracle_query(int, int)` are not comparable by inequality">>,
+                   <<?Pos(120,90)
+                     "Values of type `custom_datatype(int)` are not comparable by inequality">>,
+                   <<?Pos(123,84)
+                     "Values of type `custom_record(int)` are not comparable by inequality">>,
+                   <<?Pos(128,62)
+                     "Values of type `map(A, A)` are not comparable by inequality">>,
+                   <<?Pos(131,71)
+                     "Values of type `oracle(A, A)` are not comparable by inequality">>,
+                   <<?Pos(134,89)
+                     "Values of type `oracle_query(A, A)` are not comparable by inequality">>,
+                   <<?Pos(137,85)
+                     "Values of type `custom_datatype(A)` are not comparable by inequality">>,
+                   <<?Pos(140,79)
+                     "Values of type `custom_record(A)` are not comparable by inequality">>,
+                   <<?Pos(145,75)
+                     "Values of type `map((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(146,75)
+                     "Values of type `map((int, char) => bool, (int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(148,84)
+                     "Values of type `oracle((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(149,84)
+                     "Values of type `oracle((int, char) => bool, (int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(151,102)
+                     "Values of type `oracle_query((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(152,102)
+                     "Values of type `oracle_query((int, char) => bool, (int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(154,94)
+                     "Values of type `custom_datatype((int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(155,94)
+                     "Values of type `custom_datatype((int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(157,88)
+                     "Values of type `custom_record((int, char) => bool)` are not comparable by inequality">>,
+                   <<?Pos(158,88)
+                     "Values of type `custom_record((int, char) => bool)` are not comparable by equality">>,
+                   <<?Pos(162,35)
+                     "Values of type `map(int, int)` are not comparable by inequality">>,
+                   <<?Pos(163,35)
+                     "Values of type `('a) => 'a` are not comparable by inequality">>,
+                   <<?Pos(167,34)
+                     "Values of type `('b) => 'b` are not comparable by equality">>
+                  ])
     , ?TYPE_ERROR(warnings,
                   [<<?Pos(0, 0)
                       "The file `Triple.aes` is included but not used.">>,
@@ -859,415 +918,64 @@ failing_contracts() ->
                      "The function `called_unused_function2` is defined but never used.">>,
                    <<?Pos(48, 5)
                      "Unused return value.">>,
-                   <<?Pos(60, 5)
+                   <<?Pos(53, 44)
-                     "The function `dec` is defined but never used.">>,
+                     "The constraint on the type variable `'a` is a duplication of the constraint at line 53, column 34">>,
-                   <<?Pos(73, 9)
+                   <<?Pos(65, 5)
-                     "The definition of `const` shadows an older definition at line 70, column 3.">>,
+                     "The function `dec` is defined but never used.">>
-                   <<?Pos(84, 7)
-                     "The constant `c` is defined but never used.">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_interface_recursive,
-                  [<<?Pos(1,24)
-                     "Trying to implement or extend an undefined interface `Z`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_interface_same_name_different_type,
-                  [<<?Pos(5,5)
-                     "Cannot unify `char` and `int`\n"
-                     "when implementing the entrypoint `f` from the interface `I1`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_missing_implementation,
-                  [<<?Pos(4,20)
-                     "Unimplemented entrypoint `f` from the interface `I1` in the contract `I2`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_same_decl_multi_interface,
-                  [<<?Pos(7,10)
-                     "Both interfaces `I` and `J` implemented by the contract `C` have a function called `f`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_undefined_interface,
-                  [<<?Pos(1,14)
-                     "Trying to implement or extend an undefined interface `I`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_same_name_different_type_multi_interface,
-                  [<<?Pos(7,10)
-                     "Both interfaces `I` and `J` implemented by the contract `C` have a function called `f`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_contract_interface_undefined_interface,
-                  [<<?Pos(1,24)
-                     "Trying to implement or extend an undefined interface `H`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching,
-                  [<<?Pos(36,49)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the application of\n"
-                     "  `g2 : (Cat) => Cat`\n"
-                     "to arguments\n"
-                     "  `x : Animal`">>,
-                   <<?Pos(39,43)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `g3(x) : Animal` against the expected type `Cat`">>,
-                   <<?Pos(48,55)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the application of\n"
-                     "  `g5 : ((Animal) => Animal) => Cat`\n"
-                     "to arguments\n"
-                     "  `x : (Cat) => Cat`">>,
-                   <<?Pos(52,44)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `f6() : option(Animal)` against the expected type `option(Cat)`">>,
-                   <<?Pos(73,43)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `some_animal : Animal` against the expected type `Cat`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching_custom_types,
-                  [<<?Pos(56,39)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_CONTRA(f_c_to_u) : dt_contra(Cat)` against the expected type `dt_contra(Animal)`">>,
-                   <<?Pos(62,35)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `DT_CO(f_u_to_a) : dt_co(Animal)` against the expected type `dt_co(Cat)`">>,
-                   <<?Pos(67,36)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the application of\n  `DT_INV : ((Cat) => Cat) => dt_inv(Cat)`\nto arguments\n  `f_c_to_a : (Cat) => Animal`">>,
-                   <<?Pos(68,36)
-                     "Cannot unify `Cat` and `Animal` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV(f_c_to_c) : dt_inv(Cat)` against the expected type `dt_inv(Animal)`">>,
-                   <<?Pos(69,36)
-                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV(f_a_to_a) : dt_inv(Animal)` against the expected type `dt_inv(Cat)`">>,
-                   <<?Pos(70,36)
-                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV(f_a_to_c) : dt_inv(Animal)` against the expected type `dt_inv(Cat)`">>,
-                   <<?Pos(71,36)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the application of\n  `DT_INV : ((Cat) => Cat) => dt_inv(Cat)`\nto arguments\n  `f_c_to_a : (Cat) => Animal`">>,
-                   <<?Pos(80,40)
-                     "Cannot unify `Cat` and `Animal` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV_SEP_A(f_c_to_u) : dt_inv_sep(Cat)` against the expected type `dt_inv_sep(Animal)`">>,
-                   <<?Pos(82,40)
-                     "Cannot unify `Cat` and `Animal` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV_SEP_B(f_u_to_c) : dt_inv_sep(Cat)` against the expected type `dt_inv_sep(Animal)`">>,
-                   <<?Pos(83,40)
-                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV_SEP_A(f_a_to_u) : dt_inv_sep(Animal)` against the expected type `dt_inv_sep(Cat)`">>,
-                   <<?Pos(85,40)
-                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV_SEP_B(f_u_to_a) : dt_inv_sep(Animal)` against the expected type `dt_inv_sep(Cat)`">>,
-                   <<?Pos(90,42)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `DT_CO_NEST_A(f_dt_contra_a_to_u) : dt_co_nest_a(Animal)` against the expected type `dt_co_nest_a(Cat)`">>,
-                   <<?Pos(94,46)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_CONTRA_NEST_A(f_dt_co_c_to_u) : dt_contra_nest_a(Cat)` against the expected type `dt_contra_nest_a(Animal)`">>,
-                   <<?Pos(99,46)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_CONTRA_NEST_B(f_u_to_dt_contra_c) : dt_contra_nest_b(Cat)` against the expected type `dt_contra_nest_b(Animal)`">>,
-                   <<?Pos(105,42)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the expression `DT_CO_NEST_B(f_u_to_dt_co_a) : dt_co_nest_b(Animal)` against the expected type `dt_co_nest_b(Cat)`">>,
-                   <<?Pos(110,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `vj3 : dt_co_twice(Cat)` against the expected type `dt_co_twice(Animal)`">>,
-                   <<?Pos(114,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u) : dt_a_contra_b_contra(Animal, Cat)` against the expected type `dt_a_contra_b_contra(Animal, Animal)`">>,
-                   <<?Pos(115,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u) : dt_a_contra_b_contra(Cat, Animal)` against the expected type `dt_a_contra_b_contra(Animal, Animal)`">>,
-                   <<?Pos(116,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u) : dt_a_contra_b_contra(Cat, Cat)` against the expected type `dt_a_contra_b_contra(Animal, Animal)`">>,
-                   <<?Pos(119,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u) : dt_a_contra_b_contra(Cat, Animal)` against the expected type `dt_a_contra_b_contra(Animal, Cat)`">>,
-                   <<?Pos(120,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u) : dt_a_contra_b_contra(Cat, Cat)` against the expected type `dt_a_contra_b_contra(Animal, Cat)`">>,
-                   <<?Pos(122,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u) : dt_a_contra_b_contra(Animal, Cat)` against the expected type `dt_a_contra_b_contra(Cat, Animal)`">>,
-                   <<?Pos(124,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u) : dt_a_contra_b_contra(Cat, Cat)` against the expected type `dt_a_contra_b_contra(Cat, Animal)`">>,
-                   <<?Pos(131,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `vl2 : dt_contra_twice(Animal)` against the expected type `dt_contra_twice(Cat)`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching_records,
-                  [<<?Pos(27,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `r03 : rec_co(Cat)` against the expected type `Main.rec_co(Animal)`">>,
-                   <<?Pos(33,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `r06 : rec_contra(Animal)` against the expected type `Main.rec_contra(Cat)`">>,
-                   <<?Pos(40,13)
-                     "Cannot unify `Cat` and `Animal` in a invariant context\n"
-                     "when checking the type of the pattern `r10 : rec_inv(Animal)` against the expected type `Main.rec_inv(Cat)`">>,
-                   <<?Pos(41,13)
-                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
-                     "when checking the type of the pattern `r11 : rec_inv(Cat)` against the expected type `Main.rec_inv(Animal)`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching_oracles,
-                  [<<?Pos(15,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o03 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(16,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o04 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Cat)`">>,
-                   <<?Pos(17,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o05 : oracle(Animal, Cat)` against the expected type `oracle(Animal, Animal)`">>,
-                   <<?Pos(19,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o07 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(20,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o08 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Cat)`">>,
-                   <<?Pos(25,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o13 : oracle(Cat, Cat)` against the expected type `oracle(Animal, Animal)`">>,
-                   <<?Pos(27,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o15 : oracle(Cat, Cat)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(34,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q05 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(36,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q07 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Cat, Animal)`">>,
-                   <<?Pos(38,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q09 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(39,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q10 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Cat)`">>,
-                   <<?Pos(42,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q13 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(43,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q14 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Cat)`">>,
-                   <<?Pos(44,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q15 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Cat, Animal)`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching_chain_create_fail,
-                  [<<?Pos(9,22)
-                     "I is not implemented.\n"
-                     "when resolving arguments of variadic function `Chain.create`">>,
-                   <<?Pos(10,13)
-                     "Cannot unify `I` and `C` in a covariant context\n"
-                     "when checking the type of the pattern `c2 : C` against the expected type `I`">>,
-                   <<?Pos(10,22)
-                     "I is not implemented.\n"
-                     "when resolving arguments of variadic function `Chain.create`">>,
-                   <<?Pos(11,22)
-                     "I is not implemented.\n"
-                     "when resolving arguments of variadic function `Chain.create`">>
-                  ])
-    , ?TYPE_ERROR(missing_definition,
-                  [<<?Pos(2,14)
-                     "Missing definition of function `foo`">>
-                  ])
-    , ?TYPE_ERROR(child_with_decls,
-                  [<<?Pos(2,14)
-                     "Missing definition of function `f`">>
-                  ])
-    , ?TYPE_ERROR(parameterised_state,
-                  [<<?Pos(3,8)
-                     "The state type cannot be parameterized">>
-                  ])
-    , ?TYPE_ERROR(parameterised_event,
-                  [<<?Pos(3,12)
-                     "The event type cannot be parameterized">>
-                  ])
-    , ?TYPE_ERROR(missing_init_fun_alias_to_type,
-                  [<<?Pos(1,10)
-                     "Missing `init` function for the contract `AliasToType`.\n"
-                     "The `init` function can only be omitted if the state type is `unit`">>
-                  ])
-    , ?TYPE_ERROR(missing_init_fun_alias_to_alias_to_type,
-                  [<<?Pos(1,10)
-                     "Missing `init` function for the contract `AliasToAliasToType`.\n"
-                     "The `init` function can only be omitted if the state type is `unit`">>
-                  ])
-    , ?TYPE_ERROR(higher_order_entrypoint,
-                  [<<?Pos(2,20)
-                     "The argument\n"
-                     "  `f : (int) => int`\n"
-                     "of entrypoint `apply` has a higher-order (contains function types) type">>
-                  ])
-    , ?TYPE_ERROR(higher_order_entrypoint_return,
-                  [<<?Pos(2,3)
-                     "The return type\n"
-                     "  `(int) => int`\n"
-                     "of entrypoint `add` is higher-order (contains function types)">>
-                  ])
-    , ?TYPE_ERROR(polymorphic_aens_resolve,
-                  [<<?Pos(4,5)
-                     "Invalid return type of `AENS.resolve`:\n"
-                     "  `'a`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
-                  ])
-    , ?TYPE_ERROR(bad_aens_resolve,
-                  [<<?Pos(6,5)
-                     "Invalid return type of `AENS.resolve`:\n"
-                     "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
-                  ])
-    , ?TYPE_ERROR(bad_aens_resolve_using,
-                  [<<?Pos(7,5)
-                     "Invalid return type of `AENS.resolve`:\n"
-                     "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
-                  ])
-    , ?TYPE_ERROR(polymorphic_query_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle('a, 'b)`\n"
-                     "The query type must not be polymorphic (contain type variables)">>,
-                   <<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle('a, 'b)`\n"
-                     "The response type must not be polymorphic (contain type variables)">>
-                  ])
-    , ?TYPE_ERROR(polymorphic_response_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle(string, 'r)`\n"
-                     "The response type must not be polymorphic (contain type variables)">>
-                  ])
-    , ?TYPE_ERROR(higher_order_query_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle((int) => int, string)`\n"
-                     "The query type must not be higher-order (contain function types)">>
-                  ])
-    , ?TYPE_ERROR(higher_order_response_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle(string, (int) => int)`\n"
-                     "The response type must not be higher-order (contain function types)">>
-                  ])
-    , ?TYPE_ERROR(var_args_unify_let,
-                  [<<?Pos(3,9)
-                     "Cannot infer types for variable argument list.\n"
-                     "when checking the type of the pattern `x : 'a` against the expected type `(gas : int, value : int, protected : bool, ref : 'b, var_args) => 'b`">>
-                  ])
-    , ?TYPE_ERROR(var_args_unify_fun_call,
-                  [<<?Pos(6,5)
-                     "Cannot infer types for variable argument list.\n"
-                     "when checking the application of\n"
-                     "  `g : (() => 'b) => 'b`\n"
-                     "to arguments\n"
-                     "  `Chain.create : (value : int, var_args) => 'c`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_add_stateful_entrypoint,
-                  [<<?Pos(5,25)
-                     "`f` cannot be stateful because the entrypoint `f` in the interface `I` is not stateful">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_change_entrypoint_to_function,
-                  [<<?Pos(6,14)
-                     "`f` must be declared as an entrypoint instead of a function in order to implement the entrypoint `f` from the interface `I`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_non_payable_contract_implement_payable,
-                  [<<?Pos(4,10)
-                     "Non-payable contract `C` cannot implement payable interface `I`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_non_payable_interface_implement_payable,
-                  [<<?Pos(4,20)
-                     "Non-payable interface `H` cannot implement payable interface `I`">>
-                  ])
-    , ?TYPE_ERROR(polymorphism_remove_payable_entrypoint,
-                  [<<?Pos(5,16)
-                     "`f` must be payable because the entrypoint `f` in the interface `I` is payable">>
-                  ])
-    , ?TYPE_ERROR(calling_child_contract_entrypoint,
-                  [<<?Pos(5,20)
-                     "Invalid call to contract entrypoint `F.g`.\n"
-                     "It must be called as `c.g` for some `c : F`.">>])
-    , ?TYPE_ERROR(using_contract_as_namespace,
-                  [<<?Pos(5,3)
-                     "Cannot use undefined namespace F">>])
-    , ?TYPE_ERROR(hole_expression,
-                  [<<?Pos(5,13)
-                     "Found a hole of type `bool`">>,
-                   <<?Pos(6,17)
-                     "Found a hole of type `string`">>,
-                   <<?Pos(9,37)
-                     "Found a hole of type `(int) => int`">>,
-                   <<?Pos(13,20)
-                     "Found a hole of type `'a`">>
-                  ])
-    , ?TYPE_ERROR(toplevel_constants_contract_as_namespace,
-                  [<<?Pos(5,13)
-                     "Invalid use of the contract constant `G.const`.\n"
-                     "Toplevel contract constants can only be used in the contracts where they are defined.">>,
-                   <<?Pos(10,11)
-                     "Record type `G` does not have field `const`">>,
-                   <<?Pos(10,11)
-                     "Unbound field const">>,
-                   <<?Pos(11,11)
-                     "Record type `G` does not have field `const`">>,
-                   <<?Pos(11,11)
-                     "Unbound field const">>
-                  ])
-    , ?TYPE_ERROR(toplevel_constants_cycles,
-                  [<<?Pos(2,21)
-                     "Unbound variable `selfcycle`">>,
-                   <<?Pos(4,5)
-                     "Mutual recursion detected between the constants\n"
-                     "  - `cycle1` at line 4, column 5\n"
-                     "  - `cycle2` at line 5, column 5\n"
-                     "  - `cycle3` at line 6, column 5">>
-                  ])
-    , ?TYPE_ERROR(toplevel_constants_in_interface,
-                  [<<?Pos(2,10)
-                     "The name of the compile-time constant cannot have pattern matching">>,
-                   <<?Pos(3,5)
-                     "Cannot define toplevel constants inside a contract interface">>,
-                   <<?Pos(4,5)
-                     "Cannot define toplevel constants inside a contract interface">>
-                  ])
-    , ?TYPE_ERROR(toplevel_constants_invalid_expr,
-                  [<<?Pos(10,9)
-                     "Invalid expression in the definition of the constant `c01`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(11,9)
-                     "Invalid expression in the definition of the constant `c02`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(12,9)
-                     "Invalid expression in the definition of the constant `c03`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(13,9)
-                     "Invalid expression in the definition of the constant `c04`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(14,9)
-                     "Invalid expression in the definition of the constant `c05`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(17,9)
-                     "Invalid expression in the definition of the constant `c07`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(18,9)
-                     "Invalid expression in the definition of the constant `c08`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(19,9)
-                     "Invalid expression in the definition of the constant `c09`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(20,9)
-                     "Invalid expression in the definition of the constant `c10`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>,
-                   <<?Pos(21,9)
-                     "Invalid expression in the definition of the constant `c11`\n"
-                     "You can only use the following expressions as constants: literals, lists, tuples, maps, and other constants">>
-                  ])
-    , ?TYPE_ERROR(toplevel_constants_invalid_id,
-                  [<<?Pos(2,9)
-                     "The name of the compile-time constant cannot have pattern matching">>,
-                   <<?Pos(3,9)
-                     "The name of the compile-time constant cannot have pattern matching">>
                   ])
     ].
 
+-define(Path(File), "code_errors/" ??File).
+-define(Msg(File, Line, Col, Err), <<?Pos("Code generation", ?Path(File), Line, Col) Err>>).
+
+-define(FATE_ERR(File, Line, Col, Err), {?Path(File), ?Msg(File, Line, Col, Err)}).
+
+failing_code_gen_contracts() ->
+    [ ?FATE_ERR(missing_definition, 2, 14,
+            "Missing definition of function 'foo'.")
+    , ?FATE_ERR(higher_order_entrypoint, 2, 20,
+            "The argument\n"
+            "  f : (int) => int\n"
+            "of entrypoint 'apply' has a higher-order (contains function types) type.")
+    , ?FATE_ERR(higher_order_entrypoint_return, 2, 3,
+            "The return type\n"
+            "  (int) => int\n"
+            "of entrypoint 'add' is higher-order (contains function types).")
+    , ?FATE_ERR(missing_init_function, 1, 10,
+            "Missing init function for the contract 'MissingInitFunction'.\n"
+            "The 'init' function can only be omitted if the state type is 'unit'.")
+    , ?FATE_ERR(parameterised_state, 3, 8,
+            "The state type cannot be parameterized.")
+    , ?FATE_ERR(parameterised_event, 3, 12,
+            "The event type cannot be parameterized.")
+    , ?FATE_ERR(polymorphic_aens_resolve, 4, 5,
+            "Invalid return type of AENS.resolve:\n"
+            "  'a\n"
+            "It must be a string or a pubkey type (address, oracle, etc).")
+    , ?FATE_ERR(bad_aens_resolve, 6, 5,
+            "Invalid return type of AENS.resolve:\n"
+            "  list(int)\n"
+            "It must be a string or a pubkey type (address, oracle, etc).")
+    , ?FATE_ERR(polymorphic_query_type, 3, 5,
+            "Invalid oracle type\n"
+            "  oracle('a, 'b)\n"
+            "The query type must not be polymorphic (contain type variables).")
+    , ?FATE_ERR(polymorphic_response_type, 3, 5,
+            "Invalid oracle type\n"
+            "  oracle(string, 'r)\n"
+            "The response type must not be polymorphic (contain type variables).")
+    , ?FATE_ERR(higher_order_query_type, 3, 5,
+            "Invalid oracle type\n"
+            "  oracle((int) => int, string)\n"
+            "The query type must not be higher-order (contain function types).")
+    , ?FATE_ERR(higher_order_response_type, 3, 5,
+            "Invalid oracle type\n"
+            "  oracle(string, (int) => int)\n"
+            "The response type must not be higher-order (contain function types).")
+    , ?FATE_ERR(child_with_decls, 2, 14,
+            "Missing definition of function 'f'.")
+    ].
+
 validation_test_() ->
     [{"Validation fail: " ++ C1 ++ " /= " ++ C2,
       fun() ->

test/aeso_parser_tests.erl

@@ -15,7 +15,7 @@ simple_contracts_test_() ->
             Text = "main contract Identity =\n"
                    "  function id(x) = x\n",
             ?assertMatch(
-                [{contract_main, _, {con, _, "Identity"}, _,
+                [{contract_main, _, {con, _, "Identity"},
                     [{letfun, _, {id, _, "id"}, [{id, _, "x"}], {id, _, "_"},
                         [{guarded, _, [], {id, _, "x"}}]}]}], parse_string(Text)),
             ok

test/contracts/aens.aes

@@ -1,7 +1,5 @@
-contract C = entrypoint init() = ()
-
 // AENS tests
-main contract AENSTest =
+contract AENSTest =
 
   // Name resolution
 
@@ -11,19 +9,10 @@ main contract AENSTest =
   stateful entrypoint resolve_string(name : string, key : string) : option(string) =
     AENS.resolve(name, key)
 
-  stateful entrypoint resolve_contract(name : string, key : string) : option(C) =
-    AENS.resolve(name, key)
-
-  stateful entrypoint resolve_oracle(name : string, key : string) : option(oracle(int, int)) =
-    AENS.resolve(name, key)
-
-  stateful entrypoint resolve_oracle_query(name : string, key : string) : option(oracle_query(int, int)) =
-    AENS.resolve(name, key)
-
   // Transactions
 
   stateful entrypoint preclaim(addr  : address,     // Claim on behalf of this account (can be Contract.address)
-                               chash : hash) : unit = // Commitment hash
+                             chash : hash) : unit = // Commitment hash
     AENS.preclaim(addr, chash)
 
   stateful entrypoint signedPreclaim(addr  : address, // Claim on behalf of this account (can be Contract.address)

test/contracts/all_syntax.aes

@@ -6,7 +6,6 @@
 namespace Ns =
   datatype d('a) = D | S(int) | M('a, list('a), int)
   private function fff() = 123
-  let const = 1
 
   stateful entrypoint
     f (1, x) = (_) => x
@@ -34,8 +33,6 @@ contract AllSyntax =
 
   type state = shakespeare(int)
 
-  let cc = "str"
-
   entrypoint init() = {
     johann = 1000,
     wolfgang = -10,
@@ -83,4 +80,3 @@ contract AllSyntax =
      let sh : shakespeare(shakespeare(int)) =
        {wolfgang = state}
      sh{wolfgang.wolfgang = sh.wolfgang} // comment
-     exit("hope you had fun reading this")

test/contracts/bad_aens_resolve_using.aes

@@ -1,9 +0,0 @@
-contract BadAENSresolve =
-  using AENS
-
-  type t('a) = option(list('a))
-
-  function fail() : t(int) =
-    resolve("foo.aet", "whatever")
-
-  entrypoint main_fun() = ()

test/contracts/calling_child_contract_entrypoint.aes

@@ -1,5 +0,0 @@
-contract F =
-  entrypoint g() = 1
-
-main contract C =
-  entrypoint f() = F.g()

test/contracts/code_errors/missing_init_function.aes

@@ -0,0 +1,3 @@
+contract MissingInitFunction =
+  type state = int * int
+

test/contracts/comparable_typevar_constraints.aes

@@ -0,0 +1,169 @@
+contract A = entrypoint init() = ()
+
+main contract C =
+    datatype custom_datatype('a) = CD('a)
+
+    record custom_record('a) = { f : 'a }
+
+    // pass
+    function
+        passing_ord : 'a is ord ; ('a, 'a) => bool
+        passing_ord(x, y) = x >= y
+
+    // pass
+    function
+        passing_eq : 'a is eq ; ('a, 'a) => bool
+        passing_eq(x, y) = x == y
+
+    // fail because eq is not specified for 'a
+    function
+        fail_no_eq : ('a, 'a) => bool
+        fail_no_eq(x, y) = x == y
+
+    // fail because 'b is not used
+    function
+        fail_unused_tvar : 'a is eq, 'b is eq ; ('a, 'a) => bool
+        fail_unused_tvar(x, y) = x == y
+
+    function
+        fail_unknown_constraint : 'a is foo ; ('a) => 'a
+        fail_unknown_constraint(x) = x
+
+    // Ord types
+
+    function bool_ord(x : bool, y : bool) = x >= y  // pass
+    function bool_eq (x : bool, y : bool) = x == y  // pass
+
+    function int_ord(x : int, y : int) = x >= y  // pass
+    function int_eq (x : int, y : int) = x == y  // pass
+
+    function char_ord(x : char, y : char) = x >= y  // pass
+    function char_eq (x : char, y : char) = x == y  // pass
+
+    function bits_ord(x : bits, y : bits) = x >= y  // pass
+    function bits_eq (x : bits, y : bits) = x == y  // pass
+
+    function bytes_ord(x : bytes(16), y : bytes(16)) = x >= y  // pass
+    function bytes_eq (x : bytes(16), y : bytes(16)) = x == y  // pass
+
+    function string_ord(x : string, y : string) = x >= y  // pass
+    function string_eq (x : string, y : string) = x == y  // pass
+
+    function hash_ord(x : hash, y : hash) = x >= y  // pass
+    function hash_eq (x : hash, y : hash) = x == y  // pass
+
+    function signature_ord(x : signature, y : signature) = x >= y  // pass
+    function signature_eq (x : signature, y : signature) = x == y  // pass
+
+    function address_ord(x : address, y : address) = x >= y  // pass
+    function address_eq (x : address, y : address) = x == y  // pass
+
+    // Eq types
+
+    function event_ord(x : Chain.ttl, y : Chain.ttl) = x >= y  // fail
+    function event_eq (x : Chain.ttl, y : Chain.ttl) = x == y  // pass
+
+    function contract_ord(x : A, y : A) = x >= y  // fail
+    function contract_eq (x : A, y : A) = x == y  // pass
+
+    // Noncomparable types
+
+    type lam = (int, char) => bool
+
+    function lambda_ord(x : lam, y : lam) = x >= y  // fail
+    function lambda_eq (x : lam, y : lam) = x == y  // fail
+
+    // Ord composite types of ord
+
+    function list_of_ord_ord(x : list(int), y : list(int)) = x >= y  // pass
+    function list_of_ord_eq (x : list(int), y : list(int)) = x == y  // pass
+
+    function option_of_ord_ord(x : option(int), y : option(int)) = x >= y  // pass
+    function option_of_ord_eq (x : option(int), y : option(int)) = x == y  // pass
+
+    function tuple_of_ord_ord(x : (int * bool), y : (int * bool)) = x >= y  // pass
+    function tuple_of_ord_eq (x : (int * bool), y : (int * bool)) = x == y  // pass
+
+    // Ord composite types of eq
+
+    function list_of_eq_ord(x : list(A), y : list(A)) = x >= y  // fail
+    function list_of_eq_eq (x : list(A), y : list(A)) = x == y  // pass
+
+    function option_of_eq_ord(x : option(A), y : option(A)) = x >= y  // fail
+    function option_of_eq_eq (x : option(A), y : option(A)) = x == y  // pass
+
+    function tuple_of_eq_ord(x : (A * int), y : (A * int)) = x >= y  // fail
+    function tuple_of_eq_eq (x : (A * int), y : (A * int)) = x == y  // pass
+
+    // Ord composite types of nomcomparable
+
+    function list_of_noncomp_ord(x : list(lam), y : list(lam)) = x >= y  // fail
+    function list_of_noncomp_eq (x : list(lam), y : list(lam)) = x == y  // fail
+
+    function option_of_noncomp_ord(x : option(lam), y : option(lam)) = x >= y  // fail
+    function option_of_noncomp_eq (x : option(lam), y : option(lam)) = x == y  // fail
+
+    function tuple_of_noncomp_ord(x : (lam * int), y : (lam * int)) = x >= y  // fail
+    function tuple_of_noncomp_eq (x : (lam * int), y : (lam * int)) = x == y  // fail
+
+    // Eq composite types of ord
+
+    function map_of_ord_ord(x : map(int, int), y : map(int, int)) = x >= y  // fail
+    function map_of_ord_eq (x : map(int, int), y : map(int, int)) = x == y  // pass
+
+    function oracle_of_ord_ord(x : oracle(int, int), y : oracle(int, int)) = x >= y  // fail
+    function oracle_of_ord_eq (x : oracle(int, int), y : oracle(int, int)) = x == y  // pass
+
+    function oracle_query_of_ord_ord(x : oracle_query(int, int), y : oracle_query(int, int)) = x >= y  // fail
+    function oracle_query_of_ord_eq (x : oracle_query(int, int), y : oracle_query(int, int)) = x == y  // pass
+
+    function datatype_of_ord_ord(x : custom_datatype(int), y : custom_datatype(int)) = x >= y  // fail
+    function datatype_of_ord_eq (x : custom_datatype(int), y : custom_datatype(int)) = x == y  // pass
+
+    function record_of_ord_ord(x : custom_record(int), y : custom_record(int)) = x >= y  // fail
+    function record_of_ord_eq (x : custom_record(int), y : custom_record(int)) = x == y  // pass
+
+    // Eq composite types of eq
+
+    function map_of_eq_ord(x : map(A, A), y : map(A, A)) = x >= y  // fail
+    function map_of_eq_eq (x : map(A, A), y : map(A, A)) = x == y  // pass
+
+    function oracle_of_eq_ord(x : oracle(A, A), y : oracle(A, A)) = x >= y  // fail
+    function oracle_of_eq_eq (x : oracle(A, A), y : oracle(A, A)) = x == y  // pass
+
+    function oracle_query_of_eq_ord(x : oracle_query(A, A), y : oracle_query(A, A)) = x >= y  // fail
+    function oracle_query_of_eq_eq (x : oracle_query(A, A), y : oracle_query(A, A)) = x == y  // pass
+
+    function datatype_of_eq_ord(x : custom_datatype(A), y : custom_datatype(A)) = x >= y  // fail
+    function datatype_of_eq_eq (x : custom_datatype(A), y : custom_datatype(A)) = x == y  // pass
+
+    function record_of_eq_ord(x : custom_record(A), y : custom_record(A)) = x >= y  // fail
+    function record_of_eq_eq (x : custom_record(A), y : custom_record(A)) = x == y  // pass
+
+    // Eq composite types of nomcomparable
+
+    function map_of_noncomp_ord(x : map(lam, lam), y : map(lam, lam)) = x >= y  // fail
+    function map_of_noncomp_eq (x : map(lam, lam), y : map(lam, lam)) = x == y  // fail
+
+    function oracle_of_noncomp_ord(x : oracle(lam, lam), y : oracle(lam, lam)) = x >= y  // fail
+    function oracle_of_noncomp_eq (x : oracle(lam, lam), y : oracle(lam, lam)) = x == y  // fail
+
+    function oracle_query_of_noncomp_ord(x : oracle_query(lam, lam), y : oracle_query(lam, lam)) = x >= y  // fail
+    function oracle_query_of_noncomp_eq (x : oracle_query(lam, lam), y : oracle_query(lam, lam)) = x == y  // fail
+
+    function datatype_of_noncomp_ord(x : custom_datatype(lam), y : custom_datatype(lam)) = x >= y  // fail
+    function datatype_of_noncomp_eq (x : custom_datatype(lam), y : custom_datatype(lam)) = x == y  // pass
+
+    function record_of_nomcomp_ord(x : custom_record(lam), y : custom_record(lam)) = x >= y  // fail
+    function record_of_nomcomp_eq (x : custom_record(lam), y : custom_record(lam)) = x == y  // pass
+
+    entrypoint init() =
+        let passing_ord_ord     = passing_ord([1], [2])              // pass
+        let passing_ord_eq      = passing_ord({[1] = 2}, {[2] = 3})  // fail
+        let passing_ord_noncomp = passing_ord((x) => x, (x) => x)    // fail
+
+        let passing_eq_ord     = passing_eq([1], [2])              // pass
+        let passing_eq_eq      = passing_eq({[1] = 2}, {[2] = 3})  // pass
+        let passing_eq_noncomp = passing_eq((x) => x, (x) => x)    // fail
+
+        ()

test/contracts/complex_types.aes

@@ -1,7 +1,16 @@
 
+contract interface Remote =
+  entrypoint up_to       : (int)               => list(int)
+  entrypoint sum         : (list(int))         => int
+  entrypoint some_string : ()                  => string
+  entrypoint pair        : (int, string)       => int * string
+  entrypoint squares     : (int)               => list(int * int)
+  entrypoint filter_some : (list(option(int))) => list(int)
+  entrypoint all_some    : (list(option(int))) => option(list(int))
+
 contract ComplexTypes =
 
-  record state = { worker : ComplexTypes }
+  record state = { worker : Remote }
 
   entrypoint init(worker) = {worker = worker}
 

test/contracts/environment.aes

@@ -1,9 +1,14 @@
 
 // Testing primitives for accessing the block chain environment
+contract interface Interface =
+  entrypoint contract_address : () => address
+  entrypoint call_origin      : () => address
+  entrypoint call_caller      : () => address
+  entrypoint call_value       : () => int
 
 contract Environment =
 
-  record state = {remote : Environment}
+  record state = {remote : Interface}
 
   entrypoint init(remote) = {remote = remote}
 

test/contracts/hole_expression.aes

@@ -1,13 +0,0 @@
-include "List.aes"
-
-contract C =
-    entrypoint f() =
-        let ??? = true
-        let v = ???
-        let q = v == "str"
-        let xs = [1, 2, 3, 4]
-        switch (List.first(List.map(???, xs)))
-            Some(x) => x + 1
-            None    => 0
-
-    function g() = ???

test/contracts/missing_init_fun_alias_to_alias_to_type.aes

@@ -1,3 +0,0 @@
-contract AliasToAliasToType =
-  type alias = int * int
-  type state = alias

test/contracts/missing_init_fun_alias_to_type.aes

@@ -1,2 +0,0 @@
-contract AliasToType =
-  type state = int * int

test/contracts/missing_init_fun_state_unit.aes

@@ -1,9 +0,0 @@
-contract AliasToAliasToUnit =
-  type alias = unit
-  type state = alias
-
-contract AliasToUnit =
-  type state = unit
-
-main contract ImplicitState =
-    type sometype = int

test/contracts/name_clash.aes

@@ -1,5 +1,12 @@
+
 contract NameClash =
 
+  entrypoint double_proto : () => int
+  entrypoint double_proto : () => int
+
+  entrypoint proto_and_def : int => int
+  entrypoint proto_and_def(n) = n + 1
+
   entrypoint double_def(x) = x
   entrypoint double_def(y) = 0
 

test/contracts/polymorphism_add_stateful_entrypoint.aes

@@ -1,5 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract C : I =
-    stateful entrypoint f() = 1

test/contracts/polymorphism_change_entrypoint_to_function.aes

@@ -1,6 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract C : I =
-    entrypoint init() = ()
-    function f() = 1

test/contracts/polymorphism_contract_implements_interface.aes

@@ -1,5 +0,0 @@
-contract interface Strokable =
-  entrypoint stroke : () => string
-
-contract Cat : Strokable =
-  entrypoint stroke() = "Cat stroke"

test/contracts/polymorphism_contract_interface_extends_interface.aes

@@ -1,10 +0,0 @@
-contract interface II =
-    entrypoint f : () => unit
-
-contract interface I : II =
-    entrypoint f : () => unit
-    entrypoint g : () => unit
-
-contract C : I =
-    entrypoint f() = ()
-    entrypoint g() = ()

test/contracts/polymorphism_contract_interface_extensions.aes

@@ -1,9 +0,0 @@
-contract interface I0 =
-  entrypoint f : () => int
-
-contract interface I1 : I0 =
-  entrypoint f : () => int
-  entrypoint something_else : () => int
-
-main contract C =
-  entrypoint f(x : I1) = x.f() // Here we should know that x has f

test/contracts/polymorphism_contract_interface_recursive.aes

@@ -1,13 +0,0 @@
-contract interface X : Z =
-    entrypoint x : () => int
-
-contract interface Y : X =
-    entrypoint y : () => int
-
-contract interface Z : Y =
-    entrypoint z : () => int
-
-contract C : Z =
-    entrypoint x() = 1
-    entrypoint y() = 1
-    entrypoint z() = 1

test/contracts/polymorphism_contract_interface_same_decl_multi_interface.aes

@@ -1,8 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract interface II : I =
-    entrypoint f : () => int
-
-contract C : II =
-    entrypoint f() = 1

test/contracts/polymorphism_contract_interface_same_name_different_type.aes

@@ -1,9 +0,0 @@
-contract interface I1 =
-    entrypoint f : () => int
-
-contract interface I2 : I1 =
-    entrypoint f : () => char
-
-contract C : I2 =
-    entrypoint f() = 1
-    entrypoint f() = 'c'

test/contracts/polymorphism_contract_interface_same_name_same_type.aes

@@ -1,8 +0,0 @@
-contract interface I1 =
-    entrypoint f : () => int
-
-contract interface I2 : I1 =
-    entrypoint f : () => int
-
-contract C : I2 =
-    entrypoint f() = 1

test/contracts/polymorphism_contract_interface_undefined_interface.aes

@@ -1,5 +0,0 @@
-contract interface I : H =
-    entrypoint f : () => unit
-
-contract C =
-    entrypoint g() = ()

test/contracts/polymorphism_contract_missing_implementation.aes

@@ -1,8 +0,0 @@
-contract interface I1 =
-    entrypoint f : () => int
-
-contract interface I2 : I1 =
-    entrypoint g : () => int
-
-contract C : I2 =
-    entrypoint g() = 1

test/contracts/polymorphism_contract_multi_interface.aes

@@ -1,9 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract interface J =
-    entrypoint g : () => char
-
-contract C : I, J =
-    entrypoint f() = 1
-    entrypoint g() = 'c'

test/contracts/polymorphism_contract_same_decl_multi_interface.aes

@@ -1,8 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract interface J =
-    entrypoint f : () => int
-
-contract C : I, J =
-    entrypoint f() = 1

test/contracts/polymorphism_contract_same_name_different_type_multi_interface.aes

@@ -1,9 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract interface J =
-    entrypoint f : () => char
-
-contract C : I, J =
-    entrypoint f() = 1
-    entrypoint f() = 'c'

test/contracts/polymorphism_contract_undefined_interface.aes

@@ -1,2 +0,0 @@
-contract C : I =
-    entrypoint f() = ()

test/contracts/polymorphism_non_payable_contract_implement_payable.aes

@@ -1,5 +0,0 @@
-payable contract interface I =
-    payable entrypoint f : () => int
-
-contract C : I =
-    entrypoint f() = 123

test/contracts/polymorphism_non_payable_interface_implement_payable.aes

@@ -1,8 +0,0 @@
-payable contract interface I =
-    payable entrypoint f : () => int
-
-contract interface H : I =
-    payable entrypoint f : () => int
-
-payable contract C : H =
-    entrypoint f() = 123

test/contracts/polymorphism_preserve_or_add_payable_contract.aes

@@ -1,14 +0,0 @@
-contract interface F =
-    entrypoint f : () => int
-
-payable contract interface G : F =
-    payable entrypoint f : () => int
-    entrypoint g : () => int
-
-payable contract interface H =
-    payable entrypoint h : () => int
-
-payable contract C : G, H =
-    payable entrypoint f() = 1
-    payable entrypoint g() = 2
-    payable entrypoint h() = 3

test/contracts/polymorphism_preserve_or_add_payable_entrypoint.aes

@@ -1,7 +0,0 @@
-contract interface I =
-    payable entrypoint f : () => int
-    entrypoint g : () => int
-
-contract C : I =
-    payable entrypoint f() = 1
-    payable entrypoint g() = 2

test/contracts/polymorphism_preserve_or_remove_stateful_entrypoint.aes

@@ -1,7 +0,0 @@
-contract interface I =
-    stateful entrypoint f : () => int
-    stateful entrypoint g : () => int
-
-contract C : I =
-    stateful entrypoint f() = 1
-    entrypoint g() = 2

test/contracts/polymorphism_remove_payable_entrypoint.aes

@@ -1,5 +0,0 @@
-contract interface I =
-    payable entrypoint f : () => int
-
-contract C : I =
-    entrypoint f() = 1

test/contracts/polymorphism_variance_switching.aes

@@ -1,75 +0,0 @@
-contract interface Creature =
-    entrypoint is_alive : () => bool
-
-contract interface Animal : Creature =
-    entrypoint is_alive : () => bool
-    entrypoint sound : () => string
-
-contract Cat : Animal =
-    entrypoint sound() = "meow"
-    entrypoint is_alive() = true
-
-main contract Main =
-    entrypoint init() = ()
-
-    stateful function g0(_ : Creature) : Cat = Chain.create()
-    stateful function f0(x : Cat) : Creature = g0(x)
-    stateful function h0() =
-        let a : Animal = (Chain.create() : Cat)
-        let c : Creature = (Chain.create() : Cat)
-        let c1 : Creature = a
-        ()
-
-    stateful function g1(x : Animal) : Cat = Chain.create()
-    stateful function f1(x : Cat) : Animal = g1(x)
-
-    stateful function g11(x : list(Animal)) : list(Cat) = [Chain.create()]
-    stateful function f11(x : list(Cat)) : list(Animal) = g11(x)
-
-    stateful function g12(x : Animal * Animal) : Cat * Cat = (Chain.create(), Chain.create())
-    stateful function f12(x : Cat * Cat) : Animal * Animal = g12(x)
-
-    stateful function g13() : map(Cat, Cat) = { [Chain.create()] = Chain.create() }
-    stateful function f13() : map(Animal, Animal) = g13()
-
-    stateful function g2(x : Cat) : Cat = Chain.create()
-    stateful function f2(x : Animal) : Animal = g2(x)  // fail
-
-    stateful function g3(x : Cat) : Animal = f1(x)
-    stateful function f3(x : Cat) : Cat = g3(x)  // fail
-
-    stateful function g4(x : (Cat => Animal)) : Cat = Chain.create()
-    stateful function f4(x : (Animal => Cat)) : Animal = g4(x)
-
-    stateful function g44(x : list(list(Cat) => list(Animal))) : Cat = Chain.create()
-    stateful function f44(x : list(list(Animal) => list(Cat))) : Animal = g44(x)
-
-    stateful function g5(x : (Animal => Animal)) : Cat = Chain.create()
-    stateful function f5(x : (Cat => Cat)) : Animal = g5(x)  // fail
-
-    stateful function g6() : option(Cat) = Some(Chain.create())
-    stateful function f6() : option(Animal) = g6()
-    stateful function h6() : option(Cat) = f6()  // fail
-
-    type cat_type = Cat
-    type animal_type = Animal
-    type cat_cat_map = map(cat_type, cat_type)
-    type animal_animal_map = map(animal_type, animal_type)
-
-    stateful function g71(x : animal_type) : cat_type = Chain.create()
-    stateful function f71(x : cat_type) : animal_type = g1(x)
-
-    stateful function g72() : cat_cat_map = { [Chain.create()] = Chain.create() }
-    stateful function f72() : animal_animal_map = g13()
-
-    stateful function g73() =
-        let some_cat : Cat = Chain.create()
-        let some_animal : Animal = some_cat
-
-        let some_cat_cat_map : map(Cat, Cat) = g13()
-        let some_animal_animal_map : map(Animal, Animal) = some_cat_cat_map
-
-        let x : Animal = some_animal_animal_map[some_cat]  // success
-        let y : Cat    = some_cat_cat_map[some_animal]     // fail
-
-        ()

test/contracts/polymorphism_variance_switching_chain_create.aes

@@ -1,29 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract C1 : I =
-    entrypoint f() = 123
-
-contract C2 : I =
-    entrypoint f() = 888
-
-namespace Make =
-    stateful function new1() : I = Chain.create() : C1
-    stateful function new2() : I = Chain.create() : C2
-
-    stateful function new(c : I) : int = c.f()
-
-main contract Main =
-    stateful entrypoint test1() =
-        let c = Make.new1()
-        Make.new(c)
-
-    stateful entrypoint test2() =
-        let c = Make.new2()
-        Make.new(c)
-
-    stateful entrypoint test3() =
-        let c1      = Chain.create() : C1  // succeeds
-        let c2 : I  = Chain.create() : C1  // succeeds
-        let c3 : C1 = Chain.create()       // succeeds
-        ()

test/contracts/polymorphism_variance_switching_chain_create_fail.aes

@@ -1,12 +0,0 @@
-contract interface I =
-    entrypoint f : () => int
-
-contract C : I =
-    entrypoint f() = 123
-
-main contract Main =
-    stateful entrypoint test() =
-        let c1 : I = Chain.create()       // fails
-        let c2 : C = Chain.create() : I   // fails
-        let c3     = Chain.create() : I   // fails
-        ()

test/contracts/polymorphism_variance_switching_custom_types.aes

@@ -1,135 +0,0 @@
-contract interface Animal =
-    entrypoint sound : () => string
-
-contract Cat : Animal =
-    entrypoint sound() = "meow"
-
-main contract Main =
-    datatype dt_contra('a) = DT_CONTRA('a => unit)
-    datatype dt_co('a) = DT_CO(unit => 'a)
-    datatype dt_inv('a) = DT_INV('a => 'a)
-    datatype dt_biv('a) = DT_BIV(unit => unit)
-    datatype dt_inv_sep('a) = DT_INV_SEP_A('a => unit) | DT_INV_SEP_B(unit => 'a)
-    datatype dt_co_nest_a('a) = DT_CO_NEST_A(dt_contra('a) => unit)
-    datatype dt_contra_nest_a('a) = DT_CONTRA_NEST_A(dt_co('a) => unit)
-    datatype dt_contra_nest_b('a) = DT_CONTRA_NEST_B(unit => dt_contra('a))
-    datatype dt_co_nest_b('a) = DT_CO_NEST_B(unit => dt_co('a))
-    datatype dt_co_twice('a) = DT_CO_TWICE(('a => unit) => 'a)
-    datatype dt_contra_twice('a) = DT_CONTRA_TWICE('a => 'a => unit)
-    datatype dt_a_contra_b_contra('a, 'b) = DT_A_CONTRA_B_CONTRA('a => 'b => unit)
-
-    function f_a_to_a_to_u(_ : Animal) : (Animal => unit) = f_a_to_u
-    function f_a_to_c_to_u(_ : Animal) : (Cat => unit) = f_c_to_u
-    function f_c_to_a_to_u(_ : Cat) : (Animal => unit) = f_a_to_u
-    function f_c_to_c_to_u(_ : Cat) : (Cat => unit) = f_c_to_u
-
-    function f_u_to_u(_ : unit) : unit = ()
-    function f_a_to_u(_ : Animal) : unit = ()
-    function f_c_to_u(_ : Cat) : unit = ()
-
-    function f_dt_contra_a_to_u(_ : dt_contra(Animal)) : unit = ()
-    function f_dt_contra_c_to_u(_ : dt_contra(Cat)) : unit = ()
-    function f_dt_co_a_to_u(_ : dt_co(Animal)) : unit = ()
-    function f_dt_co_c_to_u(_ : dt_co(Cat)) : unit = ()
-    function f_u_to_dt_contra_a(_ : unit) : dt_contra(Animal) = DT_CONTRA(f_a_to_u)
-    function f_u_to_dt_contra_c(_ : unit) : dt_contra(Cat) = DT_CONTRA(f_c_to_u)
-
-    stateful function f_c() : Cat = Chain.create()
-    stateful function f_a() : Animal = f_c()
-
-    stateful function f_u_to_a(_ : unit) : Animal = f_a()
-    stateful function f_u_to_c(_ : unit) : Cat = f_c()
-    stateful function f_a_to_a(_ : Animal) : Animal = f_a()
-    stateful function f_a_to_c(_ : Animal) : Cat = f_c()
-    stateful function f_c_to_a(_ : Cat) : Animal = f_a()
-    stateful function f_c_to_c(_ : Cat) : Cat = f_c()
-
-    stateful function f_a_to_u_to_c(_ : (Animal => unit)) : Cat = f_c()
-    stateful function f_c_to_u_to_a(_ : (Cat => unit)) : Animal = f_a()
-    stateful function f_c_to_u_to_c(_ : (Cat => unit)) : Cat = f_c()
-
-    stateful function f_u_to_dt_co_a(_ : unit) : dt_co(Animal) = DT_CO(f_u_to_a)
-    stateful function f_u_to_dt_co_c(_ : unit) : dt_co(Cat) = DT_CO(f_u_to_c)
-
-    stateful entrypoint init() =
-        let va1 : dt_contra(Animal) = DT_CONTRA(f_a_to_u)  // success
-        let va2 : dt_contra(Animal) = DT_CONTRA(f_c_to_u)  // fail
-        let va3 : dt_contra(Cat)    = DT_CONTRA(f_a_to_u)  // success
-        let va4 : dt_contra(Cat)    = DT_CONTRA(f_c_to_u)  // success
-
-        let vb1 : dt_co(Animal) = DT_CO(f_u_to_a)  // success
-        let vb2 : dt_co(Animal) = DT_CO(f_u_to_c)  // success
-        let vb3 : dt_co(Cat)    = DT_CO(f_u_to_a)  // fail
-        let vb4 : dt_co(Cat)    = DT_CO(f_u_to_c)  // success
-
-        let vc1 : dt_inv(Animal) = DT_INV(f_a_to_a)  // success
-        let vc2 : dt_inv(Animal) = DT_INV(f_a_to_c)  // success
-        let vc3 : dt_inv(Animal) = DT_INV(f_c_to_a)  // fail
-        let vc4 : dt_inv(Animal) = DT_INV(f_c_to_c)  // fail
-        let vc5 : dt_inv(Cat)    = DT_INV(f_a_to_a)  // fail
-        let vc6 : dt_inv(Cat)    = DT_INV(f_a_to_c)  // fail
-        let vc7 : dt_inv(Cat)    = DT_INV(f_c_to_a)  // fail
-        let vc8 : dt_inv(Cat)    = DT_INV(f_c_to_c)  // success
-
-        let vd1 : dt_biv(Animal) = DT_BIV(f_u_to_u) : dt_biv(Animal)  // success
-        let vd2 : dt_biv(Animal) = DT_BIV(f_u_to_u) : dt_biv(Cat)     // success
-        let vd3 : dt_biv(Cat)    = DT_BIV(f_u_to_u) : dt_biv(Animal)  // success
-        let vd4 : dt_biv(Cat)    = DT_BIV(f_u_to_u) : dt_biv(Cat)     // success
-
-        let ve1 : dt_inv_sep(Animal) = DT_INV_SEP_A(f_a_to_u)  // success
-        let ve2 : dt_inv_sep(Animal) = DT_INV_SEP_A(f_c_to_u)  // fail
-        let ve3 : dt_inv_sep(Animal) = DT_INV_SEP_B(f_u_to_a)  // success
-        let ve4 : dt_inv_sep(Animal) = DT_INV_SEP_B(f_u_to_c)  // fail
-        let ve5 : dt_inv_sep(Cat)    = DT_INV_SEP_A(f_a_to_u)  // fail
-        let ve6 : dt_inv_sep(Cat)    = DT_INV_SEP_A(f_c_to_u)  // success
-        let ve7 : dt_inv_sep(Cat)    = DT_INV_SEP_B(f_u_to_a)  // fail
-        let ve8 : dt_inv_sep(Cat)    = DT_INV_SEP_B(f_u_to_c)  // success
-
-        let vf1 : dt_co_nest_a(Animal) = DT_CO_NEST_A(f_dt_contra_a_to_u)  // success
-        let vf2 : dt_co_nest_a(Animal) = DT_CO_NEST_A(f_dt_contra_c_to_u)  // success
-        let vf3 : dt_co_nest_a(Cat)    = DT_CO_NEST_A(f_dt_contra_a_to_u)  // fail
-        let vf4 : dt_co_nest_a(Cat)    = DT_CO_NEST_A(f_dt_contra_c_to_u)  // success
-
-        let vg1 : dt_contra_nest_a(Animal) = DT_CONTRA_NEST_A(f_dt_co_a_to_u)  // success
-        let vg2 : dt_contra_nest_a(Animal) = DT_CONTRA_NEST_A(f_dt_co_c_to_u)  // fail
-        let vg3 : dt_contra_nest_a(Cat)    = DT_CONTRA_NEST_A(f_dt_co_a_to_u)  // success
-        let vg4 : dt_contra_nest_a(Cat)    = DT_CONTRA_NEST_A(f_dt_co_c_to_u)  // success
-
-        let vh1 : dt_contra_nest_b(Animal) = DT_CONTRA_NEST_B(f_u_to_dt_contra_a)  // success
-        let vh2 : dt_contra_nest_b(Animal) = DT_CONTRA_NEST_B(f_u_to_dt_contra_c)  // fail
-        let vh3 : dt_contra_nest_b(Cat)    = DT_CONTRA_NEST_B(f_u_to_dt_contra_a)  // success
-        let vh4 : dt_contra_nest_b(Cat)    = DT_CONTRA_NEST_B(f_u_to_dt_contra_c)  // success
-
-        let vi1 : dt_co_nest_b(Animal) = DT_CO_NEST_B(f_u_to_dt_co_a)  // success
-        let vi2 : dt_co_nest_b(Animal) = DT_CO_NEST_B(f_u_to_dt_co_c)  // success
-        let vi3 : dt_co_nest_b(Cat)    = DT_CO_NEST_B(f_u_to_dt_co_a)  // fail
-        let vi4 : dt_co_nest_b(Cat)    = DT_CO_NEST_B(f_u_to_dt_co_c)  // success
-
-        let vj1 : dt_co_twice(Animal) = DT_CO_TWICE(f_a_to_u_to_c : (Animal => unit) => Animal) : dt_co_twice(Animal)  // success
-        let vj2 : dt_co_twice(Animal) = DT_CO_TWICE(f_c_to_u_to_c : (Cat    => unit) => Cat   ) : dt_co_twice(Cat)     // success
-        let vj3 : dt_co_twice(Cat)    = DT_CO_TWICE(f_c_to_u_to_a : (Animal => unit) => Animal) : dt_co_twice(Animal)  // fail
-        let vj4 : dt_co_twice(Cat)    = DT_CO_TWICE(f_c_to_u_to_c : (Cat    => unit) => Cat   ) : dt_co_twice(Cat)     // success
-
-        let vk01 : dt_a_contra_b_contra(Animal, Animal) = DT_A_CONTRA_B_CONTRA(f_a_to_a_to_u)  // success
-        let vk02 : dt_a_contra_b_contra(Animal, Animal) = DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u)  // fail
-        let vk03 : dt_a_contra_b_contra(Animal, Animal) = DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u)  // fail
-        let vk04 : dt_a_contra_b_contra(Animal, Animal) = DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u)  // fail
-        let vk05 : dt_a_contra_b_contra(Animal, Cat)    = DT_A_CONTRA_B_CONTRA(f_a_to_a_to_u)  // success
-        let vk06 : dt_a_contra_b_contra(Animal, Cat)    = DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u)  // success
-        let vk07 : dt_a_contra_b_contra(Animal, Cat)    = DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u)  // fail
-        let vk08 : dt_a_contra_b_contra(Animal, Cat)    = DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u)  // fail
-        let vk09 : dt_a_contra_b_contra(Cat, Animal)    = DT_A_CONTRA_B_CONTRA(f_a_to_a_to_u)  // success
-        let vk10 : dt_a_contra_b_contra(Cat, Animal)    = DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u)  // fail
-        let vk11 : dt_a_contra_b_contra(Cat, Animal)    = DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u)  // success
-        let vk12 : dt_a_contra_b_contra(Cat, Animal)    = DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u)  // fail
-        let vk13 : dt_a_contra_b_contra(Cat, Cat)       = DT_A_CONTRA_B_CONTRA(f_a_to_a_to_u)  // success
-        let vk14 : dt_a_contra_b_contra(Cat, Cat)       = DT_A_CONTRA_B_CONTRA(f_a_to_c_to_u)  // success
-        let vk15 : dt_a_contra_b_contra(Cat, Cat)       = DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u)  // success
-        let vk16 : dt_a_contra_b_contra(Cat, Cat)       = DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u)  // success
-
-        let vl1 : dt_contra_twice(Animal) = DT_CONTRA_TWICE(f_a_to_a_to_u : Animal => Animal => unit) : dt_contra_twice(Animal)  // success
-        let vl2 : dt_contra_twice(Animal) = DT_CONTRA_TWICE(f_a_to_c_to_u : Cat    => Cat    => unit) : dt_contra_twice(Cat)     // fail
-        let vl3 : dt_contra_twice(Cat)    = DT_CONTRA_TWICE(f_a_to_a_to_u : Animal => Animal => unit) : dt_contra_twice(Animal)  // success
-        let vl4 : dt_contra_twice(Cat)    = DT_CONTRA_TWICE(f_c_to_a_to_u : Cat    => Cat    => unit) : dt_contra_twice(Cat)     // success
-
-        ()

test/contracts/polymorphism_variance_switching_oracles.aes

@@ -1,47 +0,0 @@
-contract interface Animal =
-    entrypoint sound : () => string
-
-contract Cat : Animal =
-    entrypoint sound() = "meow"
-
-main contract Main =
-    entrypoint oracle() = ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-
-    entrypoint query() = oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-
-    entrypoint init() =
-        let o01 : oracle(Animal, Animal) = oracle() : oracle(Animal, Animal)  // success
-        let o02 : oracle(Animal, Animal) = oracle() : oracle(Animal, Cat)     // success
-        let o03 : oracle(Animal, Animal) = oracle() : oracle(Cat, Animal)     // fail
-        let o04 : oracle(Animal, Animal) = oracle() : oracle(Cat, Cat)        // fail
-        let o05 : oracle(Animal, Cat)    = oracle() : oracle(Animal, Animal)  // fail
-        let o06 : oracle(Animal, Cat)    = oracle() : oracle(Animal, Cat)     // success
-        let o07 : oracle(Animal, Cat)    = oracle() : oracle(Cat, Animal)     // fail
-        let o08 : oracle(Animal, Cat)    = oracle() : oracle(Cat, Cat)        // fail
-        let o09 : oracle(Cat, Animal)    = oracle() : oracle(Animal, Animal)  // success
-        let o10 : oracle(Cat, Animal)    = oracle() : oracle(Animal, Cat)     // success
-        let o11 : oracle(Cat, Animal)    = oracle() : oracle(Cat, Animal)     // success
-        let o12 : oracle(Cat, Animal)    = oracle() : oracle(Cat, Cat)        // success
-        let o13 : oracle(Cat, Cat)       = oracle() : oracle(Animal, Animal)  // fail
-        let o14 : oracle(Cat, Cat)       = oracle() : oracle(Animal, Cat)     // success
-        let o15 : oracle(Cat, Cat)       = oracle() : oracle(Cat, Animal)     // fail
-        let o16 : oracle(Cat, Cat)       = oracle() : oracle(Cat, Cat)        // success
-
-        let q01 : oracle_query(Animal, Animal) = query() : oracle_query(Animal, Animal)  // success
-        let q02 : oracle_query(Animal, Animal) = query() : oracle_query(Animal, Cat)     // success
-        let q03 : oracle_query(Animal, Animal) = query() : oracle_query(Cat, Animal)     // success
-        let q04 : oracle_query(Animal, Animal) = query() : oracle_query(Cat, Cat)        // success
-        let q05 : oracle_query(Animal, Cat)    = query() : oracle_query(Animal, Animal)  // fail
-        let q06 : oracle_query(Animal, Cat)    = query() : oracle_query(Animal, Cat)     // success
-        let q07 : oracle_query(Animal, Cat)    = query() : oracle_query(Cat, Animal)     // fail
-        let q08 : oracle_query(Animal, Cat)    = query() : oracle_query(Cat, Cat)        // success
-        let q09 : oracle_query(Cat, Animal)    = query() : oracle_query(Animal, Animal)  // fail
-        let q10 : oracle_query(Cat, Animal)    = query() : oracle_query(Animal, Cat)     // fail
-        let q11 : oracle_query(Cat, Animal)    = query() : oracle_query(Cat, Animal)     // success
-        let q12 : oracle_query(Cat, Animal)    = query() : oracle_query(Cat, Cat)        // success
-        let q13 : oracle_query(Cat, Cat)       = query() : oracle_query(Animal, Animal)  // fail
-        let q14 : oracle_query(Cat, Cat)       = query() : oracle_query(Animal, Cat)     // fail
-        let q15 : oracle_query(Cat, Cat)       = query() : oracle_query(Cat, Animal)     // fail
-        let q16 : oracle_query(Cat, Cat)       = query() : oracle_query(Cat, Cat)        // success
-
-        ()

test/contracts/polymorphism_variance_switching_records.aes

@@ -1,51 +0,0 @@
-contract interface Animal =
-    entrypoint sound : () => string
-
-contract Cat : Animal =
-    entrypoint sound() = "meow"
-
-main contract Main =
-    record rec_co('a)     = { x : 'a ,
-                              y : () => 'a }
-    record rec_contra('a) = { x : 'a => unit }
-    record rec_inv('a)    = { x : 'a => unit,
-                              y : () => 'a }
-    record rec_biv('a)    = { x : int }
-
-    stateful entrypoint new_cat() : Cat = Chain.create()
-    stateful entrypoint new_animal() : Animal = new_cat()
-    stateful entrypoint animal_to_unit(_ : Animal) : unit = ()
-    stateful entrypoint cat_to_unit(_ : Cat) : unit = ()
-    stateful entrypoint unit_to_animal() : Animal = new_animal()
-    stateful entrypoint unit_to_cat() : Cat = new_cat()
-
-    stateful entrypoint init() =
-        let ra  : rec_co(Animal) = { x = new_animal(), y = unit_to_animal }
-        let rc  : rec_co(Cat)    = { x = new_cat(), y = unit_to_cat }
-        let r01 : rec_co(Animal) = ra  // success
-        let r02 : rec_co(Animal) = rc  // success
-        let r03 : rec_co(Cat)    = ra  // fail
-        let r04 : rec_co(Cat)    = rc  // sucess
-
-        let ratu : rec_contra(Animal) = { x = animal_to_unit }
-        let rctu : rec_contra(Cat)    = { x = cat_to_unit }
-        let r05  : rec_contra(Animal) = ratu  // success
-        let r06  : rec_contra(Animal) = rctu  // fail
-        let r07  : rec_contra(Cat)    = ratu  // success
-        let r08  : rec_contra(Cat)    = rctu  // success
-
-        let rxaya : rec_inv(Animal) = { x = animal_to_unit, y = unit_to_animal }
-        let rxcyc : rec_inv(Cat)    = { x = cat_to_unit, y = unit_to_cat }
-        let r09   : rec_inv(Animal) = rxaya  // success
-        let r10   : rec_inv(Animal) = rxcyc  // fail
-        let r11   : rec_inv(Cat)    = rxaya  // fail
-        let r12   : rec_inv(Cat)    = rxcyc  // success
-
-        let rba : rec_biv(Animal) = { x = 1 }
-        let rbc : rec_biv(Cat)    = { x = 1 }
-        let r13 : rec_biv(Animal) = rba  // success
-        let r14 : rec_biv(Animal) = rbc  // success
-        let r15 : rec_biv(Cat)    = rba  // success
-        let r16 : rec_biv(Cat)    = rbc  // success
-
-        ()

test/contracts/polymorphism_variance_switching_unify_with_interface_decls.aes

@@ -1,5 +0,0 @@
-payable contract interface SalesOffer =
-    entrypoint init : (address, address, int, int) => unit
-
-payable contract Test : SalesOffer =
-    entrypoint init(_, _, _, _) = ()

test/contracts/polymorphism_variance_switching_void_supertype.aes

@@ -1,5 +0,0 @@
-payable contract interface SalesOffer =
-    entrypoint init : (address, address, int, int) => void
-
-payable contract Test : SalesOffer =
-    entrypoint init(_ : address, _ : address, _ : int, _ : int) = ()