[Ceres] Raw pointers as bytes (#493)

* DataPt should contain bytes() now that we have it

* Fix missing negation in docs

.github/workflows/requirements.txt

@@ -2,4 +2,4 @@ mkdocs==1.4.2
 mkdocs-simple-hooks==0.1.5
 mkdocs-material==9.0.9
 mike==1.1.2
-pygments==2.17.2
+pygments==2.14.0

.gitignore

@@ -24,4 +24,3 @@ current_counterexample.eqc
 test/contracts/test.aes
 __pycache__
 .docssite/docs/*.md
-.vscode

CHANGELOG.md

@@ -4,18 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [CERES 8.0.0]
-### Added
-- Added a check for number of type variables in a type signature; it is serialized using 8 bits,
-  so the upper limit is 256.
-### Changed
-### Removed
-
-## [8.0.1]
-### Changed
-- Upgrade aebytecode to v3.4.1 to fix C warnings
-
-## [8.0.0]
 ### Added
 - Bitwise operations for integers: `band`, `bor`, `bxor`, `bnot`, `<<` and `>>`.
 - `Int.mulmod` - combined builtin operation for multiplication and modulus.
@@ -23,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Address.to_bytes` - convert an address to its binary representation (for hashing, etc.).
 - Raw data pointers added to AENS. In short we have introduced a new namespace
   `AENSv2`; they contain types similar to the old `AENS`; `AENS.name` and
-  `AENS.pointee`, where the latter now has a constructor `DataPt(bytes())`. All
+  `AENS.pointee`, where the latter now has a constructor `DataPt(string)`. All
   AENS actions have been moved to `AENSv2`, and `AENSv2.lookup` and
   `AENSv2.update` consume and produce the new types. The old `AENS` namespace
   only contains the old datatypes, that can be used to interface existing
@@ -34,33 +23,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   and `Int.to_bytes`; and adjust `Bytes.concat` to allow both fixed and arbitrary
   sized byte arrays.
 - `Chain.network_id` - a function to get hold of the Chain's network id.
-- Allowing `Bytes.to_any_size` in calldata creation, to enable creation of arguments
-  with arbitray size.
-- Signature literals `sg_...` - they have type `signature` (which is an alias for `bytes(64)`).
-- Support for OTP-27 - no changes in behavior.
 ### Changed
 - `Crypto.verify_sig` is changed to have `msg : bytes()`. I.e. the
   signed data can be of any length (used to be limited to `bytes(32)`/`hash`).
-- System aliases are handled explicitly when converting to a Sophia value, this is only
-  observable for `signature` where a value of type `signature` is now represented as a
-  (new) signature literal.
-- Allow self-qualification, i.e. referencing `X.foo` when in namespace `X`.
 ### Removed
 - `Bitwise.aes` standard library is removed - the builtin operations are superior.
 
-## [7.4.1]
+## [Unreleased]
+### Added
 ### Changed
-- Improve how includes with relative paths are resolved during parsing/compilation. Relative
+### Removed
-  include paths are now always relative to the file containing the `include` statement.
 ### Fixed
-- Disable unused type warnings for types used inside of records.
-
-## [7.4.0]
-### Changed
-- Names of lifted lambdas now consist of parent function's name and their
-  position in the source code.
-### Fixed
-- Lifted lambdas get their names assigned deterministically.
 
 ## [7.3.0]
 ### Fixed
@@ -456,11 +429,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/v8.0.1...HEAD
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v7.3.0...HEAD
-[8.0.1]: https://github.com/aeternity/aesophia/compare/v8.0.0...v8.0.1
-[8.0.0]: https://github.com/aeternity/aesophia/compare/v7.4.1...v8.0.0
-[7.4.1]: https://github.com/aeternity/aesophia/compare/v7.4.0...v7.4.1
-[7.4.0]: https://github.com/aeternity/aesophia/compare/v7.3.0...v7.4.0
 [7.3.0]: 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

Emakefile

@@ -1 +0,0 @@
-{"src/*",  [debug_info, {i, "include/"}, {outdir, "ebin/"}]}.

docs/sophia_features.md

@@ -84,7 +84,7 @@ the return value of the call.
 
 ```sophia
 contract interface VotingType =
-  entrypoint vote : string => unit
+  entrypoint : vote : string => unit
 
 contract Voter =
   entrypoint tryVote(v : VotingType, alt : string) =
@@ -204,7 +204,7 @@ When a `contract` or a `contract interface` implements another `contract interfa
 
 #### 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)),
+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.
 
@@ -224,11 +224,11 @@ A good example of where it matters can be pictured by subtyping of function type
 ```sophia
 contract interface Animal =
   entrypoint age : () => int
-
+  
 contract Dog : Animal =
   entrypoint age() = // ...
   entrypoint woof() = "woof"
-
+  
 contract Cat : Animal =
   entrypoint age() = // ...
   entrypoint meow() = "meow"
@@ -295,11 +295,6 @@ of `A`.
 - When a user-defined type `t('a)` is invariant in `'a`, then `t(A)` can never be
 a subtype of `t(B)`.
 
-#### Type variable limitation
-
-Because of how FATE represents types as values there is a fixed upper limit (256)
-of type variables that can be used in a single type signature.
-
 ## Mutable state
 
 Sophia does not have arbitrary mutable state, but only a limited form of state
@@ -498,24 +493,6 @@ the file, except that error messages will refer to the original source
 locations. The language will try to include each file at most one time automatically,
 so even cyclic includes should be working without any special tinkering.
 
-### Include files using relative paths
-
-When including code from another file using the `include` statement, the path
-is relative to _the file that includes it_. Consider the following file tree:
-```
-c1.aes
-c3.aes
-dir1/c2.aes
-dir1/c3.aes
-```
-
-If `c1.aes` contains `include "c3.aes"` it will include the top level `c3.aes`,
-while if `c2.aes` contained the same line it would as expected include
-`dir1/c3.aes`.
-
-Note: Prior to v7.5.0, it would consider the include path relative to _the main
-contract file_ (or any explicitly set include path).
-
 ## Standard library
 
 Sophia offers [standard library](sophia_stdlib.md) which exposes some
@@ -563,7 +540,6 @@ Sophia has the following types:
 ## Literals
 | Type                 | Constant/Literal example(s)                                                                                                         |
 | ----------           | -------------------------------                                                                                                     |
-| unit                 | ()                                                                                                                                  |
 | int                  | `-1`, `2425`, `4598275923475723498573485768`                                                                                        |
 | address              | `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt`                                                                             |
 | bool                 | `true`, `false`                                                                                                                     |
@@ -578,7 +554,7 @@ Sophia has the following types:
 | state                | `state{ owner = Call.origin, magic_key = #a298105f }`                                                                               |
 | event                | `EventX(0, "Hello")`                                                                                                                |
 | hash                 | `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f`                                                                 |
-| signature            | `sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj`, `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f` |
+| signature            | `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f` |
 | Chain.ttl            | `FixedTTL(1050)`, `RelativeTTL(50)`                                                                                                 |
 | oracle('a, 'b)       | `ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5`                                                                             |
 | oracle_query('a, 'b) | `oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY`                                                                             |
@@ -634,7 +610,7 @@ arithmetic operations:
 - remainder (`x mod y`), satisfying `y * (x / y) + x mod y == x` for non-zero `y`
 - exponentiation (`x ^ y`)
 
-All operations are *safe* with respect to overflow and underflow.
+All operations are *safe* with respect to overflow and underflow. 
 The division and modulo operations throw an arithmetic error if the
 right-hand operand is zero.
 
@@ -646,16 +622,10 @@ Sophia arbitrary-sized integers (FATE) also supports the following bitwise opera
 - arithmetic bitshift left (`x << n`)
 - arithmetic bitshift right (`x >> n`)
 
-Note: Arithmetic bitshift treats the number as a signed integer (in 2s
-complement), and "retains" the topmost bit. I.e. shifting in zeros if the
-topmost bit was 0, and ones if it was one.
-
 ## Bit fields
 
-Originally Sophia integers did not support bit arithmetic. Instead we used a
+Sophia integers do not support bit arithmetic. Instead there is a separate
-separate type `bits` (see the standard library
+type `bits`. See the standard library [documentation](sophia_stdlib.md#bits).
-[documentation](sophia_stdlib.md#bits)) - it is still provided as an
-alternative to bit arithmetic.
 
 A bit field can be of arbitrary size (but it is still represented by the
 corresponding integer, so setting very high bits can be expensive).
@@ -960,18 +930,16 @@ functions are provided.
 
 ## AENS interface
 
-Contracts can interact with the [æternity naming
+Contracts can interact with the
-system](https://github.com/aeternity/protocol/blob/master/AENS.md). For this
+[æternity naming system](https://github.com/aeternity/protocol/blob/master/AENS.md).
-purpose the [AENS](sophia_stdlib.md#aens) and later the
+For this purpose the [AENS](sophia_stdlib.md#aens) library was exposed.
-[AENSv2](sophia_stdlib.md#aensv2) library was exposed.
 
 ### Example
 
 In this example we assume that the name `name` already exists, and is owned by
 an account with address `addr`. In order to allow a contract `ct` to handle
-`name` the account holder needs to create a [delegation
+`name` the account holder needs to create a
-signature](#delegation-signature) `sig` from the name owner address `addr`, the
+[signature](#delegation-signature) `sig` of `addr | name.hash | ct.address`.
-name hash and the contract address.
 
 Armed with this information we can for example write a function that extends
 the name if it expires within 1000 blocks:
@@ -1113,34 +1081,8 @@ however is in the gas consumption — while `abort` returns unused gas, a call t
 
 ## Delegation signature
 
-Some chain operations (`Oracle.<operation>` and `AENSv2.<operation>`) have an
+Some chain operations (`Oracle.<operation>` and `AENS.<operation>`) have an
 optional delegation signature. This is typically used when a user/accounts
-would like to allow a contract to act on it's behalf.
+would like to allow a contract to act on it's behalf. The exact data to be
-
+signed varies for the different operations, but in all cases you should prepend
-### From Ceres
+the signature data with the `network_id` (`ae_mainnet` for the æternity mainnet, etc.).
-
-From the Ceres protocol version the delegation signatures have more structure,
-including a unique tag, `network_id` and identifiers; there are five different
-delegation signatures:
-
- - AENS wildcard - the user signs: `owner account + contract`
- - `AENS_PRECLAIM` - the user signs: `owner account + contract`
- - `AENS_CLAIM, AENS_UPDATE, AENS_TRANSFER, AENS_REVOKE` - the user signs: `owner account + name hash + contract`
- - `ORACLE_REGISTER, ORACLE_EXTEND` - the user signs: `owner account + contract`
- - `ORACLE_RESPOND` - the user signs: `query id + contract`
-
-See [Serialized signature
-data](https://github.com/aeternity/protocol/blob/master/contracts/fate.md#from-ceres-serialized-signature-data)
-for the exact structure used.
-
-### Before ceres
-
-The exact data to be signed varies for the different operations, but in all
-cases you should prepend the signature data with the `network_id` (`ae_mainnet`
-for the æternity mainnet, etc.).
-
-There are four different delegation signatures:
- - `AENS_PRECLAIM` - the user signs: owner `network_id + account + contract`
- - `AENS_CLAIM, AENS_UPDATE, AENS_TRANSFER, AENS_REVOKE` - the user signs: `network_id + owner account + name hash + contract`
- - `ORACLE_REGISTER, ORACLE_EXTEND` - the user signs: `network_id + owner account + contract`
- - `ORACLE_RESPOND` - the user signs: `network_id + query id + contract`

docs/sophia_stdlib.md

@@ -146,7 +146,7 @@ datatype pointee = AccountPt(address) | OraclePt(address)
 ```
 
 Note: on-chain there is a maximum length enforced for `DataPt`, it is 1024 bytes.
-Sophia itself does _not_ check for this.
+Sophia itself does _not_ enforce this.
 
 #### Functions
 
@@ -181,14 +181,14 @@ Note: Changed to produce `AENSv2.name` in v8.0 (Ceres protocol upgrade).
 AENSv2.preclaim(owner : address, commitment_hash : hash, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `Contract.address` (concatenated as byte arrays).
-`Contract.address`.
 
 From Ceres (i.e. FATE VM version 3) the
 [signature](./sophia_features.md#delegation-signature) can also be generic
 (allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `Contract.address`.
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
+`Contract.address`.
 
 
 ##### claim
@@ -196,14 +196,14 @@ signature), i.e. containing `network id`, `owner address`, `Contract.address`.
 AENSv2.claim(owner : address, name : string, salt : int, name_fee : int, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address` (concatenated
-`Contract.address`. Using the private key of `owner address` for signing.
+as byte arrays) using the private key of the `owner` account for signing.
 
 From Ceres (i.e. FATE VM version 3) the
 [signature](./sophia_features.md#delegation-signature) can also be generic
 (allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -214,14 +214,15 @@ AENSv2.transfer(owner : address, new_owner : address, name : string, <signature
 
 Transfers name to the new owner.
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address`
-`Contract.address`. Using the private key of `owner address` for signing.
+(concatenated as byte arrays)
+using the private key of the `owner` account for signing.
 
 From Ceres (i.e. FATE VM version 3) the
 [signature](./sophia_features.md#delegation-signature) can also be generic
 (allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -232,14 +233,15 @@ AENSv2.revoke(owner : address, name : string, <signature : signature>) : unit
 
 Revokes the name to extend the ownership time.
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address`
-`Contract.address`. Using the private key of `owner address` for signing.
+(concatenated as byte arrays)
+using the private key of the `owner` account for signing.
 
 From Ceres (i.e. FATE VM version 3) the
 [signature](./sophia_features.md#delegation-signature) can also be generic
 (allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -255,16 +257,6 @@ block of the name is not changed.
 
 Note: Changed to consume `AENSv2.pointee` in v8.0 (Ceres protocol upgrade).
 
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`. Using the private key of `owner address` for signing.
-
-From Ceres (i.e. FATE VM version 3) the
-[signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
-`Contract.address`.
-
 ### Auth
 
 
@@ -614,6 +606,14 @@ charging the calling contract. Note that this won't be visible in `Call.value`
 in the `init` call of the new contract. It will be included in
 `Contract.balance`, however.
 
+#### poseidon
+```
+Crypto.poseidon(x1 : int, x2 : int) : int
+```
+
+Hash two integers (in the scalar field of BLS12-381) to another integer (in the scalar
+field of BLS12-281). This is a ZK/SNARK-friendly hash function.
+
 The type `'c` must be instantiated with a contract.
 
 
@@ -679,8 +679,8 @@ Example usage:
 ```
 payable contract interface Auction =
   entrypoint init : (int, string) => void
-  stateful payable entrypoint buy : (int) => unit
+  stateful payable entrypoint buy : (int) => ()
-  stateful entrypoint sell : (int) => unit
+  stateful entrypoint sell : (int) => ()
 
 main contract Market =
   type state = list(Auction)
@@ -740,15 +740,6 @@ Chain.network\_id : string
 The network id of the chain.
 
 
-#### poseidon
-```
-Crypto.poseidon(x1 : int, x2 : int) : int
-```
-
-Hash two integers (in the scalar field of BLS12-381) to another integer (in the scalar
-field of BLS12-281). This is a ZK/SNARK-friendly hash function.
-
-
 ##### spend
 ```
 Chain.spend(to : address, amount : int) : unit
@@ -894,8 +885,7 @@ Int.to_bytes(n : int, size : int) : bytes()
 ```
 
 Casts the integer to a byte array with `size` bytes (big endian, truncating if
-necessary not preserving signedness). I.e. if you try to squeeze `-129` into a
+necessary).
-single byte that will be indistinguishable from `127`.
 
 
 ### Map
@@ -954,11 +944,11 @@ Oracle.register(<signature : bytes(64)>, acct : address, qfee : int, ttl : Chain
 Registers new oracle answering questions of type `'a` with answers of type `'b`.
 
 * The `acct` is the address of the oracle to register (can be the same as the contract).
-* The [signature](./sophia_features.md#delegation-signature) should be a
+* `signature` is a signature proving that the contract is allowed to register the account -
-  serialized structure containing `network id`, `account address`, and
+  the `network id` + `account address` + `contract address` (concatenated as byte arrays) is
-  `contract address`. Using the private key of `account address` for signing.
+  [signed](./sophia_features.md#delegation-signature) with the
-  Proving you have the private key of the oracle to be. If the address is the same
+  private key of the account, proving you have the private key of the oracle to be. If the
-  as the contract `sign` is ignored and can be left out entirely.
+  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
   key block height (`RelativeTTL(delta)`) or a fixed key block height (`FixedTTL(height)`).
@@ -972,7 +962,7 @@ Examples:
 ```
 
 
-#### get\_question
+#### get_question
 ```
 Oracle.get_question(o : oracle('a, 'b), q : oracle_query('a, 'b)) : 'a
 ```
@@ -985,11 +975,12 @@ Checks what was the question of query `q` on oracle `o`
 Oracle.respond(<signature : bytes(64)>, o : oracle('a, 'b), q : oracle_query('a, 'b), 'b) : unit
 ```
 
-Responds to the question `q` on `o`.  Unless the contract address is the same
+Responds to the question `q` on `o`.
-as the oracle address the `signature` (which is an optional, named argument)
+Unless the contract address is the same as the oracle address the `signature`
+(which is an optional, named argument)
 needs to be provided. Proving that we have the private key of the oracle by
-[signing](./sophia_features.md#delegation-signature) should be a serialized
+[signing](./sophia_features.md#delegation-signature)
-structure containing `network id`, `oracle query id`, and `contract address`.
+the `network id` + `oracle query id` + `contract address`
 
 
 #### extend
@@ -1002,7 +993,7 @@ Extends TTL of an oracle.
 * `o` is the oracle being extended
 * `ttl` must be `RelativeTTL`. The time to live of `o` will be extended by this value.
 
-#### query\_fee
+#### query_fee
 ```
 Oracle.query_fee(o : oracle('a, 'b)) : int
 ```
@@ -1023,7 +1014,7 @@ Asks the oracle a question.
 The call fails if the oracle could expire before an answer.
 
 
-#### get\_answer
+#### get_answer
 ```
 Oracle.get_answer(o : oracle('a, 'b), q : oracle_query('a, 'b)) : option('b)
 ```
@@ -2476,9 +2467,7 @@ an integer. If the string doesn't contain a valid number `None` is returned.
 to_bytes(s : string) : bytes()
 ```
 
-Converts string into byte array. String is UTF-8 encoded. I.e.
+Converts string into byte array.
-`String.length(s)` is not guaranteed to be equal to
-`Bytes.size(String.to_bytes(s))`.
 
 #### sha3
 ```

docs/sophia_syntax.md

@@ -30,7 +30,6 @@ interface main using as for hiding
 - `ContractAddress` base58-encoded 32 byte contract address with `ct_` prefix
 - `OracleAddress` base58-encoded 32 byte oracle address with `ok_` prefix
 - `OracleQueryId` base58-encoded 32 byte oracle query id with `oq_` prefix
-- `Signature` base58-encoded 64 byte cryptographic signature with `sg_` prefix
 
 Valid string escape codes are
 
@@ -240,7 +239,6 @@ Expr ::= '(' LamArgs ')' '=>' Block(Stmt)   // Anonymous function    (x) => x +
        | Int | Bytes | String | Char        // Literals              123, 0xff, #00abc123, "foo", '%'
        | AccountAddress | ContractAddress   // Chain identifiers
        | OracleAddress | OracleQueryId      // Chain identifiers
-       | Signature                          // Signature
        | '???'                              // Hole expression       1 + ???
 
 Generator ::= Pattern '<-' Expr   // Generator
@@ -267,11 +265,11 @@ UnOp  ::= '-' | '!' | 'bnot'
 | Operators | Type
 | --- | ---
 | `-` `+` `*` `/` `mod` `^` | arithmetic operators
-| `!` `&&` `\|\|` | logical operators
+| `!` `&&` `||` | logical operators
 | `band` `bor` `bxor` `bnot` `<<` `>>` | bitwise operators
 | `==` `!=` `<` `>` `=<` `>=` | comparison operators
 | `::` `++` | list operators
-| `\|>` | functional operators
+| `|>` | functional operators
 
 ## Operator precedence
 
@@ -291,5 +289,5 @@ In order of highest to lowest precedence.
 | `bxor` | left
 | `bor` | left
 | `&&` | right
-| `\|\|` | right
+| `||` | right
-| `\|>` | left
+| `|>` | left

priv/stdlib/List.aes

@@ -282,9 +282,9 @@ namespace List =
   private function
     asc : (('a, 'a) => bool, 'a, list('a), list('a)) => list(list('a))
     asc(lt, x, acc, h::t) =
-      if(lt(h, x)) reverse(x::acc) :: monotonic_subs(lt, h::t)
+      if(lt(h, x)) List.reverse(x::acc) :: monotonic_subs(lt, h::t)
       else asc(lt, h, x::acc, t)
-    asc(_, x, acc, []) = [reverse(x::acc)]
+    asc(_, x, acc, []) = [List.reverse(x::acc)]
 
   /** Merges list of sorted lists
    */

rebar.config

@@ -2,7 +2,7 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.4.1"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.4.0"}}}
        , {eblake2, "1.0.0"}
        , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
        ]}.
@@ -13,7 +13,7 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {aesophia, "8.0.1"},
+{relx, [{release, {aesophia, "8.0.0"},
          [aesophia, aebytecode]},
 
         {dev_mode, true},

rebar.lock

@@ -1,11 +1,11 @@
 {"1.2.0",
 [{<<"aebytecode">>,
   {git,"https://github.com/aeternity/aebytecode.git",
-       {ref,"6bd6f82c70d800950ea1a2c70c364a4181ff5291"}},
+       {ref,"009e0361922037f978f9c0ef357d4d1be8559928"}},
   0},
  {<<"aeserialization">>,
   {git,"https://github.com/aeternity/aeserialization.git",
-       {ref,"b26e6d105424748ba1c27917267b7cff07f37802"}},
+       {ref,"177bf604b2a05e940f92cf00e96e6e269e708245"}},
   1},
  {<<"base58">>,
   {git,"https://github.com/aeternity/erl-base58.git",
@@ -14,7 +14,7 @@
  {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0},
  {<<"enacl">>,
   {git,"https://github.com/aeternity/enacl.git",
-       {ref,"4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}},
+       {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
   2},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},1},
  {<<"jsx">>,

src/aeso_aci.erl

@@ -8,7 +8,6 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_aci).
--vsn("8.0.1").
 
 -export([ file/2
         , file/3
@@ -199,8 +198,7 @@ encode_expr({bytes, _, B})  ->
     <<N:Digits/unit:8>> = B,
     list_to_binary(lists:flatten(io_lib:format("#~*.16.0b", [Digits*2, N])));
 encode_expr({Lit, _, L}) when Lit == oracle_pubkey; Lit == oracle_query_id;
-                              Lit == contract_pubkey; Lit == account_pubkey;
+                              Lit == contract_pubkey; Lit == account_pubkey ->
-                              Lit == signature ->
     aeser_api_encoder:encode(Lit, L);
 encode_expr({app, _, {'-', _}, [{int, _, N}]}) ->
   encode_expr({int, [], -N});
@@ -223,41 +221,16 @@ do_render_aci_json(Json) ->
         case Json of
             JArray when is_list(JArray)  -> JArray;
             JObject when is_map(JObject) -> [JObject];
-            JText when is_binary(JText)  -> decode(JText)
+            JText when is_binary(JText)  ->
+                case jsx:decode(Json, [{labels, atom}, return_maps]) of
+                    JArray when is_list(JArray)  -> JArray;
+                    JObject when is_map(JObject) -> [JObject];
+                    _                            -> error(bad_aci_json)
+                end
         end,
     DecodedContracts = [ decode_contract(C) || C <- Contracts ],
     {ok, list_to_binary(string:join(DecodedContracts, "\n"))}.
 
-
-decode(JSON) ->
-    case code:is_loaded(jsx) of
-        {file, _} ->
-            case jsx:decode(JSON, [{labels, atom}, return_maps]) of
-                JArray when is_list(JArray)  -> JArray;
-                JObject when is_map(JObject) -> [JObject];
-                _                            -> error(bad_aci_json)
-            end;
-        false ->
-            case zj:binary_decode(JSON) of
-                {ok, Decoded} when is_list(Decoded) -> atomize(Decoded);
-                {ok, Decoded} when is_map(Decoded)  -> [atomize(Decoded)];
-                _                                   -> error(bad_aci_json)
-            end
-    end.
-
-atomize(T) when is_map(T) ->
-    maps:fold(fun atomize/3, #{}, T);
-atomize(T) when is_list(T) ->
-    lists:map(fun atomize/1, T);
-atomize(T) ->
-    T.
-
-atomize(K, V, M) when is_binary(K) ->
-    maps:put(binary_to_atom(K), atomize(V), M);
-atomize(K, V, M) ->
-    maps:put(K, V, M).
-
-
 decode_contract(#{contract := #{name := Name,
                                 kind := Kind,
                                 payable := Payable,

src/aeso_ast.erl

@@ -1,5 +1,4 @@
 -module(aeso_ast).
--vsn("8.0.1").
 
 -export([int/2,
          line/1,

src/aeso_ast_infer_types.erl

@@ -11,7 +11,6 @@
 %%% instances of the compiler to be run in parallel.
 
 -module(aeso_ast_infer_types).
--vsn("8.0.1").
 
 -export([ infer/1
         , infer/2
@@ -952,14 +951,14 @@ infer(Contracts, Options) ->
         {Env1, Decls} = infer1(Env, Contracts1, [], Options),
         when_warning(warn_unused_functions, fun() -> destroy_and_report_unused_functions() end),
         when_option(warn_error, fun() -> destroy_and_report_warnings_as_type_errors() end),
+        WarningsUnsorted = lists:map(fun mk_warning/1, ets_tab2list(warnings)),
+        Warnings = aeso_warnings:sort_warnings(WarningsUnsorted),
         {Env2, DeclsFolded, DeclsUnfolded} =
             case proplists:get_value(dont_unfold, Options, false) of
                 true  -> {Env1, Decls, Decls};
                 false -> E = on_scopes(Env1, fun(Scope) -> unfold_record_types(Env1, Scope) end),
                          {E, Decls, unfold_record_types(E, Decls)}
             end,
-        WarningsUnsorted = lists:map(fun mk_warning/1, ets_tab2list(warnings)),
-        Warnings = aeso_warnings:sort_warnings(WarningsUnsorted),
         case proplists:get_value(return_env, Options, false) of
             false -> {DeclsFolded, DeclsUnfolded, Warnings};
             true  -> {Env2, DeclsFolded, DeclsUnfolded, Warnings}
@@ -1162,7 +1161,7 @@ infer_contract(Env0, What, Defs0, Options) ->
     _         = bind_funs(lists:map(FunBind, Functions), #env{}),
     FunMap    = maps:from_list([ {FunName(Def), Def} || Def <- Functions ]),
     check_reserved_entrypoints(FunMap),
-    DepGraph  = maps:map(fun(_, Def) -> aeso_syntax_utils:used_ids(Env3#env.namespace, Def) end, FunMap),
+    DepGraph  = maps:map(fun(_, Def) -> aeso_syntax_utils:used_ids(Def) end, FunMap),
     SCCs      = aeso_utils:scc(DepGraph),
     {Env4, Defs1} = check_sccs(Env3, FunMap, SCCs, []),
     %% Remove namespaces used in the current namespace
@@ -1761,27 +1760,8 @@ desugar_clauses(Ann, Fun, {type_sig, _, _, _, ArgTypes, RetType}, Clauses) ->
     end.
 
 print_typesig({Name, TypeSig}) ->
-    assert_tvars(Name, TypeSig),
     ?PRINT_TYPES("Inferred ~s : ~s\n", [Name, pp(TypeSig)]).
 
-assert_tvars(Name, TS) ->
-    TVars = assert_tvars_(TS, #{}),
-    case maps:size(TVars) > 256 of
-        true ->
-            type_error({too_many_tvars, Name, TS});
-        false ->
-            ok
-    end.
-
-assert_tvars_({tvar, _, TV}, TVars) ->
-    TVars#{TV => ok};
-assert_tvars_(T, TVars) when is_tuple(T) ->
-    assert_tvars_(tuple_to_list(T), TVars);
-assert_tvars_(Ts, TVars) when is_list(Ts) ->
-    lists:foldl(fun(T, TVars1) -> assert_tvars_(T, TVars1) end, TVars, Ts);
-assert_tvars_(_, TVars) ->
-    TVars.
-
 arg_type(ArgAnn, {id, Ann, "_"}) ->
     case aeso_syntax:get_ann(origin, Ann, user) of
         system -> fresh_uvar(ArgAnn);
@@ -1955,8 +1935,6 @@ infer_expr(_Env, Body={bytes, As, Bin}) ->
     {typed, As, Body, {bytes_t, As, byte_size(Bin)}};
 infer_expr(_Env, Body={account_pubkey, As, _}) ->
     {typed, As, Body, {id, As, "address"}};
-infer_expr(_Env, Body={signature, As, Bin}) when byte_size(Bin) == 64 ->
-    {typed, As, Body, {bytes_t, As, 64}};
 infer_expr(_Env, Body={oracle_pubkey, As, _}) ->
     Q = fresh_uvar(As),
     R = fresh_uvar(As),
@@ -2195,8 +2173,6 @@ check_valid_const_expr({bytes, _, _}) ->
     true;
 check_valid_const_expr({account_pubkey, _, _}) ->
     true;
-check_valid_const_expr({signature, _, _}) ->
-    true;
 check_valid_const_expr({oracle_pubkey, _, _}) ->
     true;
 check_valid_const_expr({oracle_query_id, _, _}) ->
@@ -2977,6 +2953,7 @@ record_type_name({app_t, _Attrs, RecId, _Args}) when ?is_type_id(RecId) ->
 record_type_name(RecId) when ?is_type_id(RecId) ->
     RecId;
 record_type_name(_Other) ->
+    %% io:format("~p is not a record type\n", [Other]),
     {id, [{origin, system}], "not_a_record_type"}.
 
 solve_for_uvar(Env, UVar = {uvar, Attrs, _}, Fields0) ->
@@ -3084,8 +3061,7 @@ unfold_types_in_type(Env, {app_t, Ann, Id, Args}, Options) when ?is_type_id(Id)
 unfold_types_in_type(Env, Id, Options) when ?is_type_id(Id) ->
     %% Like the case above, but for types without parameters.
     when_warning(warn_unused_typedefs, fun() -> used_typedef(Id, 0) end),
-    UnfoldSysAlias = not proplists:get_value(not_unfold_system_alias_types, Options, false),
+    UnfoldRecords = proplists:get_value(unfold_record_types, Options, false),
-    UnfoldRecords  = proplists:get_value(unfold_record_types, Options, false),
     UnfoldVariants = proplists:get_value(unfold_variant_types, Options, false),
     case lookup_type(Env, Id) of
         {_, {_, {[], {record_t, Fields}}}} when UnfoldRecords ->
@@ -3093,12 +3069,7 @@ unfold_types_in_type(Env, Id, Options) when ?is_type_id(Id) ->
         {_, {_, {[], {variant_t, Constrs}}}} when UnfoldVariants ->
             {variant_t, unfold_types_in_type(Env, Constrs, Options)};
         {_, {_, {[], {alias_t, Type1}}}} ->
-            case aeso_syntax:get_ann(Type1) of
+            unfold_types_in_type(Env, Type1, Options);
-                [{origin, system}] when not UnfoldSysAlias ->
-                    Id;
-                _ ->
-                    unfold_types_in_type(Env, Type1, Options)
-            end;
         _ ->
             %% Not a record type, or ill-formed record type
             Id
@@ -3409,7 +3380,7 @@ instantiate1(X) ->
 integer_to_tvar(X) when X < 26 ->
     [$a + X];
 integer_to_tvar(X) ->
-    integer_to_tvar(X div 26 - 1) ++ [$a + (X rem 26)].
+    [integer_to_tvar(X div 26)] ++ [$a + (X rem 26)].
 
 %% Warnings
 
@@ -3591,6 +3562,7 @@ create_type_errors() ->
 
 destroy_and_report_type_errors(Env) ->
     Errors0 = lists:reverse(ets_tab2list(type_errors)),
+    %% io:format("Type errors now: ~p\n", [Errors0]),
     ets_delete(type_errors),
     Errors  = [ mk_error(unqualify(Env, Err)) || Err <- Errors0 ],
     aeso_errors:throw(Errors).  %% No-op if Errors == []
@@ -3796,9 +3768,6 @@ mk_error({type_decl, _, {id, Pos, Name}, _}) ->
     Msg = io_lib:format("Empty type declarations are not supported. Type `~s` lacks a definition",
                         [Name]),
     mk_t_err(pos(Pos), Msg);
-mk_error({too_many_tvars, Name, {type_sig, Pos, _, _, _, _}}) ->
-    Msg = io_lib:format("Too many type variables (max 256) in definition of `~s`", [Name]),
-    mk_t_err(pos(Pos), Msg);
 mk_error({stateful_not_allowed, Id, Fun}) ->
     Msg = io_lib:format("Cannot reference stateful function `~s` in the definition of non-stateful function `~s`.",
                         [pp(Id), pp(Fun)]),

src/aeso_ast_to_fcode.erl

@@ -8,7 +8,6 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(aeso_ast_to_fcode).
--vsn("8.0.1").
 
 -export([ast_to_fcode/2, format_fexpr/1]).
 -export_type([fcode/0, fexpr/0, fun_def/0]).
@@ -56,15 +55,11 @@
               | {contract_pubkey, binary()}
               | {oracle_pubkey, binary()}
               | {oracle_query_id, binary()}
-              | {signature, binary()}
               | {bool, false | true}
               | {contract_code, string()} %% for CREATE, by name
               | {typerep, ftype()}.
 
--type fann() :: [ {file, aeso_syntax:ann_file()} |
+-type fann() :: [ {file, aeso_syntax:ann_file()} | {line, aeso_syntax:ann_line()} ].
-                  {line, aeso_syntax:ann_line()} |
-                  {col, aeso_syntax:ann_col()}
-                ].
 
 -type fexpr() :: {lit, fann(), flit()}
                | {nil, fann()}
@@ -406,23 +401,11 @@ to_fcode(Env, [{namespace, _, {con, _, Con}, Decls} | Code]) ->
     Env1 = decls_to_fcode(Env#{ context => {namespace, Con} }, Decls),
     to_fcode(Env1, Code).
 
--spec ann_loc(aeso_syntax:ann() | fann()) -> {File, Line, Column} when
-      File   :: string() | none,
-      Line   :: non_neg_integer() | none,
-      Column :: non_neg_integer() | none.
-ann_loc(Ann) ->
-    File = proplists:get_value(file, Ann, none),
-    Line = proplists:get_value(line, Ann, none),
-    Col  = proplists:get_value(col, Ann, none),
-    {File, Line, Col}.
-
 -spec to_fann(aeso_syntax:ann()) -> fann().
 to_fann(Ann) ->
-    {File, Line, Col} = ann_loc(Ann),
+    File = proplists:lookup(file, Ann),
-    [ {Tag, X} ||
+    Line = proplists:lookup(line, Ann),
-        {Tag, X} <- [{file, File}, {line, Line}, {col, Col}],
+    [ X || X <- [File, Line], X =/= none ].
-        X =/= none, X =/= no_file
-    ].
 
 -spec get_fann(fexpr()) -> fann().
 get_fann(FExpr) -> element(2, FExpr).
@@ -601,7 +584,6 @@ expr_to_fcode(_Env, _Type, {char,            Ann, N}) -> {lit, to_fann(Ann), {in
 expr_to_fcode(_Env, _Type, {bool,            Ann, B}) -> {lit, to_fann(Ann), {bool, B}};
 expr_to_fcode(_Env, _Type, {string,          Ann, S}) -> {lit, to_fann(Ann), {string, S}};
 expr_to_fcode(_Env, _Type, {account_pubkey,  Ann, K}) -> {lit, to_fann(Ann), {account_pubkey, K}};
-expr_to_fcode(_Env, _Type, {signature,       Ann, K}) -> {lit, to_fann(Ann), {signature, K}};
 expr_to_fcode(_Env, _Type, {contract_pubkey, Ann, K}) -> {lit, to_fann(Ann), {contract_pubkey, K}};
 expr_to_fcode(_Env, _Type, {oracle_pubkey,   Ann, K}) -> {lit, to_fann(Ann), {oracle_pubkey, K}};
 expr_to_fcode(_Env, _Type, {oracle_query_id, Ann, K}) -> {lit, to_fann(Ann), {oracle_query_id, K}};
@@ -1312,13 +1294,10 @@ event_function(_Env = #{event_type := {variant_t, EventCons}}, EventType = {vari
 
 -spec lambda_lift(fcode()) -> fcode().
 lambda_lift(FCode = #{ functions := Funs, state_layout := StateLayout }) ->
-    NewFuns =
+    init_lambda_funs(),
-        [ {FunName, FunDef}
+    Funs1   = maps:map(fun(_, Body) -> lambda_lift_fun(StateLayout, Body) end, Funs),
-          || {ParentName, ParentDef} <- maps:to_list(Funs),
+    NewFuns = get_lambda_funs(),
-             {NewParentDef, Lambdas} <- [lambda_lift_fun(StateLayout, ParentName, ParentDef)],
+    FCode#{ functions := maps:merge(Funs1, NewFuns) }.
-             {FunName, FunDef} <- [{ParentName, NewParentDef} | maps:to_list(Lambdas)]
-        ],
-    FCode#{ functions := maps:from_list(NewFuns) }.
 
 -define(lambda_key, '%lambdalifted').
 
@@ -1326,42 +1305,18 @@ lambda_lift(FCode = #{ functions := Funs, state_layout := StateLayout }) ->
 init_lambda_funs() -> put(?lambda_key, #{}).
 
 -spec get_lambda_funs() -> term().
-get_lambda_funs()  ->
+get_lambda_funs()  -> erase(?lambda_key).
-    Lambdas = erase(?lambda_key),
-    %% Remove name feed entries and leave only actual functions
-    maps:filter(fun({fresh, _}, _) -> false;
-                   (_, _) -> true
-                end, Lambdas).
 
--spec add_lambda_fun(fun_name(), fann(), fun_def()) -> fun_name().
+-spec add_lambda_fun(fun_def()) -> fun_name().
-add_lambda_fun(Parent, FAnn, Def) ->
+add_lambda_fun(Def) ->
+    Name = fresh_fun(),
     Funs = get(?lambda_key),
-    LambdaId = maps:get({fresh, Parent}, Funs, 0),
+    put(?lambda_key, Funs#{ Name => Def }),
-    Name = lambda_name(FAnn, LambdaId, Parent),
-    put(?lambda_key, Funs#{ Name => Def, {fresh, Parent} => LambdaId + 1}),
     Name.
 
--spec lambda_name(fann(), non_neg_integer(), fun_name()) -> fun_name().
+-spec lambda_lift_fun(state_layout(), fun_def()) -> fun_def().
-lambda_name(FAnn, Id, PName) ->
+lambda_lift_fun(Layout, Def = #{ body := Body }) ->
-    PSName = case PName of
+    Def#{ body := lambda_lift_expr(Layout, Body) }.
-                 {entrypoint, N} -> [binary_to_list(N)];
-                 {local_fun, Ns} -> Ns
-             end,
-    {_File, Line, Col} = ann_loc(FAnn),
-    Name = PSName ++
-           [ "%lambda"
-           , if is_integer(Line) -> integer_to_list(Line); true -> "" end
-           , if is_integer(Col) -> integer_to_list(Col); true -> "" end
-           , integer_to_list(Id)],
-    {local_fun, Name}.
-
--spec lambda_lift_fun(state_layout(), fun_name(), fun_def()) -> {fun_def(), #{var_name() => term()}}.
-lambda_lift_fun(Layout, Name, Def = #{ body := Body }) ->
-    %% Not thread safe! We initialize state per functions not to depend on the order in which
-    %% functions are processed.
-    init_lambda_funs(),
-    NewDef = Def#{ body := lambda_lift_expr(Layout, Name, Body) },
-    {NewDef, get_lambda_funs()}.
 
 -spec lifted_fun([var_name()], [var_name()], fexpr()) -> fun_def().
 lifted_fun([Z], Xs, Body) ->
@@ -1379,20 +1334,21 @@ lifted_fun(FVs, Xs, Body) ->
        body   => lists:foldr(Proj, Body, indexed(FVs))
      }.
 
--spec make_closure(fun_name(), fann(), [var_name()], [var_name()], fexpr()) -> Closure when
+-spec make_closure([var_name()], [var_name()], fexpr()) -> Closure when
       Closure :: fexpr().
-make_closure(ParentName, FAnn, FVs, Xs, Body) ->
+make_closure(FVs, Xs, Body) ->
-    Name  = add_lambda_fun(ParentName, FAnn, lifted_fun(FVs, Xs, Body)),
+    Fun   = add_lambda_fun(lifted_fun(FVs, Xs, Body)),
+    FAnn  = get_fann(Body),
     Tup = fun([Y]) -> Y; (Ys) -> {tuple, FAnn, Ys} end,
-    {closure, FAnn, Name, Tup([{var, FAnn, Y} || Y <- FVs])}.
+    {closure, FAnn, Fun, Tup([{var, FAnn, Y} || Y <- FVs])}.
 
--spec lambda_lift_expr(state_layout(), fun_name(), fexpr()) -> Closure when
+-spec lambda_lift_expr(state_layout(), fexpr()) -> Closure when
       Closure :: fexpr().
-lambda_lift_expr(Layout, Name, L = {lam, FAnn, Xs, Body}) ->
+lambda_lift_expr(Layout, L = {lam, _, Xs, Body}) ->
     FVs   = free_vars(L),
-    make_closure(Name, FAnn, FVs, Xs, lambda_lift_expr(Layout, Name, Body));
+    make_closure(FVs, Xs, lambda_lift_expr(Layout, Body));
-lambda_lift_expr(Layout, Name, UExpr) when element(1, UExpr) == def_u; element(1, UExpr) == builtin_u ->
+lambda_lift_expr(Layout, UExpr) when element(1, UExpr) == def_u; element(1, UExpr) == builtin_u ->
-    [Tag, FAnn, F, Ar | _] = tuple_to_list(UExpr),
+    [Tag, _, F, Ar | _] = tuple_to_list(UExpr),
     ExtraArgs = case UExpr of
                     {builtin_u, _, _, _, TypeArgs} -> TypeArgs;
                     _                              -> []
@@ -1403,41 +1359,41 @@ lambda_lift_expr(Layout, Name, UExpr) when element(1, UExpr) == def_u; element(1
                builtin_u -> builtin_to_fcode(Layout, get_fann(UExpr), F, Args);
                def_u     -> {def, get_fann(UExpr), F, Args}
            end,
-    make_closure(Name, FAnn, [], Xs, Body);
+    make_closure([], Xs, Body);
-lambda_lift_expr(Layout, Name, {remote_u, FAnn, ArgsT, RetT, Ct, F}) ->
+lambda_lift_expr(Layout, {remote_u, FAnn, ArgsT, RetT, Ct, F}) ->
     FVs  = free_vars(Ct),
-    Ct1  = lambda_lift_expr(Layout, Name, Ct),
+    Ct1  = lambda_lift_expr(Layout, Ct),
     NamedArgCount = 3,
     Xs   = [ lists:concat(["arg", I]) || I <- lists:seq(1, length(ArgsT) + NamedArgCount) ],
     Args = [{var, [], X} || X <- Xs],
-    make_closure(Name, FAnn, FVs, Xs, {remote, FAnn, ArgsT, RetT, Ct1, F, Args});
+    make_closure(FVs, Xs, {remote, FAnn, ArgsT, RetT, Ct1, F, Args});
-lambda_lift_expr(Layout, Name, Expr) ->
+lambda_lift_expr(Layout, Expr) ->
     case Expr of
         {lit, _, _}               -> Expr;
         {nil, _}                  -> Expr;
         {var, _, _}               -> Expr;
         {closure, _, _, _}        -> Expr;
-        {def, FAnn, D, As}        -> {def, FAnn, D, lambda_lift_exprs(Layout, Name, As)};
+        {def, FAnn, D, As}        -> {def, FAnn, D, lambda_lift_exprs(Layout, As)};
-        {builtin, FAnn, B, As}    -> {builtin, FAnn, B, lambda_lift_exprs(Layout, Name, As)};
+        {builtin, FAnn, B, As}    -> {builtin, FAnn, B, lambda_lift_exprs(Layout, As)};
-        {remote, FAnn, ArgsT, RetT, Ct, F, As} -> {remote, FAnn, ArgsT, RetT, lambda_lift_expr(Layout, Name, Ct), F, lambda_lift_exprs(Layout, Name, As)};
+        {remote, FAnn, ArgsT, RetT, Ct, F, As} -> {remote, FAnn, ArgsT, RetT, lambda_lift_expr(Layout, Ct), F, lambda_lift_exprs(Layout, As)};
-        {con, FAnn, Ar, C, As}    -> {con, FAnn, Ar, C, lambda_lift_exprs(Layout, Name, As)};
+        {con, FAnn, Ar, C, As}    -> {con, FAnn, Ar, C, lambda_lift_exprs(Layout, As)};
-        {tuple, FAnn, As}         -> {tuple, FAnn, lambda_lift_exprs(Layout, Name, As)};
+        {tuple, FAnn, As}         -> {tuple, FAnn, lambda_lift_exprs(Layout, As)};
-        {proj, FAnn, A, I}        -> {proj, FAnn, lambda_lift_expr(Layout, Name, A), I};
+        {proj, FAnn, A, I}        -> {proj, FAnn, lambda_lift_expr(Layout, A), I};
-        {set_proj, FAnn, A, I, B} -> {set_proj, FAnn, lambda_lift_expr(Layout, Name, A), I, lambda_lift_expr(Layout, Name, B)};
+        {set_proj, FAnn, A, I, B} -> {set_proj, FAnn, lambda_lift_expr(Layout, A), I, lambda_lift_expr(Layout, B)};
-        {op, FAnn, Op, As}        -> {op, FAnn, Op, lambda_lift_exprs(Layout, Name, As)};
+        {op, FAnn, Op, As}        -> {op, FAnn, Op, lambda_lift_exprs(Layout, As)};
-        {'let', FAnn, X, A, B}    -> {'let', FAnn, X, lambda_lift_expr(Layout, Name, A), lambda_lift_expr(Layout, Name, B)};
+        {'let', FAnn, X, A, B}    -> {'let', FAnn, X, lambda_lift_expr(Layout, A), lambda_lift_expr(Layout, B)};
-        {funcall, FAnn, A, Bs}    -> {funcall, FAnn, lambda_lift_expr(Layout, Name, A), lambda_lift_exprs(Layout, Name, Bs)};
+        {funcall, FAnn, A, Bs}    -> {funcall, FAnn, lambda_lift_expr(Layout, A), lambda_lift_exprs(Layout, Bs)};
-        {set_state, FAnn, R, A}   -> {set_state, FAnn, R, lambda_lift_expr(Layout, Name, A)};
+        {set_state, FAnn, R, A}   -> {set_state, FAnn, R, lambda_lift_expr(Layout, A)};
         {get_state, _, _}         -> Expr;
-        {switch, FAnn, S}         -> {switch, FAnn, lambda_lift_expr(Layout, Name, S)};
+        {switch, FAnn, S}         -> {switch, FAnn, lambda_lift_expr(Layout, S)};
-        {split, Type, X, Alts}    -> {split, Type, X, lambda_lift_exprs(Layout, Name, Alts)};
+        {split, Type, X, Alts}    -> {split, Type, X, lambda_lift_exprs(Layout, Alts)};
-        {nosplit, Rens, A}        -> {nosplit, Rens, lambda_lift_expr(Layout, Name, A)};
+        {nosplit, Rens, A}        -> {nosplit, Rens, lambda_lift_expr(Layout, A)};
-        {'case', P, S}            -> {'case', P, lambda_lift_expr(Layout, Name, S)}
+        {'case', P, S}            -> {'case', P, lambda_lift_expr(Layout, S)}
     end.
 
--spec lambda_lift_exprs(state_layout(), fun_name(), [fexpr()]) -> [Closure] when
+-spec lambda_lift_exprs(state_layout(), [fexpr()]) -> [Closure] when
       Closure :: fexpr().
-lambda_lift_exprs(Layout, Name, As) -> [lambda_lift_expr(Layout, Name, A) || A <- As].
+lambda_lift_exprs(Layout, As) -> [lambda_lift_expr(Layout, A) || A <- As].
 
 %% -- Optimisations ----------------------------------------------------------
 
@@ -1962,6 +1918,9 @@ fresh_name_save(Name) ->
 -spec fresh_name() -> var_name().
 fresh_name() -> fresh_name("%").
 
+-spec fresh_fun() -> fun_name().
+fresh_fun() -> {local_fun, [fresh_name("^")]}.
+
 -spec fresh_name(string()) -> var_name().
 fresh_name(Prefix) ->
     N = get('%fresh'),

src/aeso_compiler.erl

@@ -7,7 +7,6 @@
 %%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
 -module(aeso_compiler).
--vsn("8.0.1").
 
 -export([ file/1
         , file/2
@@ -28,7 +27,7 @@
         , validate_byte_code/3
         ]).
 
--include("$aebytecode_include/aeb_opcodes.hrl").
+-include_lib("aebytecode/include/aeb_opcodes.hrl").
 -include("aeso_utils.hrl").
 
 
@@ -43,7 +42,6 @@
                 | {include, {file_system, [string()]} |
                             {explicit_files, #{string() => binary()}}}
                 | {src_file, string()}
-                | {src_dir, string()}
                 | {aci, aeso_aci:aci_type()}.
 -type options() :: [option()].
 
@@ -89,9 +87,7 @@ file(Filename) ->
 file(File, Options0) ->
     Options = add_include_path(File, Options0),
     case read_contract(File) of
-        {ok, Bin} ->
+        {ok, Bin} -> from_string(Bin, [{src_file, File} | Options]);
-            SrcDir = aeso_utils:canonical_dir(filename:dirname(File)),
-            from_string(Bin, [{src_file, File}, {src_dir, SrcDir} | Options]);
         {error, Error} ->
             Msg = lists:flatten([File,": ",file:format_error(Error)]),
             {error, [aeso_errors:new(file_error, Msg)]}
@@ -103,7 +99,7 @@ add_include_path(File, Options) ->
         false ->
             Dir = filename:dirname(File),
             {ok, Cwd} = file:get_cwd(),
-            [{include, {file_system, [Cwd, aeso_utils:canonical_dir(Dir)]}} | Options]
+            [{include, {file_system, [Cwd, Dir]}} | Options]
     end.
 
 -spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
@@ -229,13 +225,10 @@ encode_value(Contract0, Type, Value, Options) ->
 decode_value(Contract0, Type, FateValue, Options) ->
     case add_extra_call(Contract0, {type, Type}, Options) of
         {ok, CallName, Code} ->
-            #{ folded_typed_ast := TypedAst
+            #{ unfolded_typed_ast := TypedAst
-             , type_env         := TypeEnv} = Code,
+             , type_env           := TypeEnv} = Code,
             {ok, _, Type0} = get_decode_type(CallName, TypedAst),
-            Type1 = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+            Type1 = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                              [ unfold_record_types
-                                                              , unfold_variant_types
-                                                              , not_unfold_system_alias_types ]),
             fate_data_to_sophia_value(Type0, Type1, FateValue);
         Err = {error, _} ->
             Err
@@ -276,7 +269,7 @@ insert_call_function(Ast, Code, Call, {type, Type}) ->
         [ Code,
           "\n\n",
           lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "(val : ", Type, ") : ", Type, " = val\n"
+          "entrypoint ", Call, "(val : ", Type, ") = val\n"
         ]).
 
 -spec insert_init_function(string(), options()) -> string().
@@ -315,12 +308,9 @@ to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ folded_typed_ast := TypedAst, type_env := TypeEnv} = Code,
+        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
         {ok, _, Type0} = get_decode_type(FunName, TypedAst),
-        Type = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+        Type   = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                         [ unfold_record_types
-                                                         , unfold_variant_types
-                                                         , not_unfold_system_alias_types]),
 
         fate_data_to_sophia_value(Type0, Type, Data)
     catch
@@ -367,17 +357,14 @@ decode_calldata(ContractString, FunName, Calldata, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ folded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
+        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
 
         {ok, Args, _} = get_decode_type(FunName, TypedAst),
         GetType       = fun({typed, _, _, T}) -> T; (T) -> T end,
         ArgTypes      = lists:map(GetType, Args),
         Type0         = {tuple_t, [], ArgTypes},
         %% user defined data types such as variants needed to match against
-        Type          = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+        Type          = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                                  [ unfold_record_types
-                                                                  , unfold_variant_types
-                                                                  , not_unfold_system_alias_types]),
         case aeb_fate_abi:decode_calldata(FunName, Calldata) of
             {ok, FateArgs} ->
                 try

src/aeso_errors.erl

@@ -6,7 +6,6 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_errors).
--vsn("8.0.1").
 
 -type src_file()   :: no_file | iolist().
 

src/aeso_fcode_to_fate.erl

@@ -8,7 +8,6 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(aeso_fcode_to_fate).
--vsn("8.0.1").
 
 -export([compile/3, compile/4, term_to_fate/1, term_to_fate/2]).
 
@@ -236,7 +235,6 @@ lit_to_fate(Env, L) ->
         {bytes, B}           -> aeb_fate_data:make_bytes(B);
         {bool, B}            -> aeb_fate_data:make_boolean(B);
         {account_pubkey, K}  -> aeb_fate_data:make_address(K);
-        {signature, S}       -> aeb_fate_data:make_bytes(S);
         {contract_pubkey, K} -> aeb_fate_data:make_contract(K);
         {oracle_pubkey, K}   -> aeb_fate_data:make_oracle(K);
         {oracle_query_id, H} -> aeb_fate_data:make_oracle_query(H);
@@ -287,8 +285,6 @@ term_to_fate(_GlobEnv, _Env, {builtin, _, map_empty, []}) ->
 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, {builtin, _, bytes_to_any_size, [Bs]}) ->
-    term_to_fate(GlobEnv, Env, Bs);
 term_to_fate(_GlobEnv, _Env, _) ->
     throw(not_a_fate_value).
 

src/aeso_parse_lib.erl

@@ -7,7 +7,6 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_parse_lib).
--vsn("8.0.1").
 
 -export([parse/2,
          return/1, fail/0, fail/1, fail/2, map/2, bind/2,
@@ -16,7 +15,7 @@
          many/1, many1/1, sep/2, sep1/2,
          infixl/2, infixr/2]).
 
--export([current_file/0, set_current_file/1, current_dir/0, set_current_dir/1,
+-export([current_file/0, set_current_file/1,
          current_include_type/0, set_current_include_type/1]).
 
 %% -- Types ------------------------------------------------------------------
@@ -481,13 +480,6 @@ current_file() ->
 set_current_file(File) ->
     put('$current_file', File).
 
-%% Current source directory
-current_dir() ->
-    get('$current_dir').
-
-set_current_dir(File) ->
-    put('$current_dir', File).
-
 add_current_file({L, C}) -> {current_file(), L, C};
 add_current_file(Pos)    -> Pos.
 

src/aeso_parser.erl

@@ -3,7 +3,6 @@
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
 -module(aeso_parser).
--vsn("8.0.1").
 -compile({no_auto_import,[map_get/2]}).
 
 -export([string/1,
@@ -20,7 +19,6 @@
 
 -include("aeso_parse_lib.hrl").
 -import(aeso_parse_lib, [current_file/0, set_current_file/1,
-                         current_dir/0, set_current_dir/1,
                          current_include_type/0, set_current_include_type/1]).
 
 -type parse_result() :: aeso_syntax:ast() | {aeso_syntax:ast(), sets:set(include_hash())} | none().
@@ -60,7 +58,6 @@ run_parser(P, Inp, Opts) ->
 
 parse_and_scan(P, S, Opts) ->
     set_current_file(proplists:get_value(src_file, Opts, no_file)),
-    set_current_dir(proplists:get_value(src_dir, Opts, no_file)),
     set_current_include_type(proplists:get_value(include_type, Opts, none)),
     case aeso_scan:scan(S) of
         {ok, Tokens} -> aeso_parse_lib:parse(P, Tokens);
@@ -303,7 +300,7 @@ stmt() ->
     , {switch, keyword(switch), parens(expr()), maybe_block(branch())}
     , {'if', keyword('if'), parens(expr()), body()}
     , {elif, keyword(elif), parens(expr()), body()}
-    , {'else', keyword('else'), body()}
+    , {else, keyword(else), body()}
     ])).
 
 branch() ->
@@ -327,7 +324,7 @@ expr100() ->
     Expr150 = ?LAZY_P(expr150()),
     choice(
     [ ?RULE(lam_args(), keyword('=>'), body(), {lam, _2, _1, _3})   %% TODO: better location
-    , {'if', keyword('if'), parens(Expr100), Expr150, right(tok('else'), Expr100)}
+    , {'if', keyword('if'), parens(Expr100), Expr150, right(tok(else), Expr100)}
     , ?RULE(Expr150, optional(right(tok(':'), type())),
             case _2 of
                 none       -> _1;
@@ -526,7 +523,7 @@ id_or_addr() ->
     ?RULE(id(), parse_addr_literal(_1)).
 
 parse_addr_literal(Id = {id, Ann, Name}) ->
-    case lists:member(lists:sublist(Name, 3), ["ak_", "ok_", "oq_", "ct_", "sg_"]) of
+    case lists:member(lists:sublist(Name, 3), ["ak_", "ok_", "oq_", "ct_"]) of
         false -> Id;
         true  ->
             try aeser_api_encoder:decode(list_to_binary(Name)) of
@@ -565,7 +562,6 @@ bracket_list(P) -> brackets(comma_sep(P)).
 -spec pos_ann(ann_line(), ann_col()) -> ann().
 pos_ann(Line, Col) ->
     [ {file, current_file()}
-    , {dir, current_dir()}
     , {include_type, current_include_type()}
     , {line, Line}
     , {col, Col} ].
@@ -613,7 +609,7 @@ group_ifs([], Acc) ->
 group_ifs([{'if', Ann, Cond, Then} | Stmts], Acc) ->
     {Elses, Rest} = else_branches(Stmts, []),
     group_ifs(Rest, [build_if(Ann, Cond, Then, Elses) | Acc]);
-group_ifs([{'else', Ann, _} | _], _) ->
+group_ifs([{else, Ann, _} | _], _) ->
     fail({Ann, "No matching 'if' for 'else'"});
 group_ifs([{elif, Ann, _, _} | _], _) ->
     fail({Ann, "No matching 'if' for 'elif'"});
@@ -623,14 +619,14 @@ group_ifs([Stmt | Stmts], Acc) ->
 build_if(Ann, Cond, Then, [{elif, Ann1, Cond1, Then1} | Elses]) ->
     {'if', Ann, Cond, Then,
         set_ann(format, elif, build_if(Ann1, Cond1, Then1, Elses))};
-build_if(Ann, Cond, Then, [{'else', _Ann, Else}]) ->
+build_if(Ann, Cond, Then, [{else, _Ann, Else}]) ->
     {'if', Ann, Cond, Then, Else};
 build_if(Ann, Cond, Then, []) ->
     {'if', Ann, Cond, Then, {tuple, [{origin, system}], []}}.
 
 else_branches([Elif = {elif, _, _, _} | Stmts], Acc) ->
     else_branches(Stmts, [Elif | Acc]);
-else_branches([Else = {'else', _, _} | Stmts], Acc) ->
+else_branches([Else = {else, _, _} | Stmts], Acc) ->
     {lists:reverse([Else | Acc]), Stmts};
 else_branches(Stmts, Acc) ->
     {lists:reverse(Acc), Stmts}.
@@ -706,7 +702,7 @@ expand_includes([], Included, Acc, Opts) ->
     end;
 expand_includes([{include, Ann, {string, _SAnn, File}} | AST], Included, Acc, Opts) ->
     case get_include_code(File, Ann, Opts) of
-        {ok, AbsDir, Code} ->
+        {ok, Code} ->
             Hashed = hash_include(File, Code),
             case sets:is_element(Hashed, Included) of
                 false ->
@@ -716,10 +712,9 @@ expand_includes([{include, Ann, {string, _SAnn, File}} | AST], Included, Acc, Op
                                       _       -> indirect
                                   end,
                     Opts1 = lists:keystore(src_file, 1, Opts, {src_file, File}),
-                    Opts2 = lists:keystore(src_dir, 1, Opts1, {src_dir, AbsDir}),
+                    Opts2 = lists:keystore(include_type, 1, Opts1, {include_type, IncludeType}),
-                    Opts3 = lists:keystore(include_type, 1, Opts2, {include_type, IncludeType}),
                     Included1 = sets:add_element(Hashed, Included),
-                    case parse_and_scan(file(), Code, Opts3) of
+                    case parse_and_scan(file(), Code, Opts2) of
                         {ok, AST1} ->
                             expand_includes(AST1 ++ AST, Included1, Acc, Opts);
                         Err = {error, _} ->
@@ -737,12 +732,13 @@ expand_includes([E | AST], Included, Acc, Opts) ->
 read_file(File, Opts) ->
     case proplists:get_value(include, Opts, {explicit_files, #{}}) of
         {file_system, Paths} ->
-            lists:foldr(fun(Path, {error, _}) -> read_file_(Path, File);
+            CandidateNames = [ filename:join(Dir, File) || Dir <- Paths ],
-                           (_Path, OK)        -> OK end, {error, not_found}, Paths);
+            lists:foldr(fun(F, {error, _}) -> file:read_file(F);
+                           (_F, OK) -> OK end, {error, not_found}, CandidateNames);
         {explicit_files, Files} ->
             case maps:get(binary_to_list(File), Files, not_found) of
                 not_found -> {error, not_found};
-                Src       -> {ok, File, Src}
+                Src       -> {ok, Src}
             end;
         escript ->
             try
@@ -751,7 +747,7 @@ read_file(File, Opts) ->
                 Archive        = proplists:get_value(archive, Sections),
                 FileName       = binary_to_list(filename:join([aesophia, priv, stdlib, File])),
                 case zip:extract(Archive, [{file_list, [FileName]}, memory]) of
-                    {ok, [{_, Src}]} -> {ok, escript, Src};
+                    {ok, [{_, Src}]} -> {ok, Src};
                     _                -> {error, not_found}
                 end
             catch _:_ ->
@@ -759,13 +755,6 @@ read_file(File, Opts) ->
             end
     end.
 
-read_file_(Path, File) ->
-    AbsFile = filename:join(Path, File),
-    case file:read_file(AbsFile) of
-        {ok, Bin} -> {ok, aeso_utils:canonical_dir(filename:dirname(AbsFile)), Bin};
-        Err       -> Err
-    end.
-
 stdlib_options() ->
     StdLibDir = aeso_stdlib:stdlib_include_path(),
     case filelib:is_dir(StdLibDir) of
@@ -774,37 +763,23 @@ stdlib_options() ->
     end.
 
 get_include_code(File, Ann, Opts) ->
-    %% Temporarily extend include paths with the directory of the current file
+    case {read_file(File, Opts), read_file(File, stdlib_options())} of
-    Opts1 = include_current_file_dir(Opts, Ann),
+        {{ok, Bin}, {ok, _}} ->
-    case {read_file(File, Opts1), read_file(File, stdlib_options())} of
-        {{ok, Dir, Bin}, {ok, _}} ->
             case filename:basename(File) == File of
                 true -> { error
                         , fail( ann_pos(Ann)
                               , "Illegal redefinition of standard library " ++ binary_to_list(File))};
                 %% If a path is provided then the stdlib takes lower priority
-                false -> {ok, Dir, binary_to_list(Bin)}
+                false -> {ok, binary_to_list(Bin)}
             end;
-        {_, {ok, _, Bin}} ->
+        {_, {ok, Bin}} ->
-            {ok, stdlib, binary_to_list(Bin)};
+            {ok, binary_to_list(Bin)};
-        {{ok, Dir, Bin}, _} ->
+        {{ok, Bin}, _} ->
-            {ok, Dir, binary_to_list(Bin)};
+            {ok, binary_to_list(Bin)};
         {_, _} ->
             {error, {ann_pos(Ann), include_error, File}}
     end.
 
-include_current_file_dir(Opts, Ann) ->
-    case {proplists:get_value(dir, Ann, undefined),
-          proplists:get_value(include, Opts, undefined)} of
-        {undefined, _} -> Opts;
-        {CurrDir, {file_system, Paths}} ->
-            case lists:member(CurrDir, Paths) of
-                false -> [{include, {file_system, [CurrDir | Paths]}} | Opts];
-                true  -> Opts
-            end;
-        {_, _} -> Opts
-    end.
-
 -spec hash_include(string() | binary(), string()) -> include_hash().
 hash_include(File, Code) when is_binary(File) ->
     hash_include(binary_to_list(File), Code);

src/aeso_pretty.erl

@@ -6,7 +6,6 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_pretty).
--vsn("8.0.1").
 
 -import(prettypr, [text/1, sep/1, above/2, beside/2, nest/2, empty/0]).
 
@@ -388,8 +387,7 @@ expr_p(_, {Type, _, Bin})
     when Type == account_pubkey;
          Type == contract_pubkey;
          Type == oracle_pubkey;
-         Type == oracle_query_id;
+         Type == oracle_query_id ->
-         Type == signature ->
     text(binary_to_list(aeser_api_encoder:encode(Type, Bin)));
 expr_p(_, {string, _, <<>>}) -> text("\"\"");
 expr_p(_, {string, _, S}) ->
@@ -420,7 +418,7 @@ stmt_p({'if', _, Cond, Then}) ->
     block_expr(200, beside(text("if"), paren(expr(Cond))), Then);
 stmt_p({elif, _, Cond, Then}) ->
     block_expr(200, beside(text("elif"), paren(expr(Cond))), Then);
-stmt_p({'else', Else}) ->
+stmt_p({else, Else}) ->
     HideGenerated = not show_generated(),
     case aeso_syntax:get_ann(origin, Else) of
         system when HideGenerated -> empty();
@@ -535,5 +533,5 @@ get_elifs(If = {'if', Ann, Cond, Then, Else}, Elifs) ->
         elif -> get_elifs(Else, [{elif, Ann, Cond, Then} | Elifs]);
         _    -> {lists:reverse(Elifs), If}
     end;
-get_elifs(Else, Elifs) -> {lists:reverse(Elifs), {'else', Else}}.
+get_elifs(Else, Elifs) -> {lists:reverse(Elifs), {else, Else}}.
 

src/aeso_scan.erl

@@ -6,7 +6,6 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_scan).
--vsn("8.0.1").
 
 -export([scan/1, utf8_encode/1]).
 

src/aeso_scan_lib.erl

@@ -5,7 +5,6 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_scan_lib).
--vsn("8.0.1").
 
 -export([compile/1, string/3,
          token/1, token/2, symbol/0, skip/0,

src/aeso_stdlib.erl

@@ -9,10 +9,9 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_stdlib).
--vsn("8.0.1").
 
 -export([stdlib_include_path/0]).
 
 stdlib_include_path() ->
-    {file, Path} = code:is_loaded(?MODULE),
+    filename:join([code:priv_dir(aesophia), "stdlib"]).
-    filename:join(filename:dirname(filename:dirname(Path)), "priv/stdlib").
+

src/aeso_syntax.erl

@@ -7,7 +7,6 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_syntax).
--vsn("8.0.1").
 
 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).
 
@@ -101,7 +100,6 @@
      | {contract_pubkey, ann(), binary()}
      | {oracle_pubkey, ann(), binary()}
      | {oracle_query_id, ann(), binary()}
-     | {signature, ann(), binary()}
      | {string, ann(), binary()}
      | {char, ann(), integer()}.
 

src/aeso_syntax_utils.erl

@@ -5,9 +5,8 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_syntax_utils).
--vsn("8.0.1").
 
--export([used_ids/1, used_ids/2, used_types/2, used/1]).
+-export([used_ids/1, used_types/2, used/1]).
 
 -record(alg, {zero, plus, scoped}).
 
@@ -111,16 +110,8 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
 
 %% Name dependencies
 
-%% Used ids, top level
 used_ids(E) ->
-    used_ids([], E).
+    [ X || {{term, [X]}, _} <- used(E) ].
-
-%% Used ids, top level or in (current) namespace
-used_ids(Ns, E) ->
-    [ lists:last(Xs) || {{term, Xs}, _} <- used(E), in_ns(Xs, Ns) ].
-
-in_ns([_], _) -> true;
-in_ns(Xs, Ns) -> lists:droplast(Xs) == Ns.
 
 used_types([Top] = _CurrentNS, T) ->
     F = fun({{type, [X]}, _}) -> [X];

src/aeso_utils.erl

@@ -5,24 +5,11 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_utils).
--vsn("8.0.1").
 
--export([scc/1, canonical_dir/1]).
+-export([scc/1]).
 
 -export_type([graph/1]).
 
-%% -- Simplistic canonical directory
-%% Note: no attempts to be 100% complete
-
-canonical_dir(Dir) ->
-    {ok, Cwd} = file:get_cwd(),
-    AbsName = filename:absname(Dir),
-    RelAbsName = filename:join(tl(filename:split(AbsName))),
-    case filelib:safe_relative_path(RelAbsName, Cwd) of
-        unsafe -> AbsName;
-        Simplified -> filename:absname(Simplified, "")
-    end.
-
 %% -- Topological sort
 
 -type graph(Node) :: #{Node => [Node]}. %% List of incoming edges (dependencies).

src/aeso_vm_decode.erl

@@ -5,21 +5,17 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_vm_decode).
--vsn("8.0.1").
 
 -export([ from_fate/2 ]).
 
--include("$aebytecode_include/aeb_fate_data.hrl").
+-include_lib("aebytecode/include/aeb_fate_data.hrl").
 
 -spec from_fate(aeso_syntax:type(), aeb_fate_data:fate_type()) -> aeso_syntax:expr().
 from_fate({id, _, "address"}, ?FATE_ADDRESS(Bin)) -> {account_pubkey, [], Bin};
-from_fate({id, _, "signature"}, ?FATE_BYTES(Bin)) -> {signature, [], Bin};
-from_fate({id, _, "hash"}, ?FATE_BYTES(Bin)) -> {bytes, [], Bin};
-from_fate({id, _, "unit"}, ?FATE_UNIT) -> {tuple, [], []};
 from_fate({app_t, _, {id, _, "oracle"}, _}, ?FATE_ORACLE(Bin)) -> {oracle_pubkey, [], Bin};
 from_fate({app_t, _, {id, _, "oracle_query"}, _}, ?FATE_ORACLE_Q(Bin)) -> {oracle_query_id, [], Bin};
 from_fate({con, _, _Name},  ?FATE_CONTRACT(Bin)) -> {contract_pubkey, [], Bin};
-from_fate({bytes_t, _, any}, ?FATE_BYTES(Bin)) -> make_any_bytes(Bin);
+from_fate({bytes_t, _, any}, ?FATE_BYTES(Bin)) -> {bytes, [], Bin};
 from_fate({bytes_t, _, N},  ?FATE_BYTES(Bin)) when byte_size(Bin) == N -> {bytes, [], Bin};
 from_fate({id, _, "bits"},  ?FATE_BITS(N)) -> make_bits(N);
 from_fate({id, _, "int"},     N) when is_integer(N) ->
@@ -191,5 +187,3 @@ make_bits(Set, Zero, I, N) when 0 == N rem 2 ->
 make_bits(Set, Zero, I, N) ->
     {app, [], Set, [make_bits(Set, Zero, I + 1, N div 2), {int, [], I}]}.
 
-make_any_bytes(Bin) ->
-  {app, [], {qid, [], ["Bytes", "to_any_size"]}, [{bytes, [], Bin}]}.

src/aeso_warnings.erl

@@ -1,5 +1,4 @@
 -module(aeso_warnings).
--vsn("8.0.1").
 
 -record(warn, { pos     :: aeso_errors:pos()
               , message :: iolist()

src/aesophia.app.src

@@ -1,12 +1,13 @@
 {application, aesophia,
  [{description, "Compiler for Aeternity Sophia language"},
-  {vsn, "8.0.1"},
+  {vsn, "8.0.0"},
   {registered, []},
   {applications,
    [kernel,
     stdlib,
     jsx,
     syntax_tools,
+    getopt,
     aebytecode,
     eblake2
    ]},

test/aeso_calldata_tests.erl

@@ -85,7 +85,6 @@ compilable_contracts() ->
      {"funargs", "bitsum", ["Bits.clear(Bits.clear(Bits.all, 4), 2)"]}, %% Order matters for test
      {"funargs", "bitsum", ["Bits.set(Bits.set(Bits.none, 4), 2)"]},
      {"funargs", "read", ["{label = \"question 1\", result = 4}"]},
-     {"funargs", "any_bytes", ["Bytes.to_any_size(#0011AA)"]},
      {"funargs", "sjutton", ["#0011012003100011012003100011012003"]},
      {"funargs", "sextiosju", ["#01020304050607080910111213141516171819202122232425262728293031323334353637383940"
                                "414243444546474849505152535455565758596061626364656667"]},
@@ -117,7 +116,6 @@ compilable_contracts() ->
      {"funargs", "chain_base_tx", ["Chain.NameRevokeTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
      {"funargs", "chain_base_tx", ["Chain.NameTransferTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
      {"funargs", "chain_base_tx", ["Chain.GAAttachTx"]},
-     {"funargs", "sig", ["sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj"]},
      {"variant_types", "init", []},
      {"basic_auth", "init", []},
      {"address_literals", "init", []},

test/aeso_compiler_tests.erl

@@ -70,7 +70,6 @@ simple_compile_test_() ->
        fun() ->
            #{ warnings := Warnings } = compile("warnings", [warn_all]),
            #{ warnings := [] } = compile("warning_unused_include_no_include", [warn_all]),
-           #{ warnings := [] } = compile("warning_used_record_typedef", [warn_all]),
            check_warnings(warnings(), Warnings)
        end} ] ++
     [].
@@ -162,7 +161,6 @@ compilable_contracts() ->
      "state_handling",
      "events",
      "include",
-     "relative_include",
      "basic_auth",
      "basic_auth_tx",
      "bitcoin_auth",
@@ -1302,10 +1300,6 @@ failing_contracts() ->
                    <<?Pos(3,9)
                      "The name of the compile-time constant cannot have pattern matching">>
                   ])
-    , ?TYPE_ERROR(too_many_tvars,
-                  [<<?Pos(2,3)
-                     "Too many type variables (max 256) in definition of `too_many`">>
-                  ])
     ].
 
 validation_test_() ->
@@ -1353,9 +1347,7 @@ validate(Contract1, Contract2) ->
                   true  -> [debug_mode];
                   false -> []
               end ++
-                  [ {src_file, lists:concat([Contract2, ".aes"])}
+                  [{include, {file_system, [aeso_test_utils:contract_path()]}}]);
-                  , {include, {file_system, [aeso_test_utils:contract_path()]}}
-                  ]);
         Error -> print_and_throw(Error)
     end.
 

test/aeso_encode_decode_tests.erl

@@ -1,40 +0,0 @@
--module(aeso_encode_decode_tests).
-
--compile([export_all, nowarn_export_all]).
-
--include_lib("eunit/include/eunit.hrl").
-
--define(EMPTY, "contract C =\n  entrypoint f() = true").
-
-encode_decode_test_() ->
-    [ {lists:flatten(io_lib:format("Testing encode-decode roundtrip for ~p : ~p", [Value, {EType, DType}])),
-       fun() ->
-           {ok, SerRes} = aeso_compiler:encode_value(?EMPTY, EType, Value, []),
-           {ok, Expr} = aeso_compiler:decode_value(?EMPTY, DType, SerRes, []),
-           Value2 = prettypr:format(aeso_pretty:expr(Expr)),
-           ?assertEqual(Value, Value2)
-       end} || {Value, EType, DType} <- test_data() ].
-
-test_data() ->
-    lists:map(fun({V, T}) -> {V, T, T};
-                 ({V, T1, T2}) -> {V, T1, T2} end, data()).
-
-data() ->
-    [ {"42", "int"}
-    , {"- 42", "int"}
-    , {"true", "bool"}
-    , {"ak_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ", "address"}
-    , {"ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ", "C"}
-    , {"Some(42)", "option(int)"}
-    , {"None", "option(int)"}
-    , {"(true, 42)", "bool * int"}
-    , {"{[1] = true, [3] = false}", "map(int, bool)"}
-    , {"()", "unit"}
-    , {"#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f", "hash"}
-    , {"#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f", "bytes(32)"}
-    , {"sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj", "signature"}
-    , {"sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj", "bytes(64)", "signature"}
-    , {"#0102030405060708090a0b0c0d0e0f101718192021222324252627282930313233343536373839401a1b1c1d1e1f202122232425262728293031323334353637", "bytes(64)"}
-    , {"#0102030405060708090a0b0c0d0e0f101718192021222324252627282930313233343536373839401a1b1c1d1e1f202122232425262728293031323334353637", "signature", "bytes(64)"}
-    ].
-

test/contracts/ceres.aes

@@ -11,5 +11,4 @@ contract C =
     let i = Int.mulmod(a, b, h)
     let j = Crypto.poseidon(i, a)
     let k : bytes(32) = Address.to_bytes(Call.origin)
-    let l = sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj
+    (a bor b band c bxor a << bnot b >> a, k)
-    (a bor b band c bxor a << bnot b >> a, k, l)

test/contracts/dir1/bar.aes

@@ -1,4 +0,0 @@
-include "../dir2/baz.aes"
-namespace D =
-  function g() = E.h()
-

test/contracts/dir2/baz.aes

@@ -1,3 +0,0 @@
-namespace E =
-  function h() = 42
-

test/contracts/funargs.aes

@@ -20,8 +20,6 @@ contract FunctionArguments =
   entrypoint read(a : answer(int)) =
      a.result
 
-  entrypoint any_bytes(b : bytes()) = b
-
   entrypoint sjutton(b : bytes(17)) =
      b
 
@@ -59,5 +57,3 @@ contract FunctionArguments =
   entrypoint chain_ga_meta_tx(tx : Chain.ga_meta_tx) = true
   entrypoint chain_paying_for_tx(tx : Chain.paying_for_tx) = true
   entrypoint chain_base_tx(tx : Chain.base_tx) = true
-
-  entrypoint sig(sg : signature) = true

test/contracts/relative_include.aes

@@ -1,3 +0,0 @@
-include "./dir1/bar.aes"
-contract C =
-  entrypoint f() = D.g()

test/contracts/too_many_tvars.aes

@@ -1,60 +0,0 @@
-contract C =
-  entrypoint too_many(
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _)) = 0
-
-  entrypoint not_too_many(
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _)) = 0

test/contracts/warning_used_record_typedef.aes

@@ -1,5 +0,0 @@
-contract Test =
-    type option_int = option(int)
-    record option_point = {x: int, y: option_int}
-
-    entrypoint test_option_record(a: option_point) = a

zomp.meta

@@ -1,21 +0,0 @@
-{name,"Sophia Compiler"}.
-{type,lib}.
-{modules,[]}.
-{prefix,none}.
-{desc,"The Sophia smart contract language for FATE blockchains"}.
-{author,"QPQ AG & Aeternity Foundation"}.
-{package_id,{"otpr","aesophia",{8,0,1}}}.
-{deps,[{"otpr","aebytecode",{3,2,1}},
-       {"otpr","getopt",{1,0,2}},
-       {"otpr","eblake2",{1,0,0}},
-       {"otpr","zj",{1,1,0}}]}.
-{key_name,none}.
-{a_email,[]}.
-{c_email,[]}.
-{copyright,"(c) 2024 QPQ AG, 2018 Aeternity Foundation"}.
-{file_exts,[]}.
-{license,skip}.
-{repo_url,"https://gitlab.com/ioecs/aesophia"}.
-{tags,["gaju","gajumaru","blockchain","sophia","crypto","ae","compiler",
-       "puck"]}.
-{ws_url,[]}.

zomp_prep

@@ -1,19 +0,0 @@
-#! /bin/bash
-
-# This is a small pre-packaging source generation and include correction script that should be
-# run before packaging this project for use with ZX/Zomp.
-
-rm -rf _build
-cd src
-for f in $(ls *.erl)
-do
-    echo "Updating includes in: $f"
-    sed -i 's/aebytecode\/include\///g' "$f"
-    sed -i 's/\.\.\/include\///g' "$f"
-    sed -i 's/include_lib/include/g' "$f"
-done
-sed -i 's/aeb_opcodes\.hrl/\$aebytecode_include\/aeb_opcodes\.hrl/' aeso_compiler.erl
-sed -i 's/aeb_fate_data\.hrl/\$aebytecode_include\/aeb_fate_data\.hrl/' aeso_vm_decode.erl
-cd ..
-rm -f ebin/*.beam
-rm -f rebar*