Make 'return' a reserved (but invalid) keyword

.circleci/config.yml

@@ -3,20 +3,11 @@ version: 2.1
 executors:
   aebuilder:
     docker:
-      - image: aeternity/builder:bionic-otp24
+      - image: aeternity/builder
         user: builder
     working_directory: ~/aesophia
 
 jobs:
-  verify_rebar_lock:
-    executor: aebuilder
-    steps:
-      - checkout
-      - run:
-          name: Ensure lock file is up-to-date
-          command: |
-            ./rebar3 upgrade
-            git diff --quiet -- rebar.lock || (echo "rebar.lock is not up-to-date" && exit 1)
   build:
     executor: aebuilder
     steps:
@@ -44,10 +35,3 @@ jobs:
             - _build/default/rebar3_20.3.8_plt
       - store_artifacts:
           path: _build/test/logs
-
-workflows:
-  version: 2
-  build_test:
-    jobs:
-      - build
-      - verify_rebar_lock

.docssite/hook.py

@@ -1,7 +0,0 @@
-import glob
-import shutil
-
-def pre_build(**kwargs):
-  for file in glob.glob('../docs/*.md'):
-    shutil.copy(file, 'docs')
-  shutil.copy('../CHANGELOG.md', 'docs')

.docssite/mkdocs.yml

@@ -1,55 +0,0 @@
-site_name: æternity Sophia Language
-plugins:
-  - search
-  - mkdocs-simple-hooks:
-      hooks:
-        on_pre_build: 'hook:pre_build'
-repo_url: 'https://github.com/aeternity/aesophia'
-edit_uri: ''
-
-extra:
-  version:
-    provider: mike
-
-theme:
-  favicon: favicon.png
-  name: material
-  custom_dir: overrides
-  language: en
-  palette:
-    - scheme: default
-      primary: pink
-      accent: pink
-      toggle:
-        icon: material/weather-night
-        name: Switch to dark mode
-    - scheme: slate
-      primary: pink
-      accent: pink
-      toggle:
-        icon: material/weather-sunny
-        name: Switch to light mode
-  features:
-    - content.tabs.link
-    - search.highlight
-    - search.share
-    - search.suggest
-
-  # Don't include MkDocs' JavaScript
-  include_search_page: false
-  search_index_only: true
-
-markdown_extensions:
-  - admonition
-  - pymdownx.highlight
-  - pymdownx.superfences
-  - toc:
-      toc_depth: 3
-
-nav:
-  - Introduction: index.md
-  - Syntax: sophia_syntax.md
-  - Features: sophia_features.md
-  - Standard library: sophia_stdlib.md
-  - Contract examples: sophia_examples.md
-  - Changelog: CHANGELOG.md

.docssite/overrides/main.html

@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-
-{% block outdated %}
-  You're not viewing the latest version.
-  <a href="{{ '../' ~ base_url }}">
-    <strong>Click here to go to latest.</strong>
-  </a>
-{% endblock %}

.github/workflows/docs-develop.yml

@@ -1,21 +0,0 @@
-name: Publish development docs
-on:
-  push:
-    branches: ['master']
-      
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - 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"
-      - run: |
-          cd .docssite
-          mike deploy --push master

.github/workflows/docs-release.yml

@@ -1,22 +0,0 @@
-name: Publish release docs
-on:
-  release:
-    types: [released]
-      
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - 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"
-      - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-      - run: |
-          cd .docssite
-          mike deploy --push --update-aliases $RELEASE_VERSION latest

.github/workflows/requirements.txt

@@ -1,5 +0,0 @@
-mkdocs==1.4.2
-mkdocs-simple-hooks==0.1.5
-mkdocs-material==9.0.9
-mike==1.1.2
-pygments==2.14.0

.gitignore

@@ -21,6 +21,3 @@ rebar3.crashdump
 aesophia
 .qcci
 current_counterexample.eqc
-test/contracts/test.aes
-__pycache__
-.docssite/docs/*.md

CHANGELOG.md

@@ -8,241 +8,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 ### Changed
 ### Removed
-### Fixed
 
-## [7.1.0]
+## [4.0.0-rc4] - 2019-09-13
 ### 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]))
-  ```
-- Allow binary operators to be used as lambdas
-  ```
-  function sum(l : list(int)) : int = foldl((+), 0, l)
-  function logical_and(x, y) = (&&)(x, y)
-  ```
-- Contract interfaces polymorphism
-### 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).
-### Removed
-- Support for AEVM has been entirely wiped
-
-## [6.1.0] - 2021-10-20
-### Added
-- `Bitwise` stdlib
-- `Set` stdlib
-- `Option.force_msg`
-- Loading namespaces into the current scope (e.g. `using Pair`)
-- Assign patterns to variables (e.g. `let x::(t = y::_) = [1, 2, 3, 4]` where `t == [2, 3, 4]`)
-- Add builtin types (`AENS.name, AENS.pointee, Chain.ttl, Chain.base_tx, Chain.ga_meta_tx, Chain.paying_for_tx`) to
-  the calldata and result decoder
-- Patterns guards
-  ```
-  switch(x)
-    a::[] | a > 10 => 1
-    _              => 2
-  ```
-  ```
-  function
-    f(a::[]) | a > 10 = 1
-    f(_)              = 2
-  ```
-### Changed
-- Fixed the ACI renderer, it shouldn't drop the `stateful` modifier
-
-## [6.0.2] 2021-07-05
-### Changed
-- `List.from_to_step` now forbids non-positive step (this change does
-  *not* alter the behavior of the previously deployed contracts)
-- Fixed leaking state between contracts
-
-## [6.0.1] 2021-06-24
-### Changed
-- Fixed a bug in calldata encoding for contracts containing multiple contracts
-- Fixed a missing `include` in the `Frac` standard library
-
-## [6.0.0] 2021-05-26
-### Added
-- Child contracts
-- `Chain.clone`
-- `Chain.create`
-- `Chain.bytecode_hash`
-- Minor support for variadic functions
-- `void` type that represents an empty type
-- `Call.fee` builtin
-### Changed
-- Contract interfaces must be now invocated by `contract interface` keywords
-- `main` keyword to indicate the main contract in case there are child contracts around
-- `List.sum` and `List.product` no longer use `List.foldl`
-### Removed
-
-## [5.0.0] 2021-04-30
-### Added
-- A new and improved [`String` standard library](https://github.com/aeternity/aesophia/blob/master/docs/sophia_stdlib.md#string)
-  has been added. Use it by `include "String.aes"`. It includes functions for
-  turning strings into lists of characters for detailed manipulation. For
-  example:
-  ```
-  include "String.aes"
-  contract C =
-    entrypoint filter_all_a(s: string) : string =
-      String.from_list(List.filter((c : char) => c != 'a', String.to_list(s)))
-  ```
-  will return a list with all `a`'s removed.
-
-  There are also convenience functions `split`, `concat`, `to_upper`,
-  `to_lower`, etc.
-
-  All String functions in FATEv2 operate on unicode code points.
-- Operations for pairing-based cryptography has been added the operations
-  are in the standard library [BLS12_381](https://github.com/aeternity/aesophia/blob/master/docs/sophia_stdlib.md#bls12_381).
-  With these operations it is possible to do Zero Knowledge-proofs, etc.
-  The operations are for the BLS12-381 curve (as the name suggests).
-- Calls to functions in other contracts (i.e. _remote calls_) can now be
-  [`protected`](https://github.com/aeternity/aesophia/blob/master/docs/sophia.md#protected-contract-calls).
-  If a contract call fails for any reason (for instance, the remote contract
-  crashes or runs out of gas, or the entrypoint doesn't exist or has the
-  wrong type) the parent call also fails. To make it possible to recover
-  from failures, contract calls takes a named argument `protected : bool`
-  (default `false`).
-
-  If `protected = true` the result of the contract call is wrapped in an
-  `option`, and `Some(value)` indicates a succesful execution and `None`
-  indicates that the contract call failed. Note: any gas consumed until
-  the failure is still charged, but all side effects in the remote
-  contract are rolled back on failure.
-- A new chain operation [`AENS.update`](https://github.com/aeternity/aesophia/blob/master/docs/sophia.md#aens-interface)
-  is supported.
-- New chain exploring operations `AENS.lookup` and `Oracle.expiry` to
-  look up an AENS record and the expiry of an Oracle respectively, are added.
-- Transaction introspection (`Auth.tx`) has been added. When a Generalized
-  account is authorized, the authorization function needs access to the
-  transaction (and the transaction hash) for the wrapped transaction. The
-  transaction and the transaction hash is available `Auth.tx`, it is only
-  available during authentication if invoked by a normal contract call
-  it returns `None`. Example:
-  ```
-  switch(Auth.tx)
-    None      => abort("Not in Auth context")
-    Some(tx0) =>
-      switch(tx0.tx)
-        Chain.SpendTx(_, amount, _)  => amount > 400
-        Chain.ContractCallTx(_, _)   => true
-        _                            => false
-  ```
-- A debug mode is a added to the compiler. Right now its only use is to
-  turn off hermetization.
-### Changed
-- The function `Chain.block_hash(height)` is now (in FATEv2) defined for
-  the current height - this used to be an error.
-- Standard library: Sort is optimized to do `mergesort` and a `contains`
-  function is added.
-- Improved type errors and explicit errors for some syntax errors (empty code
-  blocks, etc.).
-- Compiler optimization: The ACI is generated alongside bytecode. This means
-  that multiple compiler passes can be avoided.
-- Compiler optimization: Improved parsing (less stack used when transpiled).
-- A bug where constraints were handled out of order fixed.
-- Fixed calldata decoding for singleton records.
-- Improved the documentation w.r.t. signatures, especially stressing the fact that
-  the network ID is a part of what is signed.
-### Removed
-
-## [4.3.0]
-### Added
-- Added documentation (moved from `protocol`)
-- `Frac.aes` – library for rational numbers
-- Added some more meaningful error messages
-- Exported several parsing functionalities
- - With option `keep_included` it is possible to see which files were included during the parse
- - There is a function `run_parser` that be used to evaluate any parsing rule
- - Exported parsers: `body`, `type` and `decl`
-### Changed
-- Performance improvements in the standard library
-- Fixed ACI encoder to handle `-` unary operator
-- Fixed including by absolute path
-- Fixed variant type printing in the ACI error messages
-- Fixed pretty printing of combined function clauses
-### Removed
-- `let` definitions are no longer supported in the toplevel of the contract
-- type declarations are no longer supported
-
-## [4.2.0] - 2020-01-15
-### Added
-- Allow separate entrypoint/function type signature and definition, and pattern
-  matching in left-hand sides:
-  ```
-    function
-      length : list('a) => int
-      length([])      = 0
-      length(x :: xs) = 1 + length(xs)
-  ```
-- Allow pattern matching in list comprehension generators (filtering out match
-  failures):
-  ```
-    function somes(xs : list(option('a))) : list('a) =
-      [ x | Some(x) <- xs ]
-  ```
-- Allow pattern matching in let-bindings (aborting on match failures):
-  ```
-    function test(m : map(int, int)) =
-        let Some(x) = Map.lookup(m, 0)
-        x
-  ```
-### Changed
-- FATE code generator improvements.
-- Bug fix: Handle qualified constructors in patterns.
-- Bug fix: Allow switching also on negative numbers.
-### Removed
-
-## [4.1.0] - 2019-11-26
-### Added
-- Support encoding and decoding bit fields in call arguments and results.
-### Changed
-- Various improvements to FATE code generator.
-### Removed
-
-## [4.0.0] - 2019-10-11
-### Added
-- `Address.to_contract` - casts an address to a (any) contract type.
-- Pragma to check compiler version, e.g. `@compiler >= 4.0`.
 - Handle numeric escapes, i.e. `"\x19Ethereum Signed Message:\n"`, and similar strings.
+### Changed
+### Removed
+
+## [4.0.0-rc3] - 2019-09-12
+### Added
 - `Bytes.concat` and `Bytes.split` are added to be able to
   (de-)construct byte arrays.
 - `[a..b]` language construct, returning the list of numbers between
   `a` and `b` (inclusive). Returns the empty list if `a` > `b`.
-- [Standard libraries](https://github.com/aeternity/aesophia/blob/master/docs/sophia_stdlib.md)
+- [Standard libraries] (https://github.com/aeternity/protocol/blob/master/contracts/sophia_stdlib.md)
 - Checks that `init` is not called from other functions.
+### Changed
+- Error messages are changed into a uniform format, and more helpful
+  messages have been added.
+- `Crypto.<hash_fun>` and `String.<hash_fun>` for byte arrays now only
+  hash the actual byte array - not the internal ABI format.
+- More strict checks for polymorphic oracles and higher order oracles
+  and entrypoints.
+- `AENS.claim` is updated with a `NameFee` field - to be able to do
+  name auctions within contracts.
+- Fixed a bug in `Bytes.to_str` for AEVM.
+### Removed
+
+## [4.0.0-rc1] - 2019-08-22
+### Added
 - FATE backend - the compiler is able to produce VM code for both `AEVM` and `FATE`. Many
   of the APIs now take `{backend, aevm | fate}` to decide wich backend to produce artifacts
   for.
@@ -259,20 +53,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   that shall be able to receive funds should be marked as payable. `Address.is_payable(a)`
   can be used to check if an (contract) address is payable or not.
 ### Changed
-- Nice type error if contract function is called as from a namespace.
-- Fail on function definitions in contracts other than the main contract.
-- Bug fix in variable optimization - don't discard writes to the store/state.
-- Bug fixes in error reporting.
-- Bug fix in variable liveness analysis for FATE.
-- Error messages are changed into a uniform format, and more helpful
-  messages have been added.
-- `Crypto.<hash_fun>` and `String.<hash_fun>` for byte arrays now only
-  hash the actual byte array - not the internal ABI format.
-- More strict checks for polymorphic oracles and higher order oracles
-  and entrypoints.
-- `AENS.claim` is updated with a `NameFee` field - to be able to do
-  name auctions within contracts.
-- Fixed a bug in `Bytes.to_str` for AEVM.
 - New syntax for tuple types. Now 0-tuple type is encoded as `unit` instead of `()` and
   regular tuples are encoded by interspersing inner types with `*`, for instance `int * string`.
   Parens are not necessary. Note it only affects the types, values remain as their were before,
@@ -380,19 +160,10 @@ 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.1.0...HEAD
-[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
-[6.0.0]: https://github.com/aeternity/aesophia/compare/v5.0.0...v6.0.0
-[5.0.0]: https://github.com/aeternity/aesophia/compare/v4.3.0...v5.0.0
-[4.3.0]: https://github.com/aeternity/aesophia/compare/v4.2.0...v4.3.0
-[4.2.0]: https://github.com/aeternity/aesophia/compare/v4.1.0...v4.2.0
-[4.1.0]: https://github.com/aeternity/aesophia/compare/v4.0.0...v4.1.0
-[4.0.0]: https://github.com/aeternity/aesophia/compare/v3.2.0...v4.0.0
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v4.0.0-rc4...HEAD
+[4.0.0-rc4]: https://github.com/aeternity/aesophia/compare/v4.0.0-rc3...v4.0.0-rc4
+[4.0.0-rc3]: https://github.com/aeternity/aesophia/compare/v4.0.0-rc1...v4.0.0-rc3
+[4.0.0-rc1]: https://github.com/aeternity/aesophia/compare/v3.2.0...v4.0.0-rc1
 [3.2.0]: https://github.com/aeternity/aesophia/compare/v3.1.0...v3.2.0
 [3.1.0]: https://github.com/aeternity/aesophia/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/aeternity/aesophia/compare/v2.1.0...v3.0.0

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)

LICENSE

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2017, æternity developers
+Copyright (c) 2017, aeternity developers
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

README.md

@@ -1,35 +1,25 @@
 # aesophia
 
-This is the __sophia__ compiler for the æternity system which compiles contracts written in __sophia__ to [FATE](https://github.com/aeternity/protocol/blob/master/contracts/fate.md) instructions.
+This is the __sophia__ compiler for the æternity system which compiles contracts written in __sophia__ code to the æternity VM code.
 
-The compiler is currently being used three places
- - [The command line compiler](https://github.com/aeternity/aesophia_cli)
- - [The HTTP compiler](https://github.com/aeternity/aesophia_http)
- - In [æternity node](https://github.com/aeternity/aeternity) tests
+For more information about æternity smart contracts and the sophia language see [Smart Contracts](https://github.com/aeternity/protocol/blob/master/contracts/contracts.md) and the [Sophia Language](https://github.com/aeternity/protocol/blob/master/contracts/sophia.md).
 
-## Documentation
-
-* [Introduction](docs/index.md)
-* [Syntax](docs/sophia_syntax.md)
-* [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.
+It is an OTP application written in Erlang and is by default included in
+[the æternity node](https://github.com/aeternity/epoch). However, it can
+also be included in other systems to compile contracts coded in sophia which
+can then be loaded into the æternity system.
 
 ## Versioning
 
-Versioning should follow the [semantic versioning](https://semver.org/spec/v2.0.0) guidelines. Id est, given a version number MAJOR.MINOR.PATCH, increment the:
-
-- MAJOR version when you make incompatible API changes
-- MINOR version when you add functionality in a backwards compatible manner
-- PATCH version when you make backwards compatible bug fixes
-
+`aesophia` has a version that is only loosely connected to the version of the
+Aeternity node - in principle they will share the major version but not
+minor/patch version. The `aesophia` compiler version MUST be bumped whenever
+there is a change in how byte code is generated, but it MAY also be bumped upon
+API changes etc.
 
 ## Interface Modules
 
 The basic modules for interfacing the compiler:
 
-* [aeso_compiler: the Sophia compiler](docs/aeso_compiler.md)
-* [aeso_aci: the ACI interface](docs/aeso_aci.md)
+* [aeso_compiler: the Sophia compiler](./docs/aeso_compiler.md)
+* [aeso_aci: the ACI interface](./docs/aeso_aci.md)

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

@@ -49,37 +49,11 @@ The **pp_** options all print to standard output the following:
 
 `pp_typed_ast` - print the AST with type information at each node
 
+`pp_icode` - print the internal code structure
+
 `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.
-
-The option `debug_info` includes information related to debugging in the compiler output. Currently this option only includes the mapping from variables to registers.
-
-#### 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
+`pp_bytecode` - print the bytecode instructions
 
 #### check_call(ContractString, Options) -> CheckRet
 
@@ -92,6 +66,15 @@ Type = term()
 ```
 Check a call in contract through the `__call` function.
 
+#### sophia_type_to_typerep(String) -> TypeRep
+
+Types
+``` erlang
+ {ok,TypeRep} | {error, badtype}
+```
+
+Get the type representation of a type declaration.
+
 #### version() -> {ok, Version} | {error, term()}
 
 Types

docs/index.md

@@ -1,12 +0,0 @@
-# Introduction
-Sophia is a functional language designed for smart contract development. It is strongly typed and has
-restricted mutable state.
-
-Sophia is customized for smart contracts, which can be published
-to a blockchain. Thus some features of conventional
-languages, such as floating point arithmetic, are not present in Sophia, and
-some [æternity blockchain](https://aeternity.com) specific primitives, constructions and types have been added.
-
-!!! Note
-    - For rapid prototyping of smart contracts check out [AEstudio](https://studio.aepps.com/)!
-    - For playing around and diving deeper into the language itself check out the [REPL](https://repl.aeternity.io/)!

docs/sophia.md

@@ -1 +0,0 @@
-This file has been moved [here](sophia_features.md)

docs/sophia_examples.md

@@ -1,73 +0,0 @@
-# Contract examples
-
-## Crowdfunding
-```sophia
-/*
- * A simple crowd-funding example
- */
-contract FundMe =
-
-  record spend_args = { recipient : address,
-                        amount    : int }
-
-  record state = { contributions : map(address, int),
-                   total         : int,
-                   beneficiary   : address,
-                   deadline      : int,
-                   goal          : int }
-
-  stateful function spend(args : spend_args) =
-    Chain.spend(args.recipient, args.amount)
-
-  entrypoint init(beneficiary, deadline, goal) : state =
-    { contributions = {},
-      beneficiary   = beneficiary,
-      deadline      = deadline,
-      total         = 0,
-      goal          = goal }
-
-  function is_contributor(addr) =
-    Map.member(addr, state.contributions)
-
-  stateful entrypoint contribute() =
-    if(Chain.block_height >= state.deadline)
-      spend({ recipient = Call.caller, amount = Call.value }) // Refund money
-      false
-    else
-      let amount =
-        switch(Map.lookup(Call.caller, state.contributions))
-          None    => Call.value
-          Some(n) => n + Call.value
-      put(state{ contributions[Call.caller] = amount,
-                 total @ tot = tot + Call.value })
-      true
-
-  stateful entrypoint withdraw() =
-    if(Chain.block_height < state.deadline)
-      abort("Cannot withdraw before deadline")
-    if(Call.caller == state.beneficiary)
-      withdraw_beneficiary()
-    elif(is_contributor(Call.caller))
-      withdraw_contributor()
-    else
-      abort("Not a contributor or beneficiary")
-
-  stateful function withdraw_beneficiary() =
-    require(state.total >= state.goal, "Project was not funded")
-    spend({recipient = state.beneficiary,
-           amount    = Contract.balance })
-
-  stateful function withdraw_contributor() =
-    if(state.total >= state.goal)
-      abort("Project was funded")
-    let to = Call.caller
-    spend({recipient = to,
-           amount    = state.contributions[to]})
-    put(state{ contributions @ c = Map.delete(to, c) })
-```
-
-## Repositories
-This is a list with repositories that include smart contracts written in Sophia:
-
-- [aepp-sophia-examples](https://github.com/aeternity/aepp-sophia-examples)
-    - A repository that contains lots of different examples. The functionality of these examples is - to some extent - also covered by tests written in JavaScript.

docs/sophia_syntax.md

@@ -1,287 +0,0 @@
-# Syntax
-
-## Lexical syntax
-
-### Comments
-
-Single line comments start with `//` and block comments are enclosed in `/*`
-and `*/` and can be nested.
-
-### 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
-```
-
-### Tokens
-
-- `Id = [a-z_][A-Za-z0-9_']*` identifiers start with a lower case letter.
-- `Con = [A-Z][A-Za-z0-9_']*` constructors start with an upper case letter.
-- `QId = (Con\.)+Id` qualified identifiers (e.g. `Map.member`)
-- `QCon = (Con\.)+Con` qualified constructor
-- `TVar = 'Id` type variable (e.g `'a`, `'b`)
-- `Int = [0-9]+(_[0-9]+)*|0x[0-9A-Fa-f]+(_[0-9A-Fa-f]+)*` integer literal with optional `_` separators
-- `Bytes = #[0-9A-Fa-f]+(_[0-9A-Fa-f]+)*` byte array literal with optional `_` separators
-- `String` string literal enclosed in `"` with escape character `\`
-- `Char` character literal enclosed in `'` with escape character `\`
-- `AccountAddress` base58-encoded 32 byte account pubkey with `ak_` prefix
-- `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
-
-Valid string escape codes are
-
-| Escape        |       ASCII |   |
-|---------------|-------------|---|
-| `\b`          |           8 |   |
-| `\t`          |           9 |   |
-| `\n`          |          10 |   |
-| `\v`          |          11 |   |
-| `\f`          |          12 |   |
-| `\r`          |          13 |   |
-| `\e`          |          27 |   |
-| `\xHexDigits` | *HexDigits* |   |
-
-
-See the [identifier encoding scheme](https://github.com/aeternity/protocol/blob/master/node/api/api_encoding.md) for the
-details on the base58 literals.
-
-## Layout blocks
-
-Sophia uses Python-style layout rules to group declarations and statements. A
-layout block with more than one element must start on a separate line and be
-indented more than the currently enclosing layout block. Blocks with a single
-element can be written on the same line as the previous token.
-
-Each element of the block must share the same indentation and no part of an
-element may be indented less than the indentation of the block. For instance
-
-```sophia
-contract Layout =
-  function foo() = 0  // no layout
-  function bar() =    // layout block starts on next line
-    let x = foo()     // indented more than 2 spaces
-    x
-     + 1              // the '+' is indented more than the 'x'
-```
-
-## Notation
-
-In describing the syntax below, we use the following conventions:
-
-- Upper-case identifiers denote non-terminals (like `Expr`) or terminals with
-  some associated value (like `Id`).
-- Keywords and symbols are enclosed in single quotes: `'let'` or `'='`.
-- Choices are separated by vertical bars: `|`.
-- Optional elements are enclosed in `[` square brackets `]`.
-- `(` Parentheses `)` are used for grouping.
-- Zero or more repetitions are denoted by a postfix `*`, and one or more
-  repetitions by a `+`.
-- `Block(X)` denotes a layout block of `X`s.
-- `Sep(X, S)` is short for `[X (S X)*]`, i.e. a possibly empty sequence of `X`s
-  separated by `S`s.
-- `Sep1(X, S)` is short for `X (S X)*`, i.e. same as `Sep`, but must not be empty.
-
-
-## Declarations
-
-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)
-          | 'contract' 'interface' Con [Implement] '=' Block(Decl)
-          | 'namespace' Con '=' Block(Decl)
-          | '@compiler' PragmaOp Version
-          | 'include' String
-          | Using
-
-Implement ::= ':' Sep1(Con, ',')
-
-Decl ::= 'type'     Id ['(' TVar* ')'] '=' TypeAlias
-       | 'record'   Id ['(' TVar* ')'] '=' RecordType
-       | 'datatype' Id ['(' TVar* ')'] '=' DataType
-       | (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, '.')
-
-EModifier ::= 'payable' | 'stateful'
-FModifier ::= 'stateful' | 'private'
-
-Args ::= '(' Sep(Pattern, ',') ')'
-```
-
-Contract declarations must appear at the top-level.
-
-For example,
-```sophia
-contract Test =
-  type t = int
-  entrypoint add (x : t, y : t) = x + y
-```
-
-There are three forms of type declarations: type aliases (declared with the
-`type` keyword), record type definitions (`record`) and data type definitions
-(`datatype`):
-
-```c
-TypeAlias  ::= Type
-RecordType ::= '{' Sep(FieldType, ',') '}'
-DataType   ::= Sep1(ConDecl, '|')
-
-FieldType  ::= Id ':' Type
-ConDecl    ::= Con ['(' Sep1(Type, ',') ')']
-```
-
-For example,
-```sophia
-record   point('a) = {x : 'a, y : 'a}
-datatype shape('a) = Circle(point('a), 'a) | Rect(point('a), point('a))
-type     int_shape = shape(int)
-```
-
-## Types
-
-```c
-Type ::= Domain '=>' Type             // Function type
-       | Type '(' Sep(Type, ',') ')'  // Type application
-       | '(' Type ')'                 // Parens
-       | 'unit' | Sep(Type, '*')      // Tuples
-       | Id | QId | TVar
-
-Domain ::= Type                       // Single argument
-         | '(' Sep(Type, ',') ')'     // Multiple arguments
-```
-
-The function type arrow associates to the right.
-
-Example,
-```sophia
-'a => list('a) => (int * list('a))
-```
-
-## Statements
-
-Function bodies are blocks of *statements*, where a statement is one of the following
-
-```c
-Stmt ::= 'switch' '(' Expr ')' Block(Case)
-       | 'if' '(' Expr ')' Block(Stmt)
-       | '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
-```
-
-`if` statements can be followed by zero or more `elif` statements and an optional final `else` statement. For example,
-
-```sophia
-let x : int = 4
-switch(f(x))
-  None => 0
-  Some(y) =>
-    if(y > 10)
-      "too big"
-    elif(y < 3)
-      "too small"
-    else
-      "just right"
-```
-
-## Expressions
-
-```c
-Expr ::= '(' LamArgs ')' '=>' Block(Stmt)   // Anonymous function    (x) => x + 1
-       | '(' BinOp ')'                      // Operator lambda       (+)
-       | 'if' '(' Expr ')' Expr 'else' Expr // If expression         if(x < y) y else x
-       | Expr ':' Type                      // Type annotation       5 : int
-       | Expr BinOp Expr                    // Binary operator       x + y
-       | UnOp Expr                          // Unary operator        ! b
-       | Expr '(' Sep(Expr, ',') ')'        // Application           f(x, y)
-       | Expr '.' Id                        // Projection            state.x
-       | Expr '[' Expr ']'                  // Map lookup            map[key]
-       | Expr '{' Sep(FieldUpdate, ',') '}' // Record or map update  r{ fld[key].x = y }
-       | '[' Sep(Expr, ',') ']'             // List                  [1, 2, 3]
-       | '[' Expr '|' Sep(Generator, ',') ']'
-                                            // List comprehension    [k | x <- [1], if (f(x)), let k = x+1]
-       | '[' 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
-            | LetDef              // Definition
-
-LamArgs ::= '(' Sep(LamArg, ',') ')'
-LamArg  ::= Id [':' Type]
-
-FieldUpdate ::= Path '=' Expr
-Path ::= Id                 // Record field
-       | '[' Expr ']'       // Map key
-       | Path '.' Id        // Nested record field
-       | Path '[' Expr ']'  // Nested map key
-
-BinOp ::= '||' | '&&' | '<' | '>' | '=<' | '>=' | '==' | '!='
-        | '::' | '++' | '+' | '-' | '*' | '/' | 'mod' | '^'
-        | '|>'
-UnOp  ::= '-' | '!'
-```
-
-## Operators types
-
-| Operators | Type
-| --- | ---
-| `-` `+` `*` `/` `mod` `^` | arithmetic operators
-| `!` `&&` `||` | logical operators
-| `==` `!=` `<` `>` `=<` `>=` | comparison operators
-| `::` `++` | list operators
-| `|>` | functional operators
-
-## Operator precedence
-
-In order of highest to lowest precedence.
-
-| Operators | Associativity
-| --- | ---
-| `!` | right
-| `^` | left
-| `*` `/` `mod` | left
-| `-` (unary) | right
-| `+` `-` | left
-| `::` `++` | right
-| `<` `>` `=<` `>=` `==` `!=` | none
-| `&&` | right
-| `||` | right
-| `|>` | left

priv/stdlib/BLS12_381.aes

@@ -1,68 +0,0 @@
-namespace BLS12_381 =
-  type fr    = MCL_BLS12_381.fr
-  type fp    = MCL_BLS12_381.fp
-  record fp2 = { x1 : fp, x2 : fp }
-  record g1  = { x : fp, y : fp, z : fp }
-  record g2  = { x : fp2, y : fp2, z : fp2 }
-  record gt  = { x1 : fp, x2 : fp, x3 : fp, x4 : fp, x5 : fp, x6 : fp,
-                 x7 : fp, x8 : fp, x9 : fp, x10 : fp, x11 : fp, x12 : fp }
-
-  function pairing_check(us : list(g1), vs : list(g2)) =
-    switch((us, vs))
-      ([], []) => true
-      (x :: xs, y :: ys) => pairing_check_(pairing(x, y), xs, ys)
-
-  function pairing_check_(acc : gt, us : list(g1), vs : list(g2)) =
-    switch((us, vs))
-      ([], []) => gt_is_one(acc)
-      (x :: xs, y :: ys) =>
-        pairing_check_(gt_mul(acc, pairing(x, y)), xs, ys)
-
-  function int_to_fr(x : int) = MCL_BLS12_381.int_to_fr(x)
-  function int_to_fp(x : int) = MCL_BLS12_381.int_to_fp(x)
-  function fr_to_int(x : fr)  = MCL_BLS12_381.fr_to_int(x)
-  function fp_to_int(x : fp)  = MCL_BLS12_381.fp_to_int(x)
-
-  function mk_g1(x : int, y : int, z : int) : g1 =
-    { x = int_to_fp(x), y = int_to_fp(y), z = int_to_fp(z) }
-
-  function mk_g2(x1 : int, x2 : int, y1 : int, y2 : int, z1 : int, z2 : int) : g2 =
-    { x = {x1 = int_to_fp(x1), x2 = int_to_fp(x2)},
-      y = {x1 = int_to_fp(y1), x2 = int_to_fp(y2)},
-      z = {x1 = int_to_fp(z1), x2 = int_to_fp(z2)} }
-
-  function pack_g1(t) = switch(t)
-                          (x, y, z) => {x = x, y = y, z = z} : g1
-  function pack_g2(t) = switch(t)
-                          ((x1, x2), (y1, y2), (z1, z2)) =>
-                            {x = {x1 = x1, x2 = x2}, y = {x1 = y1, x2 = y2}, z = {x1 = z1, x2 = z2}} : g2
-  function pack_gt(t) = switch(t)
-                          (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12) =>
-                            {x1 = x1, x2 = x2, x3 = x3, x4 = x4, x5 = x5, x6 = x6,
-                             x7 = x7, x8 = x8, x9 = x9, x10 = x10, x11 = x11, x12 = x12} : gt
-
-  function g1_neg(p : g1)         = pack_g1(MCL_BLS12_381.g1_neg((p.x, p.y, p.z)))
-  function g1_norm(p : g1)        = pack_g1(MCL_BLS12_381.g1_norm((p.x, p.y, p.z)))
-  function g1_valid(p : g1)       = MCL_BLS12_381.g1_valid((p.x, p.y, p.z))
-  function g1_is_zero(p : g1)     = MCL_BLS12_381.g1_is_zero((p.x, p.y, p.z))
-  function g1_add(p : g1, q : g1) = pack_g1(MCL_BLS12_381.g1_add((p.x, p.y, p.z), (q.x, q.y, q.z)))
-  function g1_mul(k : fr, p : g1) = pack_g1(MCL_BLS12_381.g1_mul(k, (p.x, p.y, p.z)))
-
-  function g2_neg(p : g2)         = pack_g2(MCL_BLS12_381.g2_neg(((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2))))
-  function g2_norm(p : g2)        = pack_g2(MCL_BLS12_381.g2_norm(((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2))))
-  function g2_valid(p : g2)       = MCL_BLS12_381.g2_valid(((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2)))
-  function g2_is_zero(p : g2)     = MCL_BLS12_381.g2_is_zero(((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2)))
-  function g2_add(p : g2, q : g2) = pack_g2(MCL_BLS12_381.g2_add(((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2)),
-                                                                 ((q.x.x1, q.x.x2), (q.y.x1, q.y.x2), (q.z.x1, q.z.x2))))
-  function g2_mul(k : fr, p : g2) = pack_g2(MCL_BLS12_381.g2_mul(k, ((p.x.x1, p.x.x2), (p.y.x1, p.y.x2), (p.z.x1, p.z.x2))))
-
-  function gt_inv(p : gt)              = pack_gt(MCL_BLS12_381.gt_inv((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12)))
-  function gt_add(p : gt, q : gt)      = pack_gt(MCL_BLS12_381.gt_add((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12),
-                                                                      (q.x1, q.x2, q.x3, q.x4, q.x5, q.x6, q.x7, q.x8, q.x9, q.x10, q.x11, q.x12)))
-  function gt_mul(p : gt, q : gt)      = pack_gt(MCL_BLS12_381.gt_mul((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12),
-                                                                      (q.x1, q.x2, q.x3, q.x4, q.x5, q.x6, q.x7, q.x8, q.x9, q.x10, q.x11, q.x12)))
-  function gt_pow(p : gt, k : fr)      = pack_gt(MCL_BLS12_381.gt_pow((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12), k))
-  function gt_is_one(p : gt)           = MCL_BLS12_381.gt_is_one((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12))
-  function pairing(p : g1, q : g2)     = pack_gt(MCL_BLS12_381.pairing((p.x, p.y, p.z), ((q.x.x1, q.x.x2), (q.y.x1, q.y.x2), (q.z.x1, q.z.x2))))
-  function miller_loop(p : g1, q : g2) = pack_gt(MCL_BLS12_381.miller_loop((p.x, p.y, p.z), ((q.x.x1, q.x.x2), (q.y.x1, q.y.x2), (q.z.x1, q.z.x2))))
-  function final_exp(p : gt)           = pack_gt(MCL_BLS12_381.final_exp((p.x1, p.x2, p.x3, p.x4, p.x5, p.x6, p.x7, p.x8, p.x9, p.x10, p.x11, p.x12)))

priv/stdlib/Bitwise.aes

@@ -1,126 +0,0 @@
-@compiler >= 4.3
-
-namespace Bitwise =
-
-  // bit shift 'x' right 'n' postions
-  function bsr(n : int, x : int) : int =
-    let step = 2^n
-    let res  = x / step
-    if (x >= 0 || x mod step == 0)
-      res
-    else
-      res - 1
-
-  // bit shift 'x' left 'n' positions
-  function bsl(n : int, x : int) : int =
-    x * 2^n
-
-  // bit shift 'x' left 'n' positions, limit at 'lim' bits
-  function bsli(n : int, x : int, lim : int) : int =
-    (x * 2^n) mod (2^lim)
-
-  // bitwise 'and' for arbitrary precision integers
-  function band(a : int, b : int) : int =
-      if (a >= 0 && b >= 0)
-        uband_(a, b)
-      elif (b >= 0)
-        ubnand_(b, -1 - a)
-      elif (a >= 0)
-        ubnand_(a, -1 - b)
-      else
-        -1 - ubor_(-1 - a, -1 - b)
-
-  // bitwise 'or' for arbitrary precision integers
-  function
-    bor : (int, int) => int
-    bor(0, b) = b
-    bor(a, 0) = a
-    bor(a : int, b : int) : int =
-      if (a >= 0 && b >= 0)
-        ubor_(a, b)
-      elif (b >= 0)
-        -1 - ubnand_(-1 - a, b)
-      elif (a >= 0)
-        -1 - ubnand_(-1 - b, a)
-      else
-        -1 - uband_(-1 - a, -1 - b)
-
-  // bitwise 'xor' for arbitrary precision integers
-  function
-    bxor : (int, int) => int
-    bxor(0, b) = b
-    bxor(a, 0) = a
-    bxor(a, b) =
-      if (a >= 0 && b >= 0)
-        ubxor_(a, b)
-      elif (b >= 0)
-        -1 - ubxor_(-1 - a, b)
-      elif (a >= 0)
-        -1 - ubxor_(a, -1 - b)
-      else
-        ubxor_(-1 - a, -1 - b)
-
-  // bitwise 'not' for arbitrary precision integers
-  function bnot(a : int) = bxor(a, -1)
-
-  // Bitwise 'and' for non-negative integers
-  function uband(a : int, b : int) : int =
-    require(a >= 0 && b >= 0, "uband is only defined for non-negative integers")
-    switch((a, b))
-      (0, _) => 0
-      (_, 0) => 0
-      _      => uband__(a, b, 1, 0)
-
-  private function uband_(a, b) = uband__(a, b, 1, 0)
-
-  private function
-    uband__(0, b, val, acc) = acc
-    uband__(a, 0, val, acc) = acc
-    uband__(a, b, val, acc) =
-      switch (a mod 2 + b mod 2)
-        2 => uband__(a / 2, b / 2, val * 2, acc + val)
-        _ => uband__(a / 2, b / 2, val * 2, acc)
-
-  // Bitwise 'or' for non-negative integers
-  function ubor(a, b) =
-    require(a >= 0 && b >= 0, "ubor is only defined for non-negative integers")
-    switch((a, b))
-      (0, _) => b
-      (_, 0) => a
-      _      => ubor__(a, b, 1, 0)
-
-  private function ubor_(a, b) = ubor__(a, b, 1, 0)
-
-  private function
-    ubor__(0, 0, val, acc) = acc
-    ubor__(a, b, val, acc) =
-      switch (a mod 2 + b mod 2)
-        0 => ubor__(a / 2, b / 2, val * 2, acc)
-        _ => ubor__(a / 2, b / 2, val * 2, acc + val)
-
-  //Bitwise 'xor' for non-negative integers
-  function
-    ubxor : (int, int) => int
-    ubxor(0, b) = b
-    ubxor(a, 0) = a
-    ubxor(a, b) =
-      require(a >= 0 && b >= 0, "ubxor is only defined for non-negative integers")
-      ubxor__(a, b, 1, 0)
-
-  private function ubxor_(a, b) = ubxor__(a, b, 1, 0)
-
-  private function
-    ubxor__(0, 0, val, acc) = acc
-    ubxor__(a, b, val, acc) =
-      switch(a mod 2 + b mod 2)
-        1 => ubxor__(a / 2, b / 2, val * 2, acc + val)
-        _ => ubxor__(a / 2, b / 2, val * 2, acc)
-
-  private function ubnand_(a, b) = ubnand__(a, b, 1, 0)
-
-  private function
-    ubnand__(0, b, val, acc) = acc
-    ubnand__(a, b, val, acc) =
-      switch((a mod 2, b mod 2))
-        (1, 0) => ubnand__(a / 2, b / 2, val * 2, acc + val)
-        _      => ubnand__(a / 2, b / 2, val * 2, acc)

priv/stdlib/Frac.aes

@@ -1,185 +0,0 @@
-include "String.aes"
-
-namespace Frac =
-
-  private function gcd(a : int, b : int) =
-    if (b == 0) a else gcd(b, a mod b)
-
-  private function abs_int(a : int) = if (a < 0) -a else a
-
-  datatype frac = Pos(int, int) | Zero | Neg(int, int)
-
-/** Checks if the internal representation is correct.
-  * Numerator and denominator must be positive.
-  * Exposed for debug purposes
-  */
-  function is_sane(f : frac) : bool = switch(f)
-    Pos(n, d) => n > 0 && d > 0
-    Zero => true
-    Neg(n, d) => n > 0 && d > 0
-
-  function num(f : frac) : int = switch(f)
-    Pos(n, _) => n
-    Neg(n, _) => -n
-    Zero      => 0
-
-  function den(f : frac) : int = switch(f)
-    Pos(_, d) => d
-    Neg(_, d) => d
-    Zero      => 1
-
-  function to_pair(f : frac) : int * int = switch(f)
-    Pos(n, d) => (n, d)
-    Neg(n, d) => (-n, d)
-    Zero      => (0, 1)
-
-  function sign(f : frac) : int = switch(f)
-    Pos(_, _) => 1
-    Neg(_, _) => -1
-    Zero      => 0
-
-  function to_str(f : frac) : string = switch(f)
-    Pos(n, d) => String.concat(Int.to_str(n), if (d == 1) "" else String.concat("/", Int.to_str(d)))
-    Neg(n, d) => String.concat("-", to_str(Pos(n, d)))
-    Zero      => "0"
-
-/** Reduce fraction to normal form
- */
-  function simplify(f : frac) : frac =
-    switch(f)
-      Neg(n, d) =>
-        let cd = gcd(n, d)
-        Neg(n / cd, d / cd)
-      Zero  => Zero
-      Pos(n, d)  =>
-        let cd = gcd(n, d)
-        Pos(n / cd, d / cd)
-
-/** Integer to rational division
- */
-  function make_frac(n : int, d : int) : frac =
-    if (d == 0) abort("Zero denominator")
-    elif (n == 0) Zero
-    elif ((n < 0) == (d < 0)) simplify(Pos(abs_int(n), abs_int(d)))
-    else simplify(Neg(abs_int(n), abs_int(d)))
-
-  function one() : frac = Pos(1, 1)
-  function zero() : frac = Zero
-
-  function eq(a : frac, b : frac) : bool =
-    let (na, da) = to_pair(a)
-    let (nb, db) = to_pair(b)
-    (na == nb && da == db) || na * db == nb * da // they are more likely to be normalized
-
-  function neq(a : frac, b : frac) : bool =
-    let (na, da) = to_pair(a)
-    let (nb, db) = to_pair(b)
-    (na != nb || da != db) && na * db != nb * da
-
-  function geq(a : frac, b : frac) : bool = num(a) * den(b) >= num(b) * den(a)
-
-  function leq(a : frac, b : frac) : bool = num(a) * den(b) =< num(b) * den(a)
-
-  function gt(a : frac, b : frac) : bool = num(a) * den(b) > num(b) * den(a)
-
-  function lt(a : frac, b : frac) : bool = num(a) * den(b) < num(b) * den(a)
-
-  function min(a : frac, b : frac) : frac = if (leq(a, b)) a else b 
-
-  function max(a : frac, b : frac) : frac = if (geq(a, b)) a else b 
-
-  function abs(f : frac) : frac = switch(f)
-    Pos(n, d) => Pos(n, d)
-    Zero      => Zero
-    Neg(n, d) => Pos(n, d)
-
-  function from_int(n : int) : frac =
-    if   (n > 0) Pos(n, 1)
-    elif (n < 0) Neg(-n, 1)
-    else Zero
-
-  function floor(f : frac) : int = switch(f)
-    Pos(n, d) => n / d
-    Zero      => 0
-    Neg(n, d) => -(n + d - 1) / d
-
-  function ceil(f : frac) : int = switch(f)
-    Pos(n, d) => (n + d - 1) / d
-    Zero      => 0
-    Neg(n, d) => -n / d
-  
-  function round_to_zero(f : frac) : int = switch(f)
-    Pos(n, d) => n / d
-    Zero      => 0
-    Neg(n, d) => -n / d
-
-  function round_from_zero(f : frac) : int = switch(f)
-    Pos(n, d) => (n + d - 1) / d
-    Zero      => 0
-    Neg(n, d) => -(n + d - 1) / d
-
-/** Round towards nearest integer. If two integers are in the same
- * distance, choose the even one.
- */
-  function round(f : frac) : int =
-    let fl = floor(f)
-    let cl = ceil(f)
-    let dif_fl = abs(sub(f, from_int(fl)))
-    let dif_cl = abs(sub(f, from_int(cl)))
-    if   (gt(dif_fl, dif_cl)) cl
-    elif (gt(dif_cl, dif_fl)) fl
-    elif (fl mod 2 == 0) fl
-    else cl
-
-  function add(a : frac, b : frac) : frac =
-    let (na, da) = to_pair(a)
-    let (nb, db) = to_pair(b)
-    if   (da == db) make_frac(na + nb, da)
-    else make_frac(na * db + nb * da, da * db)
-
-  function neg(a : frac) : frac = switch(a)
-    Neg(n, d) => Pos(n, d)
-    Zero      => Zero
-    Pos(n, d) => Neg(n, d)
-
-  function sub(a : frac, b : frac) : frac = add(a, neg(b))
-
-  function inv(a : frac) : frac = switch(a)
-    Neg(n, d) => Neg(d, n)
-    Zero      => abort("Inversion of zero")
-    Pos(n, d) => Pos(d, n)
-
-  function mul(a : frac, b : frac) : frac = make_frac(num(a) * num(b), den(a) * den(b))
-
-  function div(a : frac, b : frac) : frac = switch(b)
-    Neg(n, d) => mul(a, Neg(d, n))
-    Zero      => abort("Division by zero")
-    Pos(n, d) => mul(a, Pos(d, n))
-
-/** `b` to the power of `e`
- */
-  function int_exp(b : frac, e : int) : frac =
-    if (sign(b) == 0 && e == 0) abort("Zero to the zero exponentation")
-    elif (e < 0) inv(int_exp_(b, -e))
-    else int_exp_(b, e)
-  private function int_exp_(b : frac, e : int) =
-      if (e == 0) from_int(1)
-      elif (e == 1) b
-      else
-        let half = int_exp_(b, e / 2)
-        if (e mod 2 == 1) mul(mul(half, half), b)
-        else mul(half, half)
-
-/** Reduces the fraction's in-memory size by dividing its components by two until the
- * the error is bigger than `loss` value
- */
-  function optimize(f : frac, loss : frac) : frac =
-    require(geq(loss, Zero), "negative loss optimize")
-    let s = sign(f)
-    mul(from_int(s), run_optimize(abs(f), abs(f), loss))
-  private function run_optimize(orig : frac, f : frac, loss : frac) : frac =
-    let (n, d) = to_pair(f)
-    let t = make_frac((n+1)/2, (d+1)/2)
-    if(gt(abs(sub(t, orig)), loss)) f
-    elif (eq(t, f)) f
-    else run_optimize(orig, t, loss)

priv/stdlib/Func.aes

@@ -2,7 +2,7 @@ namespace Func =
 
   function id(x : 'a) : 'a = x
 
-  function const(x : 'a) : 'b => 'a = (_) => x
+  function const(x : 'a) : 'b => 'a = (y) => x
 
   function flip(f : ('a, 'b) => 'c) : ('b, 'a) => 'c = (b, a) => f(a, b)
 
@@ -12,66 +12,35 @@ namespace Func =
 
   function rapply(x : 'a, f : 'a => 'b) : 'b = f(x)
 
-/** The Z combinator - replacement for local and anonymous recursion.
-  */
+  /* The Z combinator - replacement for local and anonymous recursion.
+   */
   function recur(f : ('arg => 'res, 'arg) => 'res) : 'arg => 'res =
     (x) => f(recur(f), x)
 
-/** n-times composition with itself
- */
   function iter(n : int, f : 'a => 'a) : 'a => 'a = iter_(n, f, (x) => x)
   private function iter_(n : int, f : 'a => 'a, acc : 'a => 'a) : 'a => 'a =
     if(n == 0) acc
     elif(n == 1) comp(f, acc)
     else iter_(n / 2, comp(f, f), if(n mod 2 == 0) acc else comp(f, acc))
 
-/** Turns an ugly, bad and disgusting arity-n function into
- * a beautiful and sweet function taking the first argument
- * and returning a function watiting for the remaining ones
- * in the same manner
- */
-  function curry2(f : ('a, 'b) => 'x) : 'a => ('b => 'x) =
+  function curry2(f : ('a, 'b) => 'c) : 'a => ('b => 'c) =
     (x) => (y) => f(x, y)
-  function curry3(f : ('a, 'b, 'c) => 'x) : 'a => ('b => ('c => 'x)) =
+  function curry3(f : ('a, 'b, 'c) => 'd) : 'a => ('b => ('c => 'd)) =
     (x) => (y) => (z) => f(x, y, z)
-  function curry4(f : ('a, 'b, 'c, 'd) => 'x) : 'a => ('b => ('c => ('d => 'x))) =
-    (x) => (y) => (z) => (w) => f(x, y, z, w)
-  function curry5(f : ('a, 'b, 'c, 'd, 'e) => 'x) : 'a => ('b => ('c => ('d => ('e => 'x)))) =
-    (x) => (y) => (z) => (w) => (q) => f(x, y, z, w, q)
 
-/** Opposite of curry. Gross
- */
-  function uncurry2(f : 'a => ('b => 'x)) : ('a, 'b) => 'x =
+  function uncurry2(f : 'a => ('b => 'c)) : ('a, 'b) => 'c =
     (x, y) => f(x)(y)
-  function uncurry3(f : 'a => ('b => ('c => 'x))) : ('a, 'b, 'c) => 'x =
+  function uncurry3(f : 'a => ('b => ('c => 'd))) : ('a, 'b, 'c) => 'd =
     (x, y, z) => f(x)(y)(z)
-  function uncurry4(f : 'a => ('b => ('c => ('d => 'x)))) : ('a, 'b, 'c, 'd) => 'x =
-    (x, y, z, w) => f(x)(y)(z)(w)
-  function uncurry5(f : 'a => ('b => ('c => ('d => ('e => 'x))))) : ('a, 'b, 'c, 'd, 'e) => 'x =
-    (x, y, z, w, q) => f(x)(y)(z)(w)(q)
 
-/** Turns an arity-n function into a function taking n-tuple
- */
-  function tuplify2(f : ('a, 'b) => 'x) : (('a * 'b)) => 'x =
+  function tuplify2(f : ('a, 'b) => 'c) : (('a * 'b)) => 'c =
     (t) => switch(t)
       (x, y) => f(x, y)
-  function tuplify3(f : ('a, 'b, 'c) => 'x) : 'a * 'b * 'c => 'x =
+  function tuplify3(f : ('a, 'b, 'c) => 'd) : 'a * 'b * 'c => 'd =
     (t) => switch(t)
       (x, y, z) => f(x, y, z)
-  function tuplify4(f : ('a, 'b, 'c, 'd) => 'x) : 'a * 'b * 'c * 'd => 'x =
-    (t) => switch(t)
-      (x, y, z, w) => f(x, y, z, w)
-  function tuplify5(f : ('a, 'b, 'c, 'd, 'e) => 'x) : 'a * 'b * 'c * 'd * 'e => 'x =
-    (t) => switch(t)
-      (x, y, z, w, q) => f(x, y, z, w, q)
 
-/** Opposite of tuplify
- */
-  function untuplify2(f : 'a * 'b => 'x) : ('a, 'b) => 'x =
+  function untuplify2(f : 'a * 'b => 'c) : ('a, 'b) => 'c =
     (x, y) => f((x, y))
-  function untuplify3(f : 'a * 'b * 'c => 'x) : ('a, 'b, 'c) => 'x =
+  function untuplify3(f : 'a * 'b * 'c => 'd) : ('a, 'b, 'c) => 'd =
     (x, y, z) => f((x, y, z))
-  function untuplify4(f : 'a * 'b * 'c * 'd => 'x) : ('a, 'b, 'c, 'd) => 'x =
-    (x, y, z, w) => f((x, y, z, w))
-  function untuplify5(f : 'a * 'b * 'c * 'd * 'e => 'x) : ('a, 'b, 'c, 'd, 'e) => 'x =
-    (x, y, z, w, q) => f((x, y, z, w, q))

priv/stdlib/List.aes

@@ -15,42 +15,22 @@ namespace List =
     _::t => Some(t)
 
   function last(l : list('a)) : option('a) = switch(l)
-    []   => None
-    [x]  => Some(x)
+    []  => None
+    [x] => Some(x)
     _::t => last(t)
 
-  function drop_last(l : list('a)) : option(list('a)) = switch(l)
-    [] => None
-    _  => Some(drop_last_unsafe(l))
-
-  function drop_last_unsafe(l : list('a)) : list('a) = switch(l)
-    [_]  => []
-    h::t => h::drop_last_unsafe(t)
-    []   => abort("drop_last_unsafe: list empty")
-
-
-  function contains(e : 'a, l : list('a)) = 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.
- */
   function find(p : 'a => bool, l : list('a)) : option('a) = switch(l)
     []   => None
     h::t => if(p(h)) Some(h) else find(p, t)
 
-/** Returns list of all indices of elements from `l` that fulfill the predicate `p`.
- */
-  function find_indices(p : 'a => bool, l : list('a)) : list(int) = find_indices_(p, l, 0)
+  function find_indices(p : 'a => bool, l : list('a)) : list(int) = find_indices_(p, l, 0, [])
   private function find_indices_( p : 'a => bool
                                 , l : list('a)
                                 , n : int
+                                , acc : list(int)
                                 ) : list(int) = switch(l)
-    []   => []
-    h::t =>
-     let rest = find_indices_(p, t, n+1)
-     if(p(h)) n::rest else rest
+    []   => reverse(acc)
+    h::t => find_indices_(p, t, n+1, if(p(h)) n::acc else acc)
 
   function nth(n : int, l : list('a)) : option('a) =
     switch(l)
@@ -70,54 +50,41 @@ namespace List =
     _::t => length_(t, acc + 1)
 
 
-/** Creates an ascending sequence of all integer numbers
- * between `a` and `b` (including `a` and `b`)
- */
   function from_to(a : int, b : int) : list(int) = [a..b]
 
-/** Creates an ascending sequence of integer numbers betweeen
- * `a` and `b` jumping by given `step`. Includes `a` and takes
- * `b` only if `(b - a) mod step == 0`. `step` should be bigger than 0.
- */
-  function from_to_step(a : int, b : int, s : int) : list(int) =
-    require(s > 0, "List.from_to_step: non-positive step")
-    from_to_step_(a, b - (b-a) mod s, s, [])
-  private function from_to_step_(a : int, b : int, s : int, acc : list(int)) : list(int) =
-    if(b < a) acc
-    else from_to_step_(a, b - s, s, b::acc)
+  function from_to_step(a : int, b : int, s : int) : list(int) = from_to_step_(a, b, s, [])
+  private function from_to_step_(a, b, s, acc) =
+    if (a > b) reverse(acc) else from_to_step_(a + s, b, s, a :: acc)
 
 
-/** Unsafe. Replaces `n`th element of `l` with `e`. Crashes on over/underflow
- */
+  /* Unsafe. Replaces `n`th element of `l` with `e`. Crashes on over/underflow */
   function replace_at(n : int, e : 'a, l : list('a)) : list('a) =
-    if(n<0) abort("insert_at underflow") else replace_at_(n, e, l)
-  private function replace_at_(n : int, e : 'a, l : list('a)) : list('a) =
+    if(n<0) abort("insert_at underflow") else replace_at_(n, e, l, [])
+  private function replace_at_(n : int, e : 'a, l : list('a), acc : list('a)) : list('a) =
    switch(l)
      []   => abort("replace_at overflow")
-     h::t => if (n == 0) e::t
-             else h::replace_at_(n-1, e, t)
+     h::t => if (n == 0) reverse(e::acc) ++ t
+             else replace_at_(n-1, e, t, h::acc)
 
-/** Unsafe. Adds `e` to `l` to be its `n`th element. Crashes on over/underflow
- */
+  /* Unsafe. Adds `e` to `l` to be its `n`th element. Crashes on over/underflow */
   function insert_at(n : int, e : 'a, l : list('a)) : list('a) =
-    if(n<0) abort("insert_at underflow") else insert_at_(n, e, l)
-  private function insert_at_(n : int, e : 'a, l : list('a)) : list('a) =
-   if (n == 0) e::l
+    if(n<0) abort("insert_at underflow") else insert_at_(n, e, l, [])
+  private function insert_at_(n : int, e : 'a, l : list('a), acc : list('a)) : list('a) =
+   if (n == 0) reverse(e::acc) ++ l
    else switch(l)
      []   => abort("insert_at overflow")
-     h::t => h::insert_at_(n-1, e, t)
+     h::t => insert_at_(n-1, e, t, h::acc)
 
-/** Assuming that cmp represents `<` comparison, inserts `x` before
- * the first element in the list `l` which is greater than it
- */
   function insert_by(cmp : (('a, 'a) => bool), x : 'a, l : list('a)) : list('a) =
+    insert_by_(cmp, x, l, [])
+  private function insert_by_(cmp : (('a, 'a) => bool), x : 'a, l : list('a), acc : list('a)) : list('a) =
     switch(l)
-      []   => [x]
+      []   => reverse(x::acc)
       h::t =>
         if(cmp(x, h)) // x < h
-          x::l
+          reverse(acc) ++ (x::l)
         else
-          h::insert_by(cmp, x, t)
+          insert_by_(cmp, x, t, h::acc)
 
 
   function foldr(cons : ('a, 'b) => 'b, nil : 'b, l : list('a)) : 'b = switch(l)
@@ -135,71 +102,61 @@ namespace List =
        f(e)
        foreach(l', f)
 
-  function reverse(l : list('a)) : list('a) = reverse_(l, [])
-  private function reverse_(l : list('a), acc : list('a)) : list('a) = switch(l)
-    [] => acc
-    h::t => reverse_(t, h::acc)
+  function reverse(l : list('a)) : list('a) = foldl((lst, el) => el :: lst, [], l)
 
-  function map(f : 'a => 'b, l : list('a)) : list('b) = switch(l)
-    [] => []
-    h::t => f(h)::map(f, t)
+  function map(f : 'a => 'b, l : list('a)) : list('b) = map_(f, l, [])
+  private function map_(f : 'a => 'b, l : list('a), acc : list('b)) : list('b) = switch(l)
+    []   => reverse(acc)
+    h::t => map_(f, t, f(h)::acc)
 
-/** Effectively composition of `map` and `flatten`
- */
   function flat_map(f : 'a => list('b), l : list('a)) : list('b) =
     ListInternal.flat_map(f, l)
 
-  function filter(p : 'a => bool, l : list('a)) : list('a) = switch(l)
-    []   => []
-    h::t =>
-      let rest = filter(p, t)
-      if(p(h)) h::rest else rest
+  function filter(p : 'a => bool, l : list('a)) : list('a) = filter_(p, l, [])
+  private function filter_(p : 'a => bool, l : list('a), acc : list('a)) : list('a) = switch(l)
+    []   => reverse(acc)
+    h::t => filter_(p, t, if(p(h)) h::acc else acc)
 
-/** Take up to `n` first elements
- */
+  /* Take `n` first elements */
   function take(n : int, l : list('a)) : list('a) =
-    if(n < 0) abort("Take negative number of elements") else take_(n, l)
-  private function take_(n : int, l : list('a)) : list('a) =
-    if(n == 0) []
+    if(n < 0) abort("Take negative number of elements") else take_(n, l, [])
+  private function take_(n : int, l : list('a), acc : list('a)) : list('a) =
+    if(n == 0) reverse(acc)
     else switch(l)
-      []   => []
-      h::t => h::take_(n-1, t)
+      []   => reverse(acc)
+      h::t => take_(n-1, t, h::acc)
 
-/** Drop up to `n` first elements
- */
+  /* Drop `n` first elements */
   function drop(n : int, l : list('a)) : list('a) =
-   if(n < 0) abort("Drop negative number of elements") else drop_(n, l)
-  private function drop_(n : int, l : list('a)) : list('a) =
-   if (n == 0) l
+   if(n < 0) abort("Drop negative number of elements")
+   elif (n == 0) l
    else switch(l)
       []   => []
-      _::t => drop_(n-1, t)
+      h::t => drop(n-1, t)
 
-/** Get the longest prefix of a list in which every element
- * matches predicate `p`
- */
-  function take_while(p : 'a => bool, l : list('a)) : list('a) = switch(l)
-    []   => []
-    h::t => if(p(h)) h::take_while(p, t) else []
+  /* Get the longest prefix of a list in which every element matches predicate `p` */
+  function take_while(p : 'a => bool, l : list('a)) : list('a) = take_while_(p, l, [])
+  private function take_while_(p : 'a => bool, l : list('a), acc : list('a)) : list('a) = switch(l)
+    []   => reverse(acc)
+    h::t => if(p(h)) take_while_(p, t, h::acc) else reverse(acc)
 
-/** Drop elements from `l` until `p` holds
- */
+  /* Drop elements from `l` until `p` holds */
   function drop_while(p : 'a => bool, l : list('a)) : list('a) = switch(l)
     []   => []
     h::t => if(p(h)) drop_while(p, t) else l
 
-/** Splits list into two lists of elements that respectively
- * match and don't match predicate `p`
- */
-  function partition(p : 'a => bool, lst : list('a)) : (list('a) * list('a)) = switch(lst)
-    []   => ([], [])
-    h::t =>
-      let (l, r) = partition(p, t)
-      if(p(h)) (h::l, r) else (l, h::r)
+  /* Splits list into two lists of elements that respectively match and don't match predicate `p` */
+  function partition(p : 'a => bool, l : list('a)) : (list('a) * list('a)) = partition_(p, l, [], [])
+  private function partition_( p : 'a => bool
+                             , l : list('a)
+                             , acc_t : list('a)
+                             , acc_f : list('a)
+                             ) : (list('a) * list('a)) = switch(l)
+    []   => (reverse(acc_t), reverse(acc_f))
+    h::t => if(p(h)) partition_(p, t, h::acc_t, acc_f) else partition_(p, t, acc_t, h::acc_f)
 
-  function flatten(l : list(list('a))) : list('a) = switch(l)
-    []   => []
-    h::t => h ++ flatten(t)
+
+  function flatten(ll : list(list('a))) : list('a) = foldr((l1, l2) => l1 ++ l2, [], ll)
 
   function all(p : 'a => bool, l : list('a)) : bool = switch(l)
     []   => true
@@ -209,108 +166,49 @@ namespace List =
     []   => false
     h::t => if(p(h)) true else any(p, t)
 
-  function sum(l : list(int)) : int = switch(l)
-    []   => 0
-    h::t => h + sum(t)
+  function sum(l : list(int)) : int = foldl ((a, b) => a + b, 0, l)
 
-  function product(l : list(int)) : int = switch(l)
-    []   => 1
-    h::t => h * sum(t)
+  function product(l : list(int)) : int = foldl((a, b) => a * b, 1, l)
 
-/** Zips two list by applying bimapping function on respective elements.
- * Drops the tail of the longer list.
- */
-  private function zip_with( f : ('a, 'b) => 'c
+
+  /* Zips two list by applying bimapping function on respective elements. Drops longer tail. */
+  function zip_with(f : ('a, 'b) => 'c, l1 : list('a), l2 : list('b)) : list('c) = zip_with_(f, l1, l2, [])
+  private function zip_with_( f : ('a, 'b) => 'c
                             , l1 : list('a)
                             , l2 : list('b)
+                            , acc : list('c)
                             ) : list('c) = switch ((l1, l2))
-    (h1::t1, h2::t2) => f(h1, h2)::zip_with(f, t1, t2)
-    _ => []
+    (h1::t1, h2::t2) => zip_with_(f, t1, t2, f(h1, h2)::acc)
+    _ => reverse(acc)
 
-/** Zips two lists into list of pairs.
- * Drops the tail of the longer list.
- */
+  /* Zips two lists into list of pairs. Drops longer tail. */
   function zip(l1 : list('a), l2 : list('b)) : list('a * 'b) = zip_with((a, b) => (a, b), l1, l2)
 
-  function unzip(l : list('a * 'b)) : (list('a) * list('b)) = switch(l)
-    []          => ([], [])
-    (h1, h2)::t =>
-      let (t1, t2) = unzip(t)
-      (h1::t1, h2::t2)
+  function unzip(l : list('a * 'b)) : list('a) * list('b) = unzip_(l, [], [])
+  private function unzip_( l     : list('a * 'b)
+                         , acc_l : list('a)
+                         , acc_r : list('b)
+                         ) : (list('a) * list('b)) = switch(l)
+    []               => (reverse(acc_l), reverse(acc_r))
+    (left, right)::t => unzip_(t, left::acc_l, right::acc_r)
 
 
-  /** Merges two sorted lists using `lt` comparator
-   */
-  function
-    merge : (('a, 'a) => bool, list('a), list('a)) => list('a)
-    merge(lt, x::xs, y::ys) =
-      if(lt(x, y)) x::merge(lt, xs, y::ys)
-      else y::merge(lt, x::xs, ys)
-    merge(_, [], ys) = ys
-    merge(_, xs, []) = xs
-
-
-  /** Mergesort inspired by
-   * https://hackage.haskell.org/package/base-4.14.1.0/docs/src/Data.OldList.html#sort
-   */
-  function
-    sort : (('a, 'a) => bool, list('a)) => list('a)
-    sort(_, []) = []
-    sort(lt, l) =
-      merge_all(lt, monotonic_subs(lt, l))
-
-  /** Splits list into compound increasing sublists
-   */
-  private function
-    monotonic_subs : (('a, 'a) => bool, list('a)) => list(list('a))
-    monotonic_subs(lt, x::y::rest) =
-      if(lt(y, x)) desc(lt, y, [x], rest)
-      else asc(lt, y, [x], rest)
-    monotonic_subs(_, l) = [l]
-
-  /** Extracts the longest descending prefix and proceeds with monotonic split
-   */
-  private function
-    desc : (('a, 'a) => bool, 'a, list('a), list('a)) => list(list('a))
-    desc(lt, x, acc, h::t) =
-      if(lt(x, h)) (x::acc) :: monotonic_subs(lt, h::t)
-      else desc(lt, h, x::acc, t)
-    desc(_, x, acc, []) = [x::acc]
-
-  /** Extracts the longest ascending prefix and proceeds with monotonic split
-   */
-  private function
-    asc : (('a, 'a) => bool, 'a, list('a), list('a)) => list(list('a))
-    asc(lt, x, acc, 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, []) = [List.reverse(x::acc)]
-
-  /** Merges list of sorted lists
-   */
-  private function
-    merge_all : (('a, 'a) => bool, list(list('a))) => list('a)
-    merge_all(_, [part]) = part
-    merge_all(lt, parts) = merge_all(lt, merge_pairs(lt, parts))
-
-  /** Single round of `merge_all` – pairs of lists in a list of list
-   */
-  private function
-    merge_pairs : (('a, 'a) => bool, list(list('a))) => list(list('a))
-    merge_pairs(lt, x::y::rest) = merge(lt, x, y) :: merge_pairs(lt, rest)
-    merge_pairs(_, l) = l
-
-
-/** Puts `delim` between every two members of the list
- */
-  function intersperse(delim : 'a, l : list('a)) : list('a) = switch(l)
+  // TODO: Improve?
+  function sort(lesser_cmp : ('a, 'a) => bool, l : list('a)) : list('a) = switch(l)
     []   => []
-    [e]  => [e]
-    h::t => h::delim::intersperse(delim, t)
+    h::t => switch (partition((x) => lesser_cmp(x, h), t))
+      (lesser, bigger) => sort(lesser_cmp, lesser) ++ h::sort(lesser_cmp, bigger)
+
+
+  function intersperse(delim : 'a, l : list('a)) : list('a) = intersperse_(delim, l, [])
+  private function intersperse_(delim : 'a, l : list('a), acc : list('a)) : list('a) = switch(l)
+    []   => reverse(acc)
+    [e]  => reverse(e::acc)
+    h::t => intersperse_(delim, t, delim::h::acc)
+
+
+  function enumerate(l : list('a)) : list(int * 'a) = enumerate_(l, 0, [])
+  private function enumerate_(l : list('a), n : int, acc : list(int * 'a)) : list(int * 'a) = switch(l)
+    []   => reverse(acc)
+    h::t => enumerate_(t, n + 1, (n, h)::acc)
 
-/** Effectively a zip with an infinite sequence of natural numbers
- */
-  function enumerate(l : list('a)) : list(int * 'a) = enumerate_(l, 0)
-  private function enumerate_(l : list('a), n : int) : list(int * 'a) = switch(l)
-    []   => []
-    h::t => (n, h)::enumerate_(t, n + 1)

priv/stdlib/ListInternal.aes

@@ -2,8 +2,8 @@ namespace ListInternal =
 
   // -- Flatmap ----------------------------------------------------------------
 
-  function flat_map(f : 'a => list('b), lst : list('a)) : list('b) =
-    switch(lst)
+  function flat_map(f : 'a => list('b), xs : list('a)) : list('b) =
+    switch(xs)
       []      => []
       x :: xs => f(x) ++ flat_map(f, xs)
 

priv/stdlib/Option.aes

@@ -1,3 +1,5 @@
+include "List.aes"
+
 namespace Option =
 
   function is_none(o : option('a)) : bool = switch(o)
@@ -8,29 +10,14 @@ namespace Option =
     None => false
     Some(_) => true
 
-/** Catamorphism on `option`. Also known as inlined pattern matching.
- */
+
   function match(n : 'b, s : 'a => 'b, o : option('a)) : 'b = switch(o)
     None => n
     Some(x) => s(x)
 
-/** Escape option providing default if `None`
- */
   function default(def : 'a, o : option('a)) : 'a = match(def, (x) => x, o)
 
-/** Assume it is `Some`
- */
-  function force(o : option('a)) : 'a = switch(o)
-    None    => abort("Forced None value")
-    Some(x) => x
-
-/** Assume it is `Some` with custom error message
- */
-  function force_msg(o : option('a), err : string) : 'a = switch(o)
-    None    => abort(err)
-    Some(x) => x
-
-  function contains(e : 'a, o : option('a)) = o == Some(e)
+  function force(o : option('a)) : 'a = default(abort("Forced None value"), o)
 
   function on_elem(o : option('a), f : 'a => unit) : unit = match((), f, o)
 
@@ -53,14 +40,10 @@ namespace Option =
     (Some(x1), Some(x2), Some(x3)) => Some(f(x1, x2, x3))
     _ => None
 
-/** Like `map`, but the function is in `option`
- */
   function app_over(f : option ('a => 'b), o : option('a)) : option('b) = switch((f, o))
     (Some(ff), Some(xx)) => Some(ff(xx))
     _ => None
 
-/** Monadic bind
- */
   function flat_map(f : 'a => option('b), o : option('a)) : option('b) = switch(o)
     None => None
     Some(x) => f(x)
@@ -70,33 +53,24 @@ namespace Option =
     None => []
     Some(x) => [x]
 
-/** Turns list of options into a list of elements that are under `Some`s.
- * Safe.
- */
-  function filter_options(l : list(option('a))) : list('a) = switch(l)
-    []         => []
-    None::t    => filter_options(t)
-    Some(x)::t => x::filter_options(t)
+  function filter_options(l : list(option('a))) : list('a) = filter_options_(l, [])
+  private function filter_options_(l : list (option('a)), acc : list('a)) : list('a) = switch(l)
+    []         => List.reverse(acc)
+    None::t    => filter_options_(t, acc)
+    Some(x)::t => filter_options_(t, x::acc)
 
-/** Just like `filter_options` but requires all elements to be `Some` and returns
- * None if any of them is not
- */
-  function seq_options(l : list (option('a))) : option (list('a)) = switch(l)
-    []         => Some([])
-    None::_    => None
-    Some(x)::t => switch(seq_options(t))
-      None => None
-      Some(st) => Some(x::st)
+  function seq_options(l : list (option('a))) : option (list('a)) = seq_options_(l, [])
+  private function seq_options_(l : list (option('a)), acc : list('a)) : option(list('a)) = switch(l)
+    []         => Some(List.reverse(acc))
+    None::t    => None
+    Some(x)::t => seq_options_(t, x::acc)
 
 
-/** Choose `Some` out of two if possible
- */
   function choose(o1 : option('a), o2 : option('a)) : option('a) =
     if(is_some(o1)) o1 else o2
 
-/** Choose `Some` from list of options if possible
- */
   function choose_first(l : list(option('a))) : option('a) = switch(l)
     [] => None
     None::t    => choose_first(t)
     Some(x)::_ => Some(x)
+

priv/stdlib/Pair.aes

@@ -6,18 +6,12 @@ namespace Pair =
   function snd(t : ('a * 'b)) : 'b = switch(t)
     (_, y) => y
 
-/** Map over first
- */
   function map1(f : 'a => 'c, t : ('a * 'b)) : ('c * 'b) = switch(t)
     (x, y) => (f(x), y)
 
-/** Map over second
- */
   function map2(f : 'b => 'c, t : ('a * 'b)) : ('a * 'c) = switch(t)
     (x, y) => (x, f(y))
 
-/** Map over both
- */
   function bimap(f : 'a => 'c, g : 'b => 'd, t : ('a * 'b)) : ('c * 'd) = switch(t)
     (x, y) => (f(x), g(y))
 

priv/stdlib/Set.aes

@@ -1,51 +0,0 @@
-include "List.aes"
-include "Option.aes"
-include "Pair.aes"
-
-namespace Set =
-  record set('a) = { to_map : map('a, unit) }
-
-  function new() : set('a) =
-    { to_map = {} }
-
-  function member(e : 'a, s : set('a)) : bool =
-    Map.member(e, s.to_map)
-
-  function insert(e : 'a, s : set('a)) : set('a) =
-    { to_map = s.to_map{[e] = ()} }
-
-  function delete(e : 'a, s : set('a)) : set('a) =
-    { to_map = Map.delete(e, s.to_map) }
-
-  function size(s : set('a)) : int =
-    Map.size(s.to_map)
-
-  function to_list(s : set('a)) : list('a) =
-    List.map(Pair.fst, Map.to_list(s.to_map))
-
-  function from_list(l : list('a)) : set('a) =
-    { to_map = Map.from_list(List.map((x) => (x, ()), l)) }
-
-  function filter(p : 'a => bool, s : set('a)) : set('a) =
-    from_list(List.filter(p, to_list(s)))
-
-  function fold(f : ('a, 'b) => 'b, acc : 'b, s : set('a)) : 'b =
-    List.foldr(f, acc, to_list(s))
-
-  function subtract(s1 : set('a), s2 : set('a)) : set('a) =
-    filter((x) => !member(x, s2), s1)
-
-  function intersection(s1 : set('a), s2 : set('a)) : set('a) =
-    filter((x) => member(x, s2), s1)
-
-  function intersection_list(sets : list(set('a))) : set('a) =
-    List.foldr(
-      intersection,
-      Option.default(new(), List.first(sets)),
-      Option.default([], List.tail(sets)))
-
-  function union(s1 : set('a), s2 : set('a)) : set('a) =
-    from_list(to_list(s1) ++ to_list(s2))
-
-  function union_list(sets : list(set('a))) : set('a) =
-    List.foldr(union, new(), sets)

priv/stdlib/String.aes

@@ -1,117 +0,0 @@
-include "List.aes"
-namespace String =
-  // Computes the SHA3/Keccak hash of the string
-  function sha3(s : string) : hash    = StringInternal.sha3(s)
-  // Computes the SHA256 hash of the string.
-  function sha256(s : string) : hash  = StringInternal.sha256(s)
-  // Computes the Blake2B hash of the string.
-  function blake2b(s : string) : hash = StringInternal.blake2b(s)
-
-  // The length of a string - equivalent to List.lenght(to_list(s))
-  function length(s : string) : int = StringInternal.length(s)
-  // Concatenates `s1` and `s2`.
-  function concat(s1 : string, s2 : string) : string = StringInternal.concat(s1, s2)
-  // Concatenates a list of strings.
-  function
-    concats : (list(string)) => string
-    concats([])      = ""
-    concats(s :: ss) = List.foldl(StringInternal.concat, s, ss)
-
-  // Converts a `string` to a list of `char` - the code points are normalized, but
-  // composite characters are possibly converted to multiple `char`s.
-  function from_list(cs : list(char)) : string = StringInternal.from_list(cs)
-  // Converts a list of characters into a normalized UTF-8 string.
-  function to_list(s : string) : list(char) = StringInternal.to_list(s)
-
-  // Converts a string to lowercase.
-  function to_lower(s : string) = StringInternal.to_lower(s)
-  // Converts a string to uppercase.
-  function to_upper(s : string) = StringInternal.to_upper(s)
-
-  // Splits a string at (zero-based) index `ix`.
-  function split(i : int, s : string) : string * string =
-    let cs = StringInternal.to_list(s)
-    (StringInternal.from_list(List.take(i, cs)), StringInternal.from_list(List.drop(i, cs)))
-
-  // Returns the character/codepoint at (zero-based) index `ix`.
-  function at(ix : int, s : string) =
-    switch(List.drop(ix, StringInternal.to_list(s)))
-      []     => None
-      x :: _ => Some(x)
-
-  // Searches for `pat` in `str`, returning `Some(ix)` if `pat` is a substring
-  // of `str` starting at position `ix`, otherwise returns `None`.
-  function contains(str : string, substr : string) : option(int) =
-    if(substr == "") Some(0)
-    else
-      contains_(0, StringInternal.to_list(str), StringInternal.to_list(substr))
-
-  // Splits `s` into tokens, `pat` is the divider of tokens.
-  function tokens(s : string, pat : string) =
-    require(pat != "", "String.tokens: empty pattern")
-    tokens_(StringInternal.to_list(pat), StringInternal.to_list(s), [])
-
-  // Converts a decimal ("123", "-253") or a hexadecimal ("0xa2f", "-0xBBB") string
-  // into an integer. If the string doesn't contain a valid number `None` is returned.
-  function to_int(str : string) : option(int) =
-    let lst = StringInternal.to_list(str)
-    switch(is_prefix(['-'], lst))
-      None    => to_int_pos(lst)
-      Some(s) => switch(to_int_pos(s))
-                   None => None
-                   Some(x) => Some(-x)
-
-  // Private helper functions below
-  private function to_int_pos(chs : list(char)) =
-    switch(is_prefix(['0', 'x'], chs))
-      None =>
-        to_int_(chs, ch_to_int_10, 0, 10)
-      Some(str) =>
-        to_int_(str, ch_to_int_16, 0, 16)
-
-  private function
-    tokens_(_, [], acc) = [StringInternal.from_list(List.reverse(acc))]
-    tokens_(pat, str, acc) =
-      switch(is_prefix(pat, str))
-        Some(str') =>
-          StringInternal.from_list(List.reverse(acc)) :: tokens_(pat, str', [])
-        None =>
-          let c :: cs = str
-          tokens_(pat, cs, c :: acc)
-
-  private function
-    contains_(_, [], _) = None
-    contains_(ix, str, substr) =
-      switch(is_prefix(substr, str))
-        None =>
-          let _ :: tailstr = str
-          contains_(ix + 1, tailstr, substr)
-        Some(_) =>
-          Some(ix)
-
-  private function
-    is_prefix([], ys) = Some(ys)
-    is_prefix(_, [])  = None
-    is_prefix(x :: xs, y :: ys) =
-      if(x == y) is_prefix(xs, ys)
-      else       None
-
-  private function
-    to_int_([], _, x, _) = Some(x)
-    to_int_(i :: is, value, x, b) =
-      switch(value(i))
-        None => None
-        Some(n) => to_int_(is, value, x * b + n, b)
-
-  private function ch_to_int_10(ch) =
-    let c = Char.to_int(ch)
-    if(c >= 48 && c =< 57) Some(c - 48)
-    else None
-
-  private function ch_to_int_16(ch) =
-    let c = Char.to_int(ch)
-    if(c >= 48 && c =< 57)    Some(c - 48)
-    elif(c >= 65 && c =< 70)  Some(c - 55)
-    elif(c >= 97 && c =< 102) Some(c - 87)
-    else None
-

priv/stdlib/Triple.aes

@@ -10,23 +10,15 @@ namespace Triple =
     (_, _, z) => z
 
 
-/** Map over first
- */
   function map1(f : 'a => 'm, t : ('a * 'b * 'c)) : ('m * 'b * 'c) = switch(t)
     (x, y, z) => (f(x), y, z)
 
-/** Map over second
- */
   function map2(f : 'b => 'm, t : ('a * 'b * 'c)) : ('a * 'm * 'c) = switch(t)
     (x, y, z) => (x, f(y), z)
 
-/** Map over third
- */
   function map3(f : 'c => 'm, t : ('a * 'b * 'c)) : ('a * 'b * 'm) = switch(t)
     (x, y, z) => (x, y, f(z))
 
-/** Map over all elements
- */
   function trimap( f : 'a => 'x
                  , g : 'b => 'y
                  , h : 'c => 'z
@@ -37,13 +29,9 @@ namespace Triple =
   function swap(t : ('a * 'b * 'c)) : ('c * 'b * 'a) = switch(t)
     (x, y, z) => (z, y, x)
 
-/** Right rotation
- */
   function rotr(t : ('a * 'b * 'c)) : ('c * 'a * 'b) = switch(t)
     (x, y, z) => (z, x, y)
 
-/** Left rotation
- */
   function rotl(t : ('a * 'b * 'c)) : ('b * 'c * 'a) = switch(t)
     (x, y, z) => (y, z, x)
 

rebar.config

@@ -2,10 +2,11 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.2.0"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"a66dc0a"}}}
        , {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, [
@@ -14,7 +15,7 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {aesophia, "7.1.0"},
+{relx, [{release, {aesophia, "4.0.0-rc4"},
          [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,"2a0a397afad6b45da52572170f718194018bf33c"}},
+       {ref,"a66dc0a97facdeaad7e5403018ad195d989e4793"}},
   0},
  {<<"aeserialization">>,
   {git,"https://github.com/aeternity/aeserialization.git",
-       {ref,"eb68fe331bd476910394966b7f5ede7a74d37e35"}},
+       {ref,"47aaa8f5434b365c50a35bfd1490340b19241991"}},
   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,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
+       {ref,"26180f42c0b3a450905d2efd8bc7fd5fd9cece75"}},
   2},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
  {<<"jsx">>,
@@ -24,8 +24,5 @@
 [
 {pkg_hash,[
  {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>},
- {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]},
-{pkg_hash_ext,[
- {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>},
- {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]}
+ {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}
 ].

src/aeso_aci.erl

@@ -14,21 +14,15 @@
         , contract_interface/2
         , contract_interface/3
 
-        , from_typed_ast/2
-
         , render_aci_json/1
 
         , json_encode_expr/1
         , json_encode_type/1]).
 
--include("aeso_utils.hrl").
-
 -type aci_type()  :: json | string.
 -type json()      :: jsx:json_term().
 -type json_text() :: binary().
 
--export_type([aci_type/0]).
-
 %% External API
 -spec file(aci_type(), string()) -> {ok, json() | string()} | {error, term()}.
 file(Type, File) ->
@@ -70,20 +64,20 @@ do_contract_interface(Type, Contract, Options) when is_binary(Contract) ->
 do_contract_interface(Type, ContractString, Options) ->
     try
         Ast = aeso_compiler:parse(ContractString, Options),
-        {TypedAst, _, _} = aeso_ast_infer_types:infer(Ast, [dont_unfold | Options]),
-        from_typed_ast(Type, TypedAst)
+        %% io:format("~p\n", [Ast]),
+        TypedAst = aeso_ast_infer_types:infer(Ast, [dont_unfold]),
+        %% io:format("~p\n", [TypedAst]),
+        JArray = [ encode_contract(C) || C <- TypedAst ],
+
+        case Type of
+            json   -> {ok, JArray};
+            string -> do_render_aci_json(JArray)
+        end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-from_typed_ast(Type, TypedAst) ->
-    JArray = [ encode_contract(C) || C <- TypedAst ],
-    case Type of
-        json   -> {ok, JArray};
-        string -> do_render_aci_json(JArray)
-    end.
-
-encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HEAD(Head) ->
+encode_contract(Contract = {contract, _, {con, _, Name}, _}) ->
     C0 = #{name => encode_name(Name)},
 
     Tdefs0 = [ encode_typedef(T) || T <- sort_decls(contract_types(Contract)) ],
@@ -91,7 +85,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;
@@ -107,11 +101,11 @@ encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HE
                || F <- sort_decls(contract_funcs(Contract)),
                   is_entrypoint(F) ],
 
-    #{contract => C3#{kind => Head, functions => Fdefs, payable => is_payable(Contract)}};
+    #{contract => C3#{functions => Fdefs, payable => is_payable(Contract)}};
 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.
@@ -135,7 +129,7 @@ encode_anon_args(Types) ->
 
 encode_args(Args) -> [ encode_arg(A) || A <- Args ].
 
-encode_arg({typed, _, Id, T}) ->
+encode_arg({arg, _, Id, T}) ->
     #{name => encode_type(Id),
       type => encode_type(T)}.
 
@@ -200,8 +194,6 @@ encode_expr({bytes, _, B})  ->
 encode_expr({Lit, _, L}) when Lit == oracle_pubkey; Lit == oracle_query_id;
                               Lit == contract_pubkey; Lit == account_pubkey ->
     aeser_api_encoder:encode(Lit, L);
-encode_expr({app, _, {'-', _}, [{int, _, N}]}) ->
-  encode_expr({int, [], -N});
 encode_expr({app, _, F, As}) ->
     Ef = encode_expr(F),
     Eas = encode_exprs(As),
@@ -232,21 +224,15 @@ do_render_aci_json(Json) ->
     {ok, list_to_binary(string:join(DecodedContracts, "\n"))}.
 
 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) ] ++
          [ MkTDef(<<"event">>, maps:get(event, C)) || maps:is_key(event, C) ] ++ Ts0,
-    [payable(Payable), case Kind of
-                           contract_main -> "main contract ";
-                           contract_child -> "contract ";
-                           contract_interface -> "contract interface "
-                       end,
-     io_lib:format("~s", [Name])," =\n",
+    [payable(Payable), "contract ", 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(_) -> [].
@@ -254,8 +240,8 @@ decode_contract(_) -> [].
 decode_funcs(Fs) -> [ decode_func(F) || F <- Fs ].
 
 %% decode_func(#{name := init}) -> [];
-decode_func(#{name := Name, stateful:= Stateful, payable := Payable, arguments := As, returns := T}) ->
-    ["  ", payable(Payable), stateful(Stateful), "entrypoint ", io_lib:format("~s", [Name]), " : ",
+decode_func(#{name := Name, payable := Payable, arguments := As, returns := T}) ->
+    ["  ", payable(Payable), "entrypoint ", io_lib:format("~s", [Name]), " : ",
      decode_args(As), " => ", decode_type(T), $\n].
 
 decode_args(As) ->
@@ -336,17 +322,12 @@ decode_tvar(#{name := N}) -> io_lib:format("~s", [N]).
 payable(true)  -> "payable ";
 payable(false) -> "".
 
-stateful(true)  -> "stateful ";
-stateful(false) -> "".
-
 %% #contract{Ann, Con, [Declarations]}.
 
-contract_funcs({C, _, _, _, Decls}) when ?IS_CONTRACT_HEAD(C) ->
+contract_funcs({C, _, _, Decls}) when C == contract; C == namespace ->
     [ D || D <- Decls, is_fun(D)].
 
-contract_types({namespace, _, _, Decls}) ->
-    [ D || D <- Decls, is_type(D) ];
-contract_types({C, _, _, _, Decls}) when ?IS_CONTRACT_HEAD(C) ->
+contract_types({C, _, _, Decls}) when C == contract; C == namespace ->
     [ D || D <- Decls, is_type(D) ].
 
 is_fun({letfun, _, _, _, _, _}) -> true;

src/aeso_builtins.erl

@@ -0,0 +1,684 @@
+%%%-------------------------------------------------------------------
+%%% @copyright (C) 2018, Aeternity Anstalt
+%%% @doc
+%%%     Compiler builtin functions for Aeterinty Sophia language.
+%%% @end
+%%% Created : 20 Dec 2018
+%%%
+%%%-------------------------------------------------------------------
+
+-module(aeso_builtins).
+
+-export([ builtin_function/1
+        , bytes_to_raw_string/2
+        , check_event_type/1
+        , used_builtins/1 ]).
+
+-import(aeso_ast_to_icode, [prim_call/5]).
+
+-include_lib("aebytecode/include/aeb_opcodes.hrl").
+-include("aeso_icode.hrl").
+
+used_builtins(#funcall{ function = #var_ref{ name = {builtin, Builtin} }, args = Args }) ->
+    lists:umerge(dep_closure([Builtin]), used_builtins(Args));
+used_builtins([H|T]) ->
+  lists:umerge(used_builtins(H), used_builtins(T));
+used_builtins(T) when is_tuple(T) ->
+  used_builtins(tuple_to_list(T));
+used_builtins(M) when is_map(M) ->
+  used_builtins(maps:to_list(M));
+used_builtins(_) -> [].
+
+builtin_deps(Builtin) ->
+    lists:usort(builtin_deps1(Builtin)).
+
+builtin_deps1({map_lookup_default, Type}) -> [{map_lookup, Type}];
+builtin_deps1({map_get, Type})            -> [{map_lookup, Type}];
+builtin_deps1(map_member)                 -> [{map_lookup, word}];
+builtin_deps1({map_upd, Type})            -> [{map_get, Type}, map_put];
+builtin_deps1({map_upd_default, Type})    -> [{map_lookup_default, Type}, map_put];
+builtin_deps1(map_from_list)              -> [map_put];
+builtin_deps1(str_equal)                  -> [str_equal_p];
+builtin_deps1(string_concat)              -> [string_concat_inner1, string_copy, string_shift_copy];
+builtin_deps1(int_to_str)                 -> [{baseX_int, 10}];
+builtin_deps1(addr_to_str)                -> [{baseX_int, 58}];
+builtin_deps1({baseX_int, X})             -> [{baseX_int_pad, X}];
+builtin_deps1({baseX_int_pad, X})         -> [{baseX_int_encode, X}];
+builtin_deps1({baseX_int_encode, X})      -> [{baseX_int_encode_, X}, {baseX_tab, X}, {baseX_digits, X}];
+builtin_deps1({bytes_to_str, _})          -> [bytes_to_str_worker, bytes_to_str_worker_x];
+builtin_deps1(string_reverse)             -> [string_reverse_];
+builtin_deps1(require)                    -> [abort];
+builtin_deps1(_)                          -> [].
+
+dep_closure(Deps) ->
+    case lists:umerge(lists:map(fun builtin_deps/1, Deps)) of
+        []    -> Deps;
+        Deps1 -> lists:umerge(Deps, dep_closure(Deps1))
+    end.
+
+%% Helper functions/macros
+v(X) when is_atom(X) -> v(atom_to_list(X));
+v(X) when is_list(X) -> #var_ref{name = X}.
+
+option_none()  -> {tuple, [{integer, 0}]}.
+option_some(X) -> {tuple, [{integer, 1}, X]}.
+
+-define(HASH_BYTES, 32).
+
+-define(call(Fun, Args), #funcall{ function = #var_ref{ name = {builtin, Fun} }, args = Args }).
+-define(I(X), {integer, X}).
+-define(V(X), v(X)).
+-define(A(Op), aeb_opcodes:mnemonic(Op)).
+-define(LET(Var, Expr, Body), {switch, Expr, [{v(Var), Body}]}).
+-define(DEREF(Var, Ptr, Body), {switch, operand(Ptr), [{{tuple, [v(Var)]}, Body}]}).
+-define(NXT(Ptr), op('+', Ptr, 32)).
+-define(NEG(A), op('/', A, {unop, '-', {integer, 1}})).
+-define(BYTE(Ix, Word), op('byte', Ix, Word)).
+
+-define(EQ(A, B), op('==', A, B)).
+-define(LT(A, B), op('<', A, B)).
+-define(GT(A, B), op('>', A, B)).
+-define(ADD(A, B), op('+', A, B)).
+-define(SUB(A, B), op('-', A, B)).
+-define(MUL(A, B), op('*', A, B)).
+-define(DIV(A, B), op('div', A, B)).
+-define(MOD(A, B), op('mod', A, B)).
+-define(EXP(A, B), op('^', A, B)).
+-define(AND(A, B), op('&&', A, B)).
+
+%% Bit shift operations takes their arguments backwards!?
+-define(BSL(X, B), op('bsl', ?MUL(B, 8), X)).
+-define(BSR(X, B), op('bsr', ?MUL(B, 8), X)).
+
+op(Op, A, B) -> simpl({binop, Op, operand(A), operand(B)}).
+
+%% We generate a lot of B * 8 for integer B from BSL and BSR.
+simpl({binop, '*', {integer, A}, {integer, B}}) when A >= 0, B >= 0, A * B < 1 bsl 256 ->
+    {integer, A * B};
+simpl(Op) -> Op.
+
+
+operand(A) when is_atom(A) -> v(A);
+operand(I) when is_integer(I) -> {integer, I};
+operand(T) -> T.
+
+check_event_type(Icode) ->
+    case maps:get(event_type, Icode) of
+        {variant_t, Cons} ->
+            check_event_type(Cons, Icode);
+        _ ->
+            error({event_should_be_variant_type})
+    end.
+
+check_event_type(Evts, Icode) ->
+    [ check_event_type(Name, Ix, T, Icode)
+      || {constr_t, Ann, {con, _, Name}, Types} <- Evts,
+         {Ix, T} <- lists:zip(aeso_syntax:get_ann(indices, Ann), Types) ].
+
+check_event_type(EvtName, Ix, Type, Icode) ->
+    VMType =
+        try
+           aeso_ast_to_icode:ast_typerep(Type, Icode)
+        catch _:_ ->
+            error({EvtName, could_not_resolve_type, Type})
+        end,
+    case {Ix, VMType, Type} of
+        {indexed, word, _}      -> ok;
+        {notindexed, string, _} -> ok;
+        {notindexed, _, {bytes_t, _, N}} when N > 32 -> ok;
+        {indexed, _, _}         -> error({EvtName, indexed_field_should_be_word, is, VMType});
+        {notindexed, _, _}      -> error({EvtName, payload_should_be_string, is, VMType})
+    end.
+
+bfun(B, {IArgs, IExpr, IRet}) ->
+    {{builtin, B}, [private], IArgs, IExpr, IRet}.
+
+builtin_function(BF) ->
+    case BF of
+        {event, EventT}            -> bfun(BF, builtin_event(EventT));
+        abort                      -> bfun(BF, builtin_abort());
+        block_hash                 -> bfun(BF, builtin_block_hash());
+        require                    -> bfun(BF, builtin_require());
+        {map_lookup, Type}         -> bfun(BF, builtin_map_lookup(Type));
+        map_put                    -> bfun(BF, builtin_map_put());
+        map_delete                 -> bfun(BF, builtin_map_delete());
+        map_size                   -> bfun(BF, builtin_map_size());
+        {map_get, Type}            -> bfun(BF, builtin_map_get(Type));
+        {map_lookup_default, Type} -> bfun(BF, builtin_map_lookup_default(Type));
+        map_member                 -> bfun(BF, builtin_map_member());
+        {map_upd, Type}            -> bfun(BF, builtin_map_upd(Type));
+        {map_upd_default, Type}    -> bfun(BF, builtin_map_upd_default(Type));
+        map_from_list              -> bfun(BF, builtin_map_from_list());
+        list_concat                -> bfun(BF, builtin_list_concat());
+        string_length              -> bfun(BF, builtin_string_length());
+        string_concat              -> bfun(BF, builtin_string_concat());
+        string_concat_inner1       -> bfun(BF, builtin_string_concat_inner1());
+        string_copy                -> bfun(BF, builtin_string_copy());
+        string_shift_copy          -> bfun(BF, builtin_string_shift_copy());
+        str_equal_p                -> bfun(BF, builtin_str_equal_p());
+        str_equal                  -> bfun(BF, builtin_str_equal());
+        popcount                   -> bfun(BF, builtin_popcount());
+        int_to_str                 -> bfun(BF, builtin_int_to_str());
+        addr_to_str                -> bfun(BF, builtin_addr_to_str());
+        {baseX_int, X}             -> bfun(BF, builtin_baseX_int(X));
+        {baseX_digits, X}          -> bfun(BF, builtin_baseX_digits(X));
+        {baseX_tab, X}             -> bfun(BF, builtin_baseX_tab(X));
+        {baseX_int_pad, X}         -> bfun(BF, builtin_baseX_int_pad(X));
+        {baseX_int_encode, X}      -> bfun(BF, builtin_baseX_int_encode(X));
+        {baseX_int_encode_, X}     -> bfun(BF, builtin_baseX_int_encode_(X));
+        {bytes_to_int, N}          -> bfun(BF, builtin_bytes_to_int(N));
+        {bytes_to_str, N}          -> bfun(BF, builtin_bytes_to_str(N));
+        {bytes_concat, A, B}       -> bfun(BF, builtin_bytes_concat(A, B));
+        {bytes_split, A, B}        -> bfun(BF, builtin_bytes_split(A, B));
+        bytes_to_str_worker        -> bfun(BF, builtin_bytes_to_str_worker());
+        bytes_to_str_worker_x      -> bfun(BF, builtin_bytes_to_str_worker_x());
+        string_reverse             -> bfun(BF, builtin_string_reverse());
+        string_reverse_            -> bfun(BF, builtin_string_reverse_())
+    end.
+
+%% Event primitive (dependent on Event type)
+%%
+%% We need to switch on the event and prepare the correct #event for icode_to_asm
+%% NOTE: we assume all errors are already checked!
+builtin_event(EventT) ->
+    A         = fun(X) -> aeb_opcodes:mnemonic(X) end,
+    VIx       = fun(Ix) -> v(lists:concat(["v", Ix])) end,
+    ArgPats   = fun(Ts) -> [ VIx(Ix) || Ix <- lists:seq(0, length(Ts) - 1) ] end,
+    Payload = %% Should put data ptr, length on stack.
+        fun([])            -> {inline_asm, [A(?PUSH1), 0, A(?PUSH1), 0]};
+           ([{{id, _, "string"}, V}]) ->
+                {seq, [V, {inline_asm, [A(?DUP1), A(?MLOAD),  %% length, ptr
+                       A(?SWAP1), A(?PUSH1), 32, A(?ADD)]}]}; %% ptr+32, length
+           ([{{bytes_t, _, N}, V}]) -> {seq, [V, {integer, N}, {inline_asm, A(?SWAP1)}]}
+        end,
+    Ix =
+        fun({bytes_t, _, N}, V) when N < 32 -> ?BSR(V, 32 - N);
+           (_, V) -> V end,
+    Clause =
+        fun(_Tag, {con, _, Con}, IxTypes) ->
+            Types     = [ T || {_Ix, T} <- IxTypes ],
+            Indexed   = [ Ix(Type, Var) || {Var, {indexed, Type}} <- lists:zip(ArgPats(Types), IxTypes) ],
+            Data      = [ {Type, Var} || {Var, {notindexed, Type}} <- lists:zip(ArgPats(Types), IxTypes) ],
+            {ok, <<EvtIndexN:256>>} = eblake2:blake2b(?HASH_BYTES, list_to_binary(Con)),
+            EvtIndex  = {integer, EvtIndexN},
+            {event, lists:reverse(Indexed) ++ [EvtIndex], Payload(Data)}
+        end,
+    Pat = fun(Tag, Types) -> {tuple, [{integer, Tag} | ArgPats(Types)]} end,
+
+    {variant_t, Cons} = EventT,
+    Tags              = lists:seq(0, length(Cons) - 1),
+
+    {[{"e", event}],
+     {switch, v(e),
+         [{Pat(Tag, Types), Clause(Tag, Con, lists:zip(aeso_syntax:get_ann(indices, Ann), Types))}
+          || {Tag, {constr_t, Ann, Con, Types}} <- lists:zip(Tags, Cons) ]},
+     {tuple, []}}.
+
+%% Abort primitive.
+builtin_abort() ->
+    A = fun(X) -> aeb_opcodes:mnemonic(X) end,
+    {[{"s", string}],
+     {inline_asm, [A(?PUSH1),0,  %% Push a dummy 0 for the first arg
+                   A(?REVERT)]}, %% Stack: 0,Ptr
+     {tuple,[]}}.
+
+builtin_block_hash() ->
+    {[{"height", word}],
+     ?LET(hash, #prim_block_hash{ height = ?V(height)},
+          {ifte, ?EQ(hash, 0), option_none(), option_some(?V(hash))}),
+     aeso_icode:option_typerep(word)}.
+
+builtin_require() ->
+    {[{"c", word}, {"msg", string}],
+     {ifte, ?V(c), {tuple, []}, ?call(abort, [?V(msg)])},
+     {tuple, []}}.
+
+%% Map primitives
+builtin_map_lookup(Type) ->
+    Ret = aeso_icode:option_typerep(Type),
+    {[{"m", word}, {"k", word}],
+     prim_call(?PRIM_CALL_MAP_GET, #integer{value = 0},
+               [#var_ref{name = "m"}, #var_ref{name = "k"}],
+               [word, word], Ret),
+     Ret}.
+
+builtin_map_put() ->
+    %% We don't need the types for put.
+    {[{"m", word}, {"k", word}, {"v", word}],
+     prim_call(?PRIM_CALL_MAP_PUT, #integer{value = 0},
+               [v(m), v(k), v(v)], [word, word, word], word),
+     word}.
+
+builtin_map_delete() ->
+    {[{"m", word}, {"k", word}],
+     prim_call(?PRIM_CALL_MAP_DELETE, #integer{value = 0},
+               [v(m), v(k)], [word, word], word),
+     word}.
+
+builtin_map_size() ->
+    {[{"m", word}],
+     prim_call(?PRIM_CALL_MAP_SIZE, #integer{value = 0},
+               [v(m)], [word], word),
+     word}.
+
+%% Map builtins
+builtin_map_get(Type) ->
+    %% function map_get(m, k) =
+    %%   switch(map_lookup(m, k))
+    %%     Some(v) => v
+    {[{"m", word}, {"k", word}],
+     {switch, ?call({map_lookup, Type}, [v(m), v(k)]), [{option_some(v(v)), v(v)}]},
+     Type}.
+
+builtin_map_lookup_default(Type) ->
+    %% function map_lookup_default(m, k, default) =
+    %%   switch(map_lookup(m, k))
+    %%     None    => default
+    %%     Some(v) => v
+    {[{"m", word}, {"k", word}, {"default", Type}],
+     {switch, ?call({map_lookup, Type}, [v(m), v(k)]),
+         [{option_none(),     v(default)},
+          {option_some(v(v)), v(v)}]},
+     Type}.
+
+builtin_map_member() ->
+    %% function map_member(m, k) : bool =
+    %%   switch(Map.lookup(m, k))
+    %%     None => false
+    %%     _    => true
+    {[{"m", word}, {"k", word}],
+     {switch, ?call({map_lookup, word}, [v(m), v(k)]),
+         [{option_none(), {integer, 0}},
+          {{var_ref, "_"}, {integer, 1}}]},
+     word}.
+
+builtin_map_upd(Type) ->
+    %% function map_upd(map, key, fun) =
+    %%   map_put(map, key, fun(map_get(map, key)))
+    {[{"map", word}, {"key", word}, {"valfun", word}],
+     ?call(map_put,
+        [v(map), v(key),
+         #funcall{ function = v(valfun),
+                   args     = [?call({map_get, Type}, [v(map), v(key)])] }]),
+     word}.
+
+builtin_map_upd_default(Type) ->
+    %% function map_upd(map, key, val, fun) =
+    %%   map_put(map, key, fun(map_lookup_default(map, key, val)))
+    {[{"map", word}, {"key", word}, {"val", word}, {"valfun", word}],
+     ?call(map_put,
+        [v(map), v(key),
+         #funcall{ function = v(valfun),
+                   args     = [?call({map_lookup_default, Type}, [v(map), v(key), v(val)])] }]),
+     word}.
+
+builtin_map_from_list() ->
+    %% function map_from_list(xs, acc) =
+    %%   switch(xs)
+    %%     [] => acc
+    %%     (k, v) :: xs => map_from_list(xs, acc { [k] = v })
+    {[{"xs", {list, {tuple, [word, word]}}}, {"acc", word}],
+     {switch, v(xs),
+        [{{list, []}, v(acc)},
+         {{binop, '::', {tuple, [v(k), v(v)]}, v(ys)},
+          ?call(map_from_list,
+            [v(ys), ?call(map_put, [v(acc), v(k), v(v)])])}]},
+     word}.
+
+%% list_concat
+%%
+%% Concatenates two lists.
+builtin_list_concat() ->
+    {[{"l1", {list, word}}, {"l2", {list, word}}],
+     {switch, v(l1),
+        [{{list, []}, v(l2)},
+         {{binop, '::', v(hd), v(tl)},
+          {binop, '::', v(hd), ?call(list_concat, [v(tl), v(l2)])}}
+        ]
+     },
+     word}.
+
+builtin_string_length() ->
+    %% function length(str) =
+    %%   switch(str)
+    %%      {n} -> n  // (ab)use the representation
+    {[{"s", string}],
+     ?DEREF(n, s, ?V(n)),
+     word}.
+
+%% str_concat - concatenate two strings
+%%
+%% Unless the second string is the empty string, a new string is created at the
+%% top of the Heap and the address to it is returned. The tricky bit is when
+%% the words from the second string has to be shifted to fit next to the first
+%% string.
+builtin_string_concat() ->
+    {[{"s1", string}, {"s2", string}],
+     ?DEREF(n1, s1,
+     ?DEREF(n2, s2,
+        {ifte, ?EQ(n1, 0),
+            ?V(s2), %% First string is empty return second string
+            {ifte, ?EQ(n2, 0),
+                ?V(s1), %% Second string is empty return first string
+                ?LET(ret, {inline_asm, [?A(?MSIZE)]},
+                    {seq, [?ADD(n1, n2), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]}, %% Store total len
+                           ?call(string_concat_inner1, [?V(n1), ?NXT(s1), ?V(n2), ?NXT(s2)]),
+                           {inline_asm, [?A(?POP)]}, %% Discard fun ret val
+                           ?V(ret)                   %% Put the actual return value
+                          ]})}
+        }
+     )),
+     word}.
+
+builtin_string_concat_inner1() ->
+    %% Copy all whole words from the first string, and set up for word fusion
+    %% Special case when the length of the first string is divisible by 32.
+    {[{"n1", word}, {"p1", pointer}, {"n2", word}, {"p2", pointer}],
+     ?LET(w1, ?call(string_copy, [?V(n1), ?V(p1)]),
+        ?LET(nx, ?MOD(n1, 32),
+        {ifte, ?EQ(nx, 0),
+            ?LET(w2, ?call(string_copy, [?V(n2), ?V(p2)]),
+                {seq, [?V(w2), {inline_asm, [?A(?MSIZE), ?A(?MSTORE), ?A(?MSIZE)]}]}),
+            ?call(string_shift_copy, [?V(nx), ?V(w1), ?V(n2), ?V(p2)])
+        })),
+     word}.
+
+builtin_string_copy() ->
+    {[{"n", word}, {"p", pointer}],
+     ?DEREF(w, p,
+        {ifte, ?GT(n, 31),
+            {seq, [?V(w), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+                   ?call(string_copy, [?SUB(n, 32), ?NXT(p)])]},
+            ?V(w)
+        }),
+     word}.
+
+builtin_string_shift_copy() ->
+    {[{"off", word}, {"dst", word}, {"n", word}, {"p", pointer}],
+     ?DEREF(w, p,
+        {seq, [?ADD(dst, ?BSR(w, off)), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+               {ifte, ?GT(n, ?SUB(32, off)),
+                    ?call(string_shift_copy, [?V(off), ?BSL(w, ?SUB(32, off)), ?SUB(n, 32), ?NXT(p)]),
+                    {inline_asm, [?A(?MSIZE)]}}]
+        }),
+     word}.
+
+builtin_str_equal_p() ->
+    %% function str_equal_p(n, p1, p2) =
+    %%   if(n =< 0) true
+    %%   else
+    %%      let w1 = *p1
+    %%      let w2 = *p2
+    %%      w1 == w2 && str_equal_p(n - 32, p1 + 32, p2 + 32)
+    {[{"n", word}, {"p1", pointer}, {"p2", pointer}],
+     {ifte, ?LT(n, 1),
+         ?I(1),
+         ?DEREF(w1, p1,
+         ?DEREF(w2, p2,
+             ?AND(?EQ(w1, w2),
+                  ?call(str_equal_p, [?SUB(n, 32), ?NXT(p1), ?NXT(p2)]))))},
+     word}.
+
+builtin_str_equal() ->
+    %% function str_equal(s1, s2) =
+    %%   let n1 = length(s1)
+    %%   let n2 = length(s2)
+    %%   n1 == n2 && str_equal_p(n1, s1 + 32, s2 + 32)
+    {[{"s1", string}, {"s2", string}],
+     ?DEREF(n1, s1,
+     ?DEREF(n2, s2,
+         ?AND(?EQ(n1, n2), ?call(str_equal_p, [?V(n1), ?NXT(s1), ?NXT(s2)]))
+     )),
+     word}.
+
+%% Count the number of 1s in a bit field.
+builtin_popcount() ->
+    %% function popcount(bits, acc) =
+    %%   if (bits == 0) acc
+    %%   else popcount(bits bsr 1, acc + bits band 1)
+    {[{"bits", word}, {"acc", word}],
+     {ifte, ?EQ(bits, 0),
+        ?V(acc),
+        ?call(popcount, [op('bsr', 1, bits), ?ADD(acc, op('band', bits, 1))])
+     }, word}.
+
+builtin_int_to_str() ->
+    {[{"i", word}], ?call({baseX_int, 10}, [?V(i)]), word}.
+
+builtin_baseX_tab(_X = 10) ->
+    {[{"ix", word}], ?ADD($0, ix), word};
+builtin_baseX_tab(_X = 58) ->
+    <<Fst32:256>> = <<"123456789ABCDEFGHJKLMNPQRSTUVWXY">>,
+    <<Lst26:256>> = <<"Zabcdefghijkmnopqrstuvwxyz", 0:48>>,
+    {[{"ix", word}],
+     {ifte, ?LT(ix, 32),
+         ?BYTE(ix, Fst32),
+         ?BYTE(?SUB(ix, 32), Lst26)
+     },
+     word}.
+
+builtin_baseX_int(X) ->
+    {[{"w", word}],
+     ?LET(ret, {inline_asm, [?A(?MSIZE)]},
+        {seq, [?call({baseX_int_pad, X}, [?V(w), ?I(0), ?I(0)]), {inline_asm, [?A(?POP)]}, ?V(ret)]}),
+     word}.
+
+builtin_baseX_int_pad(X = 10) ->
+    {[{"src", word}, {"ix", word}, {"dst", word}],
+     {ifte, ?LT(src, 0),
+        ?call({baseX_int_encode, X}, [?NEG(src), ?I(1), ?BSL($-, 31)]),
+        ?call({baseX_int_encode, X}, [?V(src), ?V(ix), ?V(dst)])},
+     word};
+builtin_baseX_int_pad(X = 16) ->
+    {[{"src", word}, {"ix", word}, {"dst", word}],
+        ?call({baseX_int_encode, X}, [?V(src), ?V(ix), ?V(dst)]),
+     word};
+builtin_baseX_int_pad(X = 58) ->
+    {[{"src", word}, {"ix", word}, {"dst", word}],
+     {ifte, ?GT(?ADD(?DIV(ix, 31), ?BYTE(ix, src)), 0),
+         ?call({baseX_int_encode, X}, [?V(src), ?V(ix), ?V(dst)]),
+         ?call({baseX_int_pad, X}, [?V(src), ?ADD(ix, 1), ?ADD(dst, ?BSL($1, ?SUB(31, ix)))])},
+     word}.
+
+builtin_baseX_int_encode(X) ->
+    {[{"src", word}, {"ix", word}, {"dst", word}],
+     ?LET(n, ?call({baseX_digits, X}, [?V(src), ?I(0)]),
+        {seq, [?ADD(n, ?ADD(ix, 1)), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+               ?call({baseX_int_encode_, X}, [?V(src), ?V(dst), ?EXP(X, n), ?V(ix)])]}),
+     word}.
+
+builtin_baseX_int_encode_(X) ->
+    {[{"src", word}, {"dst", word}, {"fac", word}, {"ix", word}],
+     {ifte, ?EQ(fac, 0),
+         {seq, [?V(dst), {inline_asm, [?A(?MSIZE), ?A(?MSTORE), ?A(?MSIZE)]}]},
+         {ifte, ?EQ(ix, 32),
+              %% We've filled a word, write it and start on new word
+              {seq, [?V(dst), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+                     ?call({baseX_int_encode_, X}, [?V(src), ?I(0), ?V(fac), ?I(0)])]},
+              ?call({baseX_int_encode_, X},
+                    [?MOD(src, fac), ?ADD(dst, ?BSL(?call({baseX_tab, X}, [?DIV(src, fac)]), ?SUB(31, ix))),
+                     ?DIV(fac, X), ?ADD(ix, 1)])}
+     },
+     word}.
+
+builtin_baseX_digits(X) ->
+    {[{"x0", word}, {"dgts", word}],
+     ?LET(x1, ?DIV(x0, X),
+        {ifte, ?EQ(x1, 0), ?V(dgts), ?call({baseX_digits, X}, [?V(x1), ?ADD(dgts, 1)])}),
+     word}.
+
+builtin_bytes_to_int(32) ->
+    {[{"w", word}], ?V(w), word};
+builtin_bytes_to_int(N) when N < 32 ->
+    {[{"w", word}], ?BSR(w, 32 - N), word};
+builtin_bytes_to_int(N) when N > 32 ->
+    LastFullWord = N div 32 - 1,
+    Body = case N rem 32 of
+                0 -> ?DEREF(n, ?ADD(b, LastFullWord * 32), ?V(n));
+                R ->
+                    ?DEREF(hi, ?ADD(b, LastFullWord * 32),
+                    ?DEREF(lo, ?ADD(b, (LastFullWord + 1) * 32),
+                    ?ADD(?BSR(lo, 32 - R), ?BSL(hi, R))))
+           end,
+    {[{"b", pointer}], Body, word}.
+
+%% Two versions of this helper function, worker for sections not even 16 bytes long
+%% and worker_x for the full sized chunks.
+builtin_bytes_to_str_worker_x() ->
+    <<Tab:256>> = <<"0123456789ABCDEF________________">>,
+    {[{"w", word}, {"offs", word}, {"acc", word}],
+     {ifte, ?EQ(offs, 16), {seq, [?V(acc), {inline_asm, [?A(?MSIZE), ?A(?MSTORE), ?A(?MSIZE)]}]},
+         ?LET(b,  ?BYTE(offs, w),
+         ?LET(lo, ?BYTE(?MOD(b, 16), Tab),
+         ?LET(hi, ?BYTE(op('bsr', 4 , b), Tab),
+         ?call(bytes_to_str_worker_x, [?V(w), ?ADD(offs, 1), ?ADD(?BSL(acc, 2), ?ADD(?BSL(hi, 1), lo))]))))
+     },
+     word}.
+
+builtin_bytes_to_str_worker() ->
+    <<Tab:256>> = <<"0123456789ABCDEF________________">>,
+    {[{"w", word}, {"offs", word}, {"acc", word}, {"stop", word}],
+     {ifte, ?EQ(stop, offs), {seq, [?BSL(acc, ?MUL(2, ?SUB(16, offs))), {inline_asm, [?A(?MSIZE), ?A(?MSTORE), ?A(?MSIZE)]}]},
+         ?LET(b,  ?BYTE(offs, w),
+         ?LET(lo, ?BYTE(?MOD(b, 16), Tab),
+         ?LET(hi, ?BYTE(op('bsr', 4 , b), Tab),
+         ?call(bytes_to_str_worker, [?V(w), ?ADD(offs, 1), ?ADD(?BSL(acc, 2), ?ADD(?BSL(hi, 1), lo)), ?V(stop)]))))
+     },
+     word}.
+
+builtin_bytes_to_str_body(Var, N) when N < 16 ->
+    [?call(bytes_to_str_worker, [?V(Var), ?I(0), ?I(0), ?I(N)])];
+builtin_bytes_to_str_body(Var, 16) ->
+    [?call(bytes_to_str_worker_x, [?V(Var), ?I(0), ?I(0)])];
+builtin_bytes_to_str_body(Var, N) when N < 32 ->
+    builtin_bytes_to_str_body(Var, 16) ++ [{inline_asm, [?A(?POP)]}] ++
+    [?call(bytes_to_str_worker, [?BSL(Var, 16), ?I(0), ?I(0), ?I(N - 16)])];
+builtin_bytes_to_str_body(Var, 32) ->
+    builtin_bytes_to_str_body(Var, 16) ++ [{inline_asm, [?A(?POP)]}] ++
+    [?call(bytes_to_str_worker_x, [?BSL(Var, 16), ?I(0), ?I(0)])];
+builtin_bytes_to_str_body(Var, N) when N > 32 ->
+    WholeWords = ((N + 31) div 32) - 1,
+    lists:append(
+    [ [?DEREF(w, ?ADD(Var, 32 * I), {seq, builtin_bytes_to_str_body(w, 32)}), {inline_asm, [?A(?POP)]}]
+      || I <- lists:seq(0, WholeWords - 1) ]) ++
+    [ ?DEREF(w, ?ADD(Var, 32 * WholeWords), {seq, builtin_bytes_to_str_body(w, N - WholeWords * 32)}) ].
+
+builtin_bytes_to_str(N) when N =< 32 ->
+    {[{"w", word}],
+     ?LET(ret, {inline_asm, [?A(?MSIZE)]},
+     {seq, [?I(N * 2), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]}] ++
+            builtin_bytes_to_str_body(w, N) ++
+            [{inline_asm, [?A(?POP)]}, ?V(ret)]}),
+     string};
+builtin_bytes_to_str(N) when N > 32 ->
+    {[{"p", pointer}],
+     ?LET(ret, {inline_asm, [?A(?MSIZE)]},
+     {seq, [?I(N * 2), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]}] ++
+            builtin_bytes_to_str_body(p, N) ++
+            [{inline_asm, [?A(?POP)]}, ?V(ret)]}),
+     string}.
+
+builtin_string_reverse() ->
+    {[{"s", string}],
+     ?DEREF(n, s,
+     ?LET(ret, {inline_asm, [?A(?MSIZE)]},
+         {seq, [?V(n), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+                ?call(string_reverse_, [?NXT(s), ?I(0), ?I(31), ?SUB(?V(n), 1)]),
+                {inline_asm, [?A(?POP)]}, ?V(ret)]})),
+     word}.
+
+builtin_string_reverse_() ->
+    {[{"p", pointer}, {"x", word}, {"i1", word}, {"i2", word}],
+     {ifte, ?LT(i2, 0),
+         {seq, [?V(x), {inline_asm, [?A(?MSIZE), ?A(?MSTORE), ?A(?MSIZE)]}]},
+         ?LET(p1, ?ADD(p, ?MUL(?DIV(i2, 32), 32)),
+         ?DEREF(w, p1,
+         ?LET(b, ?BYTE(?MOD(i2, 32), w),
+         {ifte, ?LT(i1, 0),
+             {seq, [?V(x), {inline_asm, [?A(?MSIZE), ?A(?MSTORE)]},
+                    ?call(string_reverse_,
+                          [?V(p), ?BSL(b, 31), ?I(30), ?SUB(i2, 1)])]},
+             ?call(string_reverse_,
+                   [?V(p), ?ADD(x, ?BSL(b, i1)), ?SUB(i1, 1), ?SUB(i2, 1)])})))},
+     word}.
+
+builtin_addr_to_str() ->
+    {[{"a", word}], ?call({baseX_int, 58}, [?V(a)]), word}.
+
+%% At most one word
+%% | ..... | ========= | ........ |
+%%    Offs ^ ^- Len -^   TotalLen ^
+bytes_slice(Offs, Len, TotalLen, Bytes) when TotalLen =< 32 ->
+    %% Bytes are packed into a single word
+    Masked =
+        case Offs of
+            0 -> Bytes;
+            _ -> ?MOD(Bytes, 1 bsl ((32 - Offs) * 8))
+        end,
+    Unpadded =
+        case 32 - (Offs + Len) of
+            0 -> Masked;
+            N -> ?BSR(Masked, N)
+        end,
+    case Len of
+        32 -> Unpadded;
+        _  -> ?BSL(Unpadded, 32 - Len)
+    end;
+bytes_slice(Offs, Len, TotalLen, Bytes) when TotalLen > 32 ->
+    %% Bytes is a pointer to memory. The VM can read at non-aligned addresses.
+    %% Might read one word more than necessary.
+    Word = op('!', Offs, Bytes),
+    case Len == 32 of
+        true -> Word;
+        _    -> ?BSL(?BSR(Word, 32 - Len), 32 - Len)
+    end.
+
+builtin_bytes_concat(A, B) ->
+    Type     = fun(N) when N =< 32 -> word; (_) -> pointer end,
+    MkBytes  = fun([W]) -> W;
+                  (Ws)  -> {tuple, Ws} end,
+    Words    = fun(N) -> (N + 31) div 32 end,
+    WordsRes = Words(A + B),
+    Word = fun(I) when 32 * (I + 1) =< A -> bytes_slice(I * 32, 32, A, ?V(a));
+              (I) when 32 * I < A ->
+                   Len = A rem 32,
+                   Hi  = bytes_slice(32 * I, Len, A, ?V(a)),
+                   Lo  = bytes_slice(0, min(32 - Len, B), B, ?V(b)),
+                   ?ADD(Hi, ?BSR(Lo, Len));
+              (I) ->
+                   Offs = 32 * I - A,
+                   Len  = min(32, B - Offs),
+                   bytes_slice(Offs, Len, B, ?V(b))
+           end,
+    Body =
+        case {A, B} of
+            {0, _} -> ?V(b);
+            {_, 0} -> ?V(a);
+            _      -> MkBytes([ Word(I) || I <- lists:seq(0, WordsRes - 1) ])
+        end,
+    {[{"a", Type(A)}, {"b", Type(B)}], Body, Type(A + B)}.
+
+builtin_bytes_split(A, B) ->
+    Type    = fun(N) when N =< 32 -> word; (_) -> pointer end,
+    MkBytes = fun([W]) -> W;
+                 (Ws)  -> {tuple, Ws} end,
+    Word    = fun(I, Max) ->
+                bytes_slice(I, min(32, Max - I), A + B, ?V(c))
+              end,
+    Body =
+        case {A, B} of
+            {0, _} -> [?I(0), ?V(c)];
+            {_, 0} -> [?V(c), ?I(0)];
+            _      -> [MkBytes([ Word(I, A)     || I <- lists:seq(0, A - 1, 32) ]),
+                       MkBytes([ Word(I, A + B) || I <- lists:seq(A, A + B - 1, 32) ])]
+        end,
+    {[{"c", Type(A + B)}], {tuple, Body}, {tuple, [Type(A), Type(B)]}}.
+
+bytes_to_raw_string(N, Term) when N =< 32 ->
+    {tuple, [?I(N), Term]};
+bytes_to_raw_string(N, Term) when N > 32 ->
+    Elem  = fun(I) -> #binop{op = '!', left = ?I(32 * I), right = ?V(bin)}
+            end,
+    Words = (N + 31) div 32,
+    ?LET(bin, Term, {tuple, [?I(N) | [Elem(I) || I <- lists:seq(0, Words - 1)]]}).
+

src/aeso_code_errors.erl

@@ -0,0 +1,120 @@
+%%%-------------------------------------------------------------------
+%%% @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_contract, Decl = {namespace, _, {con, _, C}, _}}) ->
+    Msg = io_lib:format("Expected a contract as the last declaration instead of the namespace '~s'\n",
+                        [C]),
+    mk_err(pos(Decl), Msg);
+format({missing_init_function, Con}) ->
+    Msg = io_lib:format("Missing init function for the contract '~s'.\n", [pp_expr(Con)]),
+    Cxt = "The 'init' function can only be omitted if the state type is 'unit'.\n",
+    mk_err(pos(Con), Msg, Cxt);
+format({missing_definition, Id}) ->
+    Msg = io_lib:format("Missing definition of function '~s'.\n", [pp_expr(Id)]),
+    mk_err(pos(Id), Msg);
+format({parameterized_state, Decl}) ->
+    Msg = "The state type cannot be parameterized.\n",
+    mk_err(pos(Decl), Msg);
+format({parameterized_event, Decl}) ->
+    Msg = "The event type cannot be parameterized.\n",
+    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.\n",
+                        [ThingS, Name, Bad]),
+    case Why of
+        polymorphic  -> mk_err(pos(Ann), Msg, "Use the FATE backend if you want polymorphic entrypoints.\n");
+        higher_order -> mk_err(pos(Ann), Msg)
+    end;
+format({cant_compare_type_aevm, Ann, Op, Type}) ->
+    StringAndTuple = [ "- type string\n"
+                       "- tuple or record of word type\n" || lists:member(Op, ['==', '!=']) ],
+    Msg = io_lib:format("Cannot compare values of type\n"
+                        "~s\n"
+                        "The AEVM only supports '~s' on values of\n"
+                        "- word type (int, bool, bits, address, oracle(_, _), etc)\n"
+                        "~s",
+                        [pp_type(2, Type), Op, StringAndTuple]),
+    Cxt = "Use FATE if you need to compare arbitrary types.\n",
+    mk_err(pos(Ann), Msg, Cxt);
+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).\n",
+                        [pp_type(2, T)]),
+    mk_err(pos(Ann), Msg);
+format({unapplied_contract_call, Contract}) ->
+    Msg = io_lib:format("The AEVM does not support unapplied contract call to\n"
+                        "~s\n", [pp_expr(2, Contract)]),
+    Cxt = "Use FATE if you need this.\n",
+    mk_err(pos(Contract), Msg, Cxt);
+format({unapplied_builtin, Id}) ->
+    Msg = io_lib:format("The AEVM does not support unapplied use of ~s.\n", [pp_expr(0, Id)]),
+    Cxt = "Use FATE if you need this.\n",
+    mk_err(pos(Id), Msg, Cxt);
+format({invalid_map_key_type, Why, Ann, Type}) ->
+    Msg = io_lib:format("Invalid map key type\n~s\n", [pp_type(2, Type)]),
+    Cxt = case Why of
+             polymorphic -> "Map keys cannot be polymorphic in the AEVM. Use FATE if you need this.\n";
+             function    -> "Map keys cannot be higher-order.\n"
+          end,
+    mk_err(pos(Ann), Msg, Cxt);
+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\n", [pp_type(2, Type)]),
+    Cxt = io_lib:format("The ~s type must not be ~s.\n", [What, WhyS]),
+    mk_err(pos(Ann), Msg, Cxt);
+format({higher_order_state, {type_def, Ann, _, _, State}}) ->
+    Msg = io_lib:format("Invalid state type\n~s\n", [pp_type(2, State)]),
+    Cxt = "The state cannot contain functions in the AEVM. Use FATE if you need this.\n",
+    mk_err(pos(Ann), Msg, Cxt);
+
+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

@@ -2,7 +2,7 @@
 %%% @author Happi (Erik Stenman)
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc
-%%%     Compiler from Aeterinty Sophia language to FATE.
+%%%     Compiler from Aeterinty Sophia language to the Aeternity VM, aevm.
 %%% @end
 %%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
@@ -12,35 +12,34 @@
         , file/2
         , from_string/2
         , check_call/4
-        , create_calldata/3
+        , create_calldata/3  %% deprecated
         , create_calldata/4
         , version/0
-        , numeric_version/0
-        , to_sophia_value/4
+        , sophia_type_to_typerep/1
+        , to_sophia_value/4  %% deprecated, need a backend
         , to_sophia_value/5
-        , decode_calldata/3
+        , decode_calldata/3  %% deprecated
         , decode_calldata/4
         , parse/2
         , add_include_path/2
-        , validate_byte_code/3
         ]).
 
 -include_lib("aebytecode/include/aeb_opcodes.hrl").
--include("aeso_utils.hrl").
+-include("aeso_icode.hrl").
 
 
 -type option() :: pp_sophia_code
                 | pp_ast
                 | pp_types
                 | pp_typed_ast
+                | pp_icode
                 | pp_assembler
+                | pp_bytecode
                 | no_code
-                | keep_included
-                | debug_mode
+                | {backend, aevm | fate}
                 | {include, {file_system, [string()]} |
                             {explicit_files, #{string() => binary()}}}
-                | {src_file, string()}
-                | {aci, aeso_aci:aci_type()}.
+                | {src_file, string()}.
 -type options() :: [option()].
 
 -export_type([ option/0
@@ -66,17 +65,6 @@ version() ->
             {ok, list_to_binary(VsnString)}
     end.
 
--spec numeric_version() -> {ok, [non_neg_integer()]} | {error, term()}.
-numeric_version() ->
-    case version() of
-        {ok, Bin} ->
-            [NoSuf | _] = binary:split(Bin, <<"-">>),
-            Numbers     = binary:split(NoSuf, <<".">>, [global]),
-            {ok, [binary_to_integer(Num) || Num <- Numbers]};
-        {error, _} = Err ->
-            Err
-    end.
-
 -spec file(string()) -> {ok, map()} | {error, [aeso_errors:error()]}.
 file(Filename) ->
     file(Filename, []).
@@ -101,69 +89,72 @@ add_include_path(File, Options) ->
     end.
 
 -spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
-from_string(ContractBin, Options) when is_binary(ContractBin) ->
-    from_string(binary_to_list(ContractBin), Options);
-from_string(ContractString, Options) ->
+from_string(Contract, Options) ->
+    from_string(proplists:get_value(backend, Options, aevm), Contract, Options).
+
+from_string(Backend, ContractBin, Options) when is_binary(ContractBin) ->
+    from_string(Backend, binary_to_list(ContractBin), Options);
+from_string(Backend, ContractString, Options) ->
     try
-        from_string1(ContractString, Options)
+        from_string1(Backend, ContractString, Options)
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-from_string1(ContractString, Options) ->
-    #{ fcode := FCode
-     , fcode_env := FCodeEnv
-     , folded_typed_ast := FoldedTypedAst
-     , warnings := Warnings } = string_to_code(ContractString, Options),
-    #{ child_con_env := ChildContracts } = FCodeEnv,
-    SavedFreshNames = maps:get(saved_fresh_names, FCodeEnv, #{}),
-    {FateCode, VarsRegs} = aeso_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
-    pp_assembler(FateCode, Options),
+from_string1(aevm, ContractString, Options) ->
+    #{icode := Icode} = string_to_code(ContractString, Options),
+    TypeInfo  = extract_type_info(Icode),
+    Assembler = assemble(Icode, Options),
+    pp_assembler(aevm, Assembler, Options),
+    ByteCodeList = to_bytecode(Assembler, Options),
+    ByteCode = << << B:8 >> || B <- ByteCodeList >>,
+    pp_bytecode(ByteCode, Options),
+    {ok, Version} = version(),
+    {ok, #{byte_code => ByteCode,
+           compiler_version => Version,
+           contract_source => ContractString,
+           type_info => TypeInfo,
+           abi_version => aeb_aevm_abi:abi_version(),
+           payable => maps:get(payable, Icode)
+          }};
+from_string1(fate, ContractString, Options) ->
+    #{fcode := FCode} = string_to_code(ContractString, Options),
+    FateCode = aeso_fcode_to_fate:compile(FCode, Options),
+    pp_assembler(fate, FateCode, Options),
     ByteCode = aeb_fate_code:serialize(FateCode, []),
     {ok, Version} = version(),
-    Res = #{byte_code => ByteCode,
-            compiler_version => Version,
-            contract_source => ContractString,
-            type_info => [],
-            fate_code => FateCode,
-            abi_version => aeb_fate_abi:abi_version(),
-            payable => maps:get(payable, FCode),
-            warnings => Warnings
-           },
-    ResDbg = Res#{variables_registers => VarsRegs},
-    FinalRes =
-        case proplists:get_value(debug_info, Options, false) of
-            true  -> ResDbg;
-            false -> Res
-        end,
-    {ok, maybe_generate_aci(FinalRes, FoldedTypedAst, Options)}.
-
-maybe_generate_aci(Result, FoldedTypedAst, Options) ->
-    case proplists:get_value(aci, Options) of
-        undefined ->
-            Result;
-        Type ->
-            {ok, Aci} = aeso_aci:from_typed_ast(Type, FoldedTypedAst),
-            maps:put(aci, Aci, Result)
-    end.
+    {ok, #{byte_code => ByteCode,
+           compiler_version => Version,
+           contract_source => ContractString,
+           type_info => [],
+           fate_code => FateCode,
+           abi_version => aeb_fate_abi:abi_version(),
+           payable => maps:get(payable, FCode)
+          }}.
 
 -spec string_to_code(string(), options()) -> map().
 string_to_code(ContractString, Options) ->
     Ast = parse(ContractString, Options),
     pp_sophia_code(Ast, Options),
     pp_ast(Ast, Options),
-    {TypeEnv, FoldedTypedAst, UnfoldedTypedAst, Warnings} = aeso_ast_infer_types:infer(Ast, [return_env | Options]),
-    pp_typed_ast(UnfoldedTypedAst, Options),
-    {Env, Fcode} = aeso_ast_to_fcode:ast_to_fcode(UnfoldedTypedAst, [{original_src, ContractString}|Options]),
-    #{ fcode => Fcode
-    ,  fcode_env => Env
-    ,  unfolded_typed_ast => UnfoldedTypedAst
-    ,  folded_typed_ast => FoldedTypedAst
-    ,  type_env  => TypeEnv
-    ,  ast => Ast
-    ,  warnings => Warnings }.
+    {TypeEnv, TypedAst} = aeso_ast_infer_types:infer(Ast, [return_env | Options]),
+    pp_typed_ast(TypedAst, Options),
+    case proplists:get_value(backend, Options, aevm) of
+        aevm ->
+            Icode = ast_to_icode(TypedAst, Options),
+            pp_icode(Icode, Options),
+            #{ icode => Icode,
+               typed_ast => TypedAst,
+               type_env  => TypeEnv};
+        fate ->
+            Fcode = aeso_ast_to_fcode:ast_to_fcode(TypedAst, Options),
+            #{ fcode => Fcode,
+               typed_ast => TypedAst,
+               type_env  => TypeEnv}
+    end.
 
 -define(CALL_NAME,   "__call").
+-define(DECODE_NAME, "__decode").
 
 %% Takes a string containing a contract with a declaration/prototype of a
 %% function (foo, say) and adds function __call() = foo(args) calling this
@@ -171,8 +162,10 @@ string_to_code(ContractString, Options) ->
 %% terms for the arguments.
 %% NOTE: Special treatment for "init" since it might be implicit and has
 %%       a special return type (typerep, T)
--spec check_call(string(), string(), [string()], options()) -> {ok, string(), [term()]}
-                                                             | {error, [aeso_errors:error()]}.
+-spec check_call(string(), string(), [string()], options()) -> {ok, string(), {[Type], Type}, [term()]}
+                                                                   | {ok, string(), [term()]}
+                                                                   | {error, [aeso_errors:error()]}
+    when Type :: term().
 check_call(Source, "init" = FunName, Args, Options) ->
     case check_call1(Source, FunName, Args, Options) of
         Err = {error, _} when Args == [] ->
@@ -189,20 +182,42 @@ check_call(Source, FunName, Args, Options) ->
 
 check_call1(ContractString0, FunName, Args, Options) ->
     try
-        %% First check the contract without the __call function
-        #{fcode := OrgFcode
-        , fcode_env := #{child_con_env := ChildContracts}
-        , ast := Ast} = string_to_code(ContractString0, Options),
-        {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)),
-        ContractString = insert_call_function(Ast, ContractString0, CallName, FunName, Args),
-        #{fcode := Fcode} = string_to_code(ContractString, Options),
-        CallArgs = arguments_of_body(CallName, FunName, Fcode),
-
-        {ok, FunName, CallArgs}
+        case proplists:get_value(backend, Options, aevm) of
+            aevm ->
+                %% First check the contract without the __call function
+                #{} = string_to_code(ContractString0, Options),
+                ContractString = insert_call_function(ContractString0, ?CALL_NAME, FunName, Args, Options),
+                #{typed_ast := TypedAst,
+                  icode     := Icode} = string_to_code(ContractString, Options),
+                {ok, {FunName, {fun_t, _, _, ArgTypes, RetType}}} = get_call_type(TypedAst),
+                ArgVMTypes = [ aeso_ast_to_icode:ast_typerep(T, Icode) || T <- ArgTypes ],
+                RetVMType  = case RetType of
+                                 {id, _, "_"} -> any;
+                                 _            -> aeso_ast_to_icode:ast_typerep(RetType, Icode)
+                             end,
+                #{ functions := Funs } = Icode,
+                ArgIcode = get_arg_icode(Funs),
+                ArgTerms = [ icode_to_term(T, Arg) ||
+                               {T, Arg} <- lists:zip(ArgVMTypes, ArgIcode) ],
+                RetVMType1 =
+                    case FunName of
+                        "init" -> {tuple, [typerep, RetVMType]};
+                        _ -> RetVMType
+                    end,
+                {ok, FunName, {ArgVMTypes, RetVMType1}, ArgTerms};
+            fate ->
+                %% First check the contract without the __call function
+                #{fcode := OrgFcode} = string_to_code(ContractString0, Options),
+                FateCode = aeso_fcode_to_fate:compile(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)),
+                ContractString = insert_call_function(ContractString0, CallName, FunName, Args, Options),
+                #{fcode := Fcode} = string_to_code(ContractString, Options),
+                CallArgs = arguments_of_body(CallName, FunName, Fcode),
+                {ok, FunName, CallArgs}
+        end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
@@ -224,8 +239,9 @@ first_none_match(CallName, Hashes, [Char|Chars]) ->
     end.
 
 %% Add the __call function to a contract.
--spec insert_call_function(aeso_syntax:ast(), string(), string(), string(), [string()]) -> string().
-insert_call_function(Ast, Code, Call, FunName, Args) ->
+-spec insert_call_function(string(), string(), string(), [string()], options()) -> string().
+insert_call_function(Code, Call, FunName, Args, Options) ->
+    Ast = parse(Code, Options),
     Ind = last_contract_indent(Ast),
     lists:flatten(
         [ Code,
@@ -246,107 +262,194 @@ insert_init_function(Code, Options) ->
 
 last_contract_indent(Decls) ->
     case lists:last(Decls) of
-        {_, _, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
-        _                        -> 0
+        {_, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
+        _                     -> 0
     end.
 
--spec to_sophia_value(string(), string(), ok | error | revert, binary()) ->
-          {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
+-spec to_sophia_value(string(), string(), ok | error | revert, aeb_aevm_data:data()) ->
+        {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
 to_sophia_value(ContractString, Fun, ResType, Data) ->
-    to_sophia_value(ContractString, Fun, ResType, Data, []).
+    to_sophia_value(ContractString, Fun, ResType, Data, [{backend, aevm}]).
+
 -spec to_sophia_value(string(), string(), ok | error | revert, binary(), options()) ->
         {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
 to_sophia_value(_, _, error, Err, _Options) ->
     {ok, {app, [], {id, [], "error"}, [{string, [], Err}]}};
-to_sophia_value(_, _, revert, Data, _Options) ->
-    try aeso_vm_decode:from_fate({id, [], "string"}, aeb_fate_encoding:deserialize(Data)) of
-        Err ->
-            {ok, {app, [], {id, [], "abort"}, [Err]}}
-    catch _:_ ->
-            Msg = "Could not deserialize the revert message",
-            {error, [aeso_errors:new(data_error, Msg)]}
+to_sophia_value(_, _, revert, Data, Options) ->
+    case proplists:get_value(backend, Options, aevm) of
+        aevm ->
+            case aeb_heap:from_binary(string, Data) of
+                {ok, Err} ->
+                    {ok, {app, [], {id, [], "abort"}, [{string, [], Err}]}};
+                {error, _} ->
+                    Msg = "Could not interpret the revert message\n",
+                    {error, [aeso_errors:new(data_error, Msg)]}
+            end;
+        fate ->
+            try aeb_fate_encoding:deserialize(Data) of
+                Err -> {ok, {app, [], {id, [], "abort"}, [{string, [], Err}]}}
+            catch _:_ ->
+                Msg = "Could not deserialize the revert message\n",
+                {error, [aeso_errors:new(data_error, Msg)]}
+            end
     end;
 to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
+        #{ 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, [unfold_record_types, unfold_variant_types]),
 
-        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)]}
+        case proplists:get_value(backend, Options, aevm) of
+            aevm ->
+                Icode  = maps:get(icode, Code),
+                VmType = aeso_ast_to_icode:ast_typerep(Type, Icode),
+                case aeb_heap:from_binary(VmType, Data) of
+                    {ok, VmValue} ->
+                        try
+                            {ok, aeso_vm_decode:from_aevm(VmType, Type, VmValue)}
+                        catch throw:cannot_translate_to_sophia ->
+                            Type0Str = prettypr:format(aeso_pretty:type(Type0)),
+                            Msg = io_lib:format("Cannot translate VM value ~p\n  of type ~p\n  to Sophia type ~s\n",
+                                                [Data, VmType, Type0Str]),
+                            {error, [aeso_errors:new(data_error, Msg)]}
+                        end;
+                    {error, _Err} ->
+                        Msg = io_lib:format("Failed to decode binary as type ~p\n", [VmType]),
+                        {error, [aeso_errors:new(data_error, Msg)]}
+                end;
+            fate ->
+                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(Type)),
+                        Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s\n",
+                                            [aeb_fate_encoding:deserialize(Data), 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\n", [Type1]),
+                        {error, [aeso_errors:new(data_error, Msg)]}
+               end
         end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
+
 -spec create_calldata(string(), string(), [string()]) ->
-          {ok, binary()} | {error, [aeso_errors:error()]}.
+                             {ok, binary(), aeb_aevm_data:type(), aeb_aevm_data:type()}
+                             | {error, [aeso_errors:error()]}.
 create_calldata(Code, Fun, Args) ->
-    create_calldata(Code, Fun, Args, []).
+    create_calldata(Code, Fun, Args, [{backend, aevm}]).
+
 -spec create_calldata(string(), string(), [string()], [{atom(), any()}]) ->
                              {ok, binary()} | {error, [aeso_errors:error()]}.
 create_calldata(Code, Fun, Args, Options0) ->
     Options = [no_code | Options0],
-    case check_call(Code, Fun, Args, Options) of
-        {ok, FunName, FateArgs} ->
-            aeb_fate_abi:create_calldata(FunName, FateArgs);
-        {error, _} = Err -> Err
+    case proplists:get_value(backend, Options, aevm) of
+        aevm ->
+            case check_call(Code, Fun, Args, Options) of
+                {ok, FunName, {ArgTypes, RetType}, VMArgs} ->
+                    aeb_aevm_abi:create_calldata(FunName, VMArgs, ArgTypes, RetType);
+                {error, _} = Err -> Err
+            end;
+        fate ->
+            case check_call(Code, Fun, Args, Options) of
+                {ok, FunName, FateArgs} ->
+                    aeb_fate_abi:create_calldata(FunName, FateArgs);
+                {error, _} = Err -> Err
+            end
     end.
 
 -spec decode_calldata(string(), string(), binary()) ->
-          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [aeso_errors:error()]}.
+                             {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
+                             | {error, [aeso_errors:error()]}.
 decode_calldata(ContractString, FunName, Calldata) ->
-    decode_calldata(ContractString, FunName, Calldata, []).
--spec decode_calldata(string(), string(), binary(), options()) ->
-          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [aeso_errors:error()]}.
+    decode_calldata(ContractString, FunName, Calldata, [{backend, aevm}]).
+
 decode_calldata(ContractString, FunName, Calldata, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
+        #{ 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),
+        DropArg       = fun({arg, _, _, T}) -> T; (T) -> T end,
+        ArgTypes      = lists:map(DropArg, 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, [unfold_record_types, unfold_variant_types]),
-        case aeb_fate_abi:decode_calldata(FunName, Calldata) of
-            {ok, FateArgs} ->
-                try
-                    {tuple_t, [], ArgTypes1} = Type,
-                    AstArgs = [ aeso_vm_decode:from_fate(ArgType, FateArg)
-                                || {ArgType, FateArg} <- lists:zip(ArgTypes1, FateArgs)],
-                    {ok, ArgTypes, AstArgs}
-                catch throw:cannot_translate_to_sophia ->
-                        Type0Str = prettypr:format(aeso_pretty:type(Type0)),
-                        Msg = io_lib:format("Cannot translate FATE value ~p\n  to Sophia type ~s",
-                                            [FateArgs, Type0Str]),
+        case proplists:get_value(backend, Options, aevm) of
+            aevm ->
+                Icode  = maps:get(icode, Code),
+                VmType = aeso_ast_to_icode:ast_typerep(Type, Icode),
+                case aeb_heap:from_binary({tuple, [word, VmType]}, Calldata) of
+                    {ok, {_, VmValue}} ->
+                        try
+                            {tuple, [], Values} = aeso_vm_decode:from_aevm(VmType, Type, VmValue),
+                            %% Values are Sophia expressions in AST format
+                            {ok, ArgTypes, Values}
+                        catch throw:cannot_translate_to_sophia ->
+                            Type0Str = prettypr:format(aeso_pretty:type(Type0)),
+                            Msg = io_lib:format("Cannot translate VM value ~p\n  of type ~p\n  to Sophia type ~s\n",
+                                                [VmValue, VmType, Type0Str]),
+                            {error, [aeso_errors:new(data_error, Msg)]}
+                        end;
+                    {error, _Err} ->
+                        Msg = io_lib:format("Failed to decode calldata as type ~p\n", [VmType]),
                         {error, [aeso_errors:new(data_error, Msg)]}
                 end;
-            {error, _} ->
-                Msg = io_lib:format("Failed to decode calldata binary", []),
-                {error, [aeso_errors:new(data_error, Msg)]}
+            fate ->
+                case aeb_fate_abi:decode_calldata(FunName, Calldata) of
+                    {ok, FateArgs} ->
+                        try
+                            {tuple_t, [], ArgTypes1} = Type,
+                            AstArgs = [ aeso_vm_decode:from_fate(ArgType, FateArg)
+                                        || {ArgType, FateArg} <- lists:zip(ArgTypes1, FateArgs)],
+                            {ok, ArgTypes, AstArgs}
+                        catch throw:cannot_translate_to_sophia ->
+                                Type0Str = prettypr:format(aeso_pretty:type(Type0)),
+                                Msg = io_lib:format("Cannot translate FATE value ~p\n  to Sophia type ~s\n",
+                                                    [FateArgs, Type0Str]),
+                                {error, [aeso_errors:new(data_error, Msg)]}
+                        end;
+                    {error, _} ->
+                        Msg = io_lib:format("Failed to decode calldata binary\n", []),
+                        {error, [aeso_errors:new(data_error, Msg)]}
+                end
         end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
+get_arg_icode(Funs) ->
+    case [ Args || {[_, ?CALL_NAME], _, _, {funcall, _, Args}, _} <- Funs ] of
+        [Args] -> Args;
+        []     -> error_missing_call_function()
+    end.
+
+-dialyzer({nowarn_function, error_missing_call_function/0}).
+error_missing_call_function() ->
+    Msg = "Internal error: missing '__call'-function",
+    aeso_errors:throw(aeso_errors:new(internal_error, Msg)).
+
+get_call_type([{contract, _, _, Defs}]) ->
+    case [ {lists:last(QFunName), FunType}
+          || {letfun, _, {id, _, ?CALL_NAME}, [], _Ret,
+                {typed, _,
+                    {app, _,
+                        {typed, _, {qid, _, QFunName}, FunType}, _}, _}} <- Defs ] of
+        [Call] -> {ok, Call};
+        []     -> error_missing_call_function()
+    end;
+get_call_type([_ | Contracts]) ->
+    %% The __call should be in the final contract
+    get_call_type(Contracts).
+
 -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}]) ->
     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,
@@ -356,8 +459,8 @@ get_decode_type(FunName, [{Contract, Ann, _, _, Defs}]) when ?IS_CONTRACT_HEAD(C
             case FunName of
                 "init" -> {ok, [], {tuple_t, [], []}};
                  _ ->
-                    Msg = io_lib:format("Function '~s' is missing in contract", [FunName]),
-                    Pos = aeso_errors:pos(Ann),
+                    Msg = io_lib:format("Function '~s' is missing in contract\n", [FunName]),
+                    Pos = aeso_code_errors:pos(Ann),
                     aeso_errors:throw(aeso_errors:new(data_error, Pos, Msg))
             end
     end;
@@ -365,101 +468,93 @@ get_decode_type(FunName, [_ | Contracts]) ->
     %% The __decode should be in the final contract
     get_decode_type(FunName, Contracts).
 
+%% Translate an icode value (error if not value) to an Erlang term that can be
+%% consumed by aeb_heap:to_binary().
+icode_to_term(word, {integer, N}) -> N;
+icode_to_term(word, {unop, '-', {integer, N}}) -> -N;
+icode_to_term(string, {tuple, [{integer, Len} | Words]}) ->
+    <<Str:Len/binary, _/binary>> = << <<W:256>> || {integer, W} <- Words >>,
+    Str;
+icode_to_term({list, T}, {list, Vs}) ->
+    [ icode_to_term(T, V) || V <- Vs ];
+icode_to_term({tuple, Ts}, {tuple, Vs}) ->
+    list_to_tuple(icodes_to_terms(Ts, Vs));
+icode_to_term({variant, Cs}, {tuple, [{integer, Tag} | Args]}) ->
+    Ts = lists:nth(Tag + 1, Cs),
+    {variant, Tag, icodes_to_terms(Ts, Args)};
+icode_to_term(T = {map, KT, VT}, M) ->
+    %% Maps are compiled to builtin and primop calls, so this gets a little hairy
+    case M of
+        {funcall, {var_ref, {builtin, map_put}}, [M1, K, V]} ->
+            Map = icode_to_term(T, M1),
+            Key = icode_to_term(KT, K),
+            Val = icode_to_term(VT, V),
+            Map#{ Key => Val };
+        #prim_call_contract{ address = {integer, 0},
+                             arg = {tuple, [{integer, ?PRIM_CALL_MAP_EMPTY}, _, _]} } ->
+            #{};
+        _ -> throw({todo, M})
+    end;
+icode_to_term(typerep, _) ->
+    throw({todo, typerep});
+icode_to_term(T, V) ->
+    throw({not_a_value, T, V}).
+
+icodes_to_terms(Ts, Vs) ->
+    [ icode_to_term(T, V) || {T, V} <- lists:zip(Ts, Vs) ].
+
+ast_to_icode(TypedAst, Options) ->
+    aeso_ast_to_icode:convert_typed(TypedAst, Options).
+
+assemble(Icode, Options) ->
+    aeso_icode_to_asm:convert(Icode, Options).
+
+
+to_bytecode(['COMMENT',_|Rest],_Options) ->
+    to_bytecode(Rest,_Options);
+to_bytecode([Op|Rest], Options) ->
+    [aeb_opcodes:m_to_op(Op)|to_bytecode(Rest, Options)];
+to_bytecode([], _) -> [].
+
+extract_type_info(#{functions := Functions} =_Icode) ->
+    ArgTypesOnly = fun(As) -> [ T || {_, T} <- As ] end,
+    Payable = fun(Attrs) -> proplists:get_value(payable, Attrs, false) end,
+    TypeInfo = [aeb_aevm_abi:function_type_info(list_to_binary(lists:last(Name)),
+                                            Payable(Attrs), ArgTypesOnly(Args), TypeRep)
+                || {Name, Attrs, Args,_Body, TypeRep} <- Functions,
+                   not is_tuple(Name),
+                   not lists:member(private, Attrs)
+               ],
+    lists:sort(TypeInfo).
+
 pp_sophia_code(C, Opts)->  pp(C, Opts, pp_sophia_code, fun(Code) ->
                                 io:format("~s\n", [prettypr:format(aeso_pretty:decls(Code))])
                             end).
 pp_ast(C, Opts)      ->  pp(C, Opts, pp_ast, fun aeso_ast:pp/1).
 pp_typed_ast(C, Opts)->  pp(C, Opts, pp_typed_ast, fun aeso_ast:pp_typed/1).
+pp_icode(C, Opts)    ->  pp(C, Opts, pp_icode, fun aeso_icode:pp/1).
+pp_bytecode(C, Opts) ->  pp(C, Opts, pp_bytecode, fun aeb_disassemble:pp/1).
 
-pp_assembler(C, Opts) ->  pp(C, Opts, pp_assembler, fun(Asm) -> io:format("~s", [aeb_fate_asm:pp(Asm)]) end).
+pp_assembler(aevm, C, Opts) ->  pp(C, Opts, pp_assembler, fun aeb_asm:pp/1);
+pp_assembler(fate, C, Opts) ->  pp(C, Opts, pp_assembler, fun(Asm) -> io:format("~s", [aeb_fate_asm:pp(Asm)]) end).
 
 pp(Code, Options, Option, PPFun) ->
     case proplists:lookup(Option, Options) of
-        {Option1, true} when Option1 =:= Option ->
+        {Option, true} ->
             PPFun(Code);
         none ->
             ok
     end.
 
-%% -- Byte code validation ---------------------------------------------------
-
--define(protect(Tag, Code), fun() -> try Code catch _:Err1 -> throw({Tag, Err1}) end end()).
-
--spec validate_byte_code(map(), string(), options()) -> ok | {error, [aeso_errors:error()]}.
-validate_byte_code(#{ byte_code := ByteCode, payable := Payable }, Source, Options) ->
-    Fail = fun(Err) -> {error, [aeso_errors:new(data_error, Err)]} end,
-    try
-        FCode1 = ?protect(deserialize, aeb_fate_code:strip_init_function(aeb_fate_code:deserialize(ByteCode))),
-        {FCode2, SrcPayable} =
-            ?protect(compile,
-                     begin
-                         {ok, #{ byte_code := SrcByteCode, payable := SrcPayable }} =
-                             from_string1(Source, Options),
-                         FCode = aeb_fate_code:deserialize(SrcByteCode),
-                         {aeb_fate_code:strip_init_function(FCode), SrcPayable}
-                     end),
-        case compare_fate_code(FCode1, FCode2) of
-            ok when SrcPayable /= Payable ->
-                Not = fun(true) -> ""; (false) -> " not" end,
-                Fail(io_lib:format("Byte code contract is~s payable, but source code contract is~s.\n",
-                                   [Not(Payable), Not(SrcPayable)]));
-            ok           -> ok;
-            {error, Why} -> Fail(io_lib:format("Byte code does not match source code.\n~s", [Why]))
-        end
-    catch
-        throw:{deserialize, _}         -> Fail("Invalid byte code");
-        throw:{compile, {error, Errs}} -> {error, Errs}
-    end.
-
-compare_fate_code(FCode1, FCode2) ->
-    Funs1 = aeb_fate_code:functions(FCode1),
-    Funs2 = aeb_fate_code:functions(FCode2),
-    Syms1 = aeb_fate_code:symbols(FCode1),
-    Syms2 = aeb_fate_code:symbols(FCode2),
-    FunHashes1 = maps:keys(Funs1),
-    FunHashes2 = maps:keys(Funs2),
-    case FunHashes1 == FunHashes2 of
-        false ->
-            InByteCode   = [ binary_to_list(maps:get(H, Syms1)) || H <- FunHashes1 -- FunHashes2 ],
-            InSourceCode = [ binary_to_list(maps:get(H, Syms2)) || H <- FunHashes2 -- FunHashes1 ],
-            Msg = [ io_lib:format("- Functions in the byte code but not in the source code:\n"
-                                  "    ~s\n", [string:join(InByteCode, ", ")]) || InByteCode /= [] ] ++
-                  [ io_lib:format("- Functions in the source code but not in the byte code:\n"
-                                  "    ~s\n", [string:join(InSourceCode, ", ")]) || InSourceCode /= [] ],
-            {error, Msg};
-        true ->
-            case lists:append([ compare_fate_fun(maps:get(H, Syms1), Fun1, Fun2)
-                                || {{H, Fun1}, {_, Fun2}} <- lists:zip(maps:to_list(Funs1),
-                                                                       maps:to_list(Funs2)) ]) of
-                [] -> ok;
-                Errs -> {error, Errs}
-            end
-    end.
-
-compare_fate_fun(_Name, Fun, Fun) -> [];
-compare_fate_fun(Name, {Attr, Type, _}, {Attr, Type, _}) ->
-    [io_lib:format("- The implementation of the function ~s is different.\n", [Name])];
-compare_fate_fun(Name, {Attr1, Type, _}, {Attr2, Type, _}) ->
-    [io_lib:format("- The attributes of the function ~s differ:\n"
-                   "    Byte code:   ~s\n"
-                   "    Source code: ~s\n",
-                   [Name, string:join([ atom_to_list(A) || A <- Attr1 ], ", "),
-                          string:join([ atom_to_list(A) || A <- Attr2 ], ", ")])];
-compare_fate_fun(Name, {_, Type1, _}, {_, Type2, _}) ->
-    [io_lib:format("- The type of the function ~s differs:\n"
-                   "    Byte code:   ~s\n"
-                   "    Source code: ~s\n",
-                   [Name, pp_fate_sig(Type1), pp_fate_sig(Type2)])].
-
-pp_fate_sig({[Arg], Res}) ->
-    io_lib:format("~s => ~s", [pp_fate_type(Arg), pp_fate_type(Res)]);
-pp_fate_sig({Args, Res}) ->
-    io_lib:format("(~s) => ~s", [string:join([pp_fate_type(Arg) || Arg <- Args], ", "), pp_fate_type(Res)]).
-
-pp_fate_type(T) -> io_lib:format("~w", [T]).
-
 %% -------------------------------------------------------------------
 
+sophia_type_to_typerep(String) ->
+    {ok, Ast} = aeso_parser:type(String),
+    try aeso_ast_to_icode:ast_typerep(Ast) of
+        Type -> {ok, Type}
+    catch _:_ -> {error, bad_type}
+    end.
+
 -spec parse(string(), aeso_compiler:options()) -> none() | aeso_syntax:ast().
 parse(Text, Options) ->
     parse(Text, sets:new(), Options).

src/aeso_errors.erl

@@ -30,16 +30,12 @@
 
 -export([ err_msg/1
         , msg/1
-        , msg_oneline/1
         , new/2
         , new/3
         , new/4
-        , pos/1
         , pos/2
         , pos/3
         , pp/1
-        , pp_oneline/1
-        , pp_pos/1
         , to_json/1
         , throw/1
         , type/1
@@ -54,12 +50,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 }.
 
@@ -75,13 +65,10 @@ throw(#err{} = Err) ->
     erlang:throw({error, [Err]}).
 
 msg(#err{ message = Msg, context = none }) -> Msg;
-msg(#err{ message = Msg, context = Ctxt }) -> Msg ++ "\n" ++ Ctxt.
-
-msg_oneline(#err{ message = Msg, context = none }) -> Msg;
-msg_oneline(#err{ message = Msg, context = Ctxt }) -> Msg ++ " - " ++ Ctxt.
+msg(#err{ message = Msg, context = Ctxt }) -> Msg ++ Ctxt.
 
 err_msg(#err{ pos = Pos } = Err) ->
-    lists:flatten(io_lib:format("~s~s\n", [str_pos(Pos), msg(Err)])).
+    lists:flatten(io_lib:format("~s~s", [str_pos(Pos), msg(Err)])).
 
 str_pos(#pos{file = no_file, line = L, col = C}) ->
     io_lib:format("~p:~p:", [L, C]);
@@ -91,12 +78,7 @@ str_pos(#pos{file = F, line = L, col = C}) ->
 type(#err{ type = Type }) -> Type.
 
 pp(#err{ type = Kind, pos = Pos } = Err) ->
-    lists:flatten(io_lib:format("~s~s:\n~s\n", [pp_kind(Kind), pp_pos(Pos), msg(Err)])).
-
-pp_oneline(#err{ type = Kind, pos = Pos } = Err) ->
-    Msg = msg_oneline(Err),
-    OneLineMsg = re:replace(Msg, "[\s\\n]+", " ", [global]),
-    lists:flatten(io_lib:format("~s~s: ~s", [pp_kind(Kind), pp_pos(Pos), OneLineMsg])).
+    lists:flatten(io_lib:format("~s~s:\n~s", [pp_kind(Kind), pp_pos(Pos), msg(Err)])).
 
 pp_kind(type_error)     -> "Type error";
 pp_kind(parse_error)    -> "Parse error";

src/aeso_icode.erl

@@ -0,0 +1,149 @@
+%%%-------------------------------------------------------------------
+%%% @author Happi (Erik Stenman)
+%%% @copyright (C) 2017, Aeternity Anstalt
+%%% @doc
+%%%     Intermediate Code for Aeterinty Sophia language.
+%%% @end
+%%% Created : 21 Dec 2017
+%%%
+%%%-------------------------------------------------------------------
+-module(aeso_icode).
+
+-export([new/1,
+         pp/1,
+         set_name/2,
+         set_namespace/2,
+         set_payable/2,
+         enter_namespace/2,
+         get_namespace/1,
+         in_main_contract/1,
+         qualify/2,
+         set_functions/2,
+         map_typerep/2,
+         option_typerep/1,
+         get_constructor_tag/2]).
+
+-export_type([icode/0]).
+
+-include("aeso_icode.hrl").
+
+-type type_def() :: fun(([aeb_aevm_data:type()]) -> aeb_aevm_data:type()).
+
+-type bindings() :: any().
+-type fun_dec() :: { string()
+                   , [modifier()]
+                   , arg_list()
+                   , expr()
+                   , aeb_aevm_data:type()}.
+
+-type modifier() :: private | stateful.
+
+-type type_name() :: string() | [string()].
+
+-type icode() :: #{ contract_name => string()
+                  , functions => [fun_dec()]
+                  , namespace => aeso_syntax:con() | aeso_syntax:qcon()
+                  , env => [bindings()]
+                  , state_type => aeb_aevm_data:type()
+                  , event_type => aeb_aevm_data:type()
+                  , types => #{ type_name() => type_def() }
+                  , type_vars => #{ string() => aeb_aevm_data:type() }
+                  , constructors => #{ [string()] => integer() }  %% name to tag
+                  , options => [any()]
+                  , payable => boolean()
+                  }.
+
+pp(Icode) ->
+    %% TODO: Actually do *Pretty* printing.
+    io:format("~p~n", [Icode]).
+
+-spec new([any()]) -> icode().
+new(Options) ->
+    #{ contract_name => ""
+     , functions => []
+     , env => new_env()
+       %% Default to unit type for state and event
+     , state_type => {tuple, []}
+     , event_type => {tuple, []}
+     , types => builtin_types()
+     , type_vars => #{}
+     , constructors => builtin_constructors()
+     , options => Options
+     , payable => false }.
+
+builtin_types() ->
+    Word = fun([]) -> word end,
+    #{ "bool"         => Word
+     , "int"          => Word
+     , "char"         => Word
+     , "bits"         => Word
+     , "string"       => fun([]) -> string end
+     , "address"      => Word
+     , "hash"         => Word
+     , "unit"         => fun([]) -> {tuple, []} end
+     , "signature"    => fun([]) -> {tuple, [word, word]} end
+     , "oracle"       => fun([_, _]) -> word end
+     , "oracle_query" => fun([_, _]) -> word end
+     , "list"         => fun([A]) -> {list, A} end
+     , "option"       => fun([A]) -> {variant, [[], [A]]} end
+     , "map"          => fun([K, V]) -> map_typerep(K, V) end
+     , ["Chain", "ttl"] => fun([]) -> {variant, [[word], [word]]} end
+     }.
+
+builtin_constructors() ->
+    #{ ["RelativeTTL"] => 0
+     , ["FixedTTL"]    => 1
+     , ["None"]        => 0
+     , ["Some"]        => 1 }.
+
+map_typerep(K, V) ->
+    {map, K, V}.
+
+option_typerep(A) ->
+    {variant, [[], [A]]}.
+
+new_env() ->
+    [].
+
+-spec set_name(string(), icode()) -> icode().
+set_name(Name, Icode) ->
+    maps:put(contract_name, Name, Icode).
+
+-spec set_payable(boolean(), icode()) -> icode().
+set_payable(Payable, Icode) ->
+    maps:put(payable, Payable, Icode).
+
+-spec set_namespace(aeso_syntax:con() | aeso_syntax:qcon(), icode()) -> icode().
+set_namespace(NS, Icode) -> Icode#{ namespace => NS }.
+
+-spec enter_namespace(aeso_syntax:con(), icode()) -> icode().
+enter_namespace(NS, Icode = #{ namespace := NS1 }) ->
+    Icode#{ namespace => aeso_syntax:qualify(NS1, NS) };
+enter_namespace(NS, Icode) ->
+    Icode#{ namespace => NS }.
+
+-spec in_main_contract(icode()) -> boolean().
+in_main_contract(#{ namespace := {con, _, Main}, contract_name := Main }) -> true;
+in_main_contract(_Icode) -> false.
+
+-spec get_namespace(icode()) -> false | aeso_syntax:con() | aeso_syntax:qcon().
+get_namespace(Icode) -> maps:get(namespace, Icode, false).
+
+-spec qualify(aeso_syntax:id() | aeso_syntax:con(), icode()) -> aeso_syntax:id() | aeso_syntax:qid() | aeso_syntax:con() | aeso_syntax:qcon().
+qualify(X, Icode) ->
+    case get_namespace(Icode) of
+        false -> X;
+        NS    -> aeso_syntax:qualify(NS, X)
+    end.
+
+-spec set_functions([fun_dec()], icode()) -> icode().
+set_functions(NewFuns, Icode) ->
+    maps:put(functions, NewFuns, Icode).
+
+-spec get_constructor_tag([string()], icode()) -> integer().
+get_constructor_tag(Name, #{constructors := Constructors}) ->
+    case maps:get(Name, Constructors, undefined) of
+        undefined -> error({undefined_constructor, Name});
+        Tag       -> Tag
+    end.
+

src/aeso_icode.hrl

@@ -0,0 +1,59 @@
+
+-include_lib("aebytecode/include/aeb_typerep_def.hrl").
+
+-record(arg, {name::string(), type::?Type()}).
+
+-type expr() :: term().
+-type arg() :: #arg{name::string(), type::?Type()}.
+-type arg_list() :: [arg()].
+
+-record(fun_dec, { name :: string()
+                 , args :: arg_list()
+                 , body :: expr()}).
+
+-record(var_ref, { name :: string() | list(string()) | {builtin, atom() | tuple()}}).
+
+-record(prim_call_contract,
+    { gas      :: expr()
+    , address  :: expr()
+    , value    :: expr()
+    , arg      :: expr()
+    , type_hash:: expr()
+    }).
+
+-record(prim_balance,    { address :: expr() }).
+-record(prim_block_hash, { height :: expr() }).
+-record(prim_put,        { state :: expr() }).
+
+-record(integer, {value :: integer()}).
+
+-record(tuple,   {cpts  :: [expr()]}).
+
+-record(list,    {elems :: [expr()]}).
+
+-record(unop,    { op   :: term()
+                 , rand :: expr()}).
+
+-record(binop,   { op   :: term()
+                 , left :: expr()
+                 , right :: expr()}).
+
+-record(ifte,    { decision :: expr()
+                 , then :: expr()
+                 , else :: expr()}).
+
+-record(switch,  { expr  :: expr()
+                 , cases :: [{expr(),expr()}]}).
+
+-record(funcall, { function :: expr()
+                 , args     :: [expr()]}).
+
+-record(lambda,  { args :: arg_list(),
+                   body :: expr()}).
+
+-record(missing_field, { format :: string()
+                       , args   :: [term()]}).
+
+-record(seq, {exprs :: [expr()]}).
+
+-record(event, {topics :: [expr()], payload :: expr()}).

src/aeso_icode_to_asm.erl

@@ -0,0 +1,983 @@
+%%%-------------------------------------------------------------------
+%%% @author Happi (Erik Stenman)
+%%% @copyright (C) 2017, Aeternity Anstalt
+%%% @doc
+%%%     Translator from Aesophia Icode to Aevm Assebly
+%%% @end
+%%% Created : 21 Dec 2017
+%%%
+%%%-------------------------------------------------------------------
+-module(aeso_icode_to_asm).
+
+-export([convert/2]).
+
+-include_lib("aebytecode/include/aeb_opcodes.hrl").
+-include("aeso_icode.hrl").
+
+i(Code) -> aeb_opcodes:mnemonic(Code).
+
+%% We don't track purity or statefulness in the type checker yet.
+is_stateful({FName, _, _, _, _}) -> lists:last(FName) /= "init".
+
+is_public({_Name, Attrs, _Args, _Body, _Type}) -> not lists:member(private, Attrs).
+
+convert(#{ contract_name := _ContractName
+         , state_type := StateType
+         , functions := Functions
+              },
+        _Options) ->
+    %% Create a function dispatcher
+    DispatchFun = {"%main", [], [{"arg", "_"}],
+                   {switch, {var_ref, "arg"},
+                    [{{tuple, [fun_hash(Fun),
+                               {tuple, make_args(Args)}]},
+                      icode_seq([ hack_return_address(Fun, length(Args) + 1) ] ++
+                                [ {funcall, {var_ref, FName}, make_args(Args)}]
+                               )}
+                     || Fun={FName, _, Args, _,_TypeRep} <- Functions, is_public(Fun) ]},
+                   word},
+    NewFunctions = Functions ++ [DispatchFun],
+    %% Create a function environment
+    Funs = [{Name, length(Args), make_ref()}
+            || {Name, _Attrs, Args, _Body, _Type} <- NewFunctions],
+    %% Create dummy code to call the main function with one argument
+    %% taken from the stack
+    StopLabel = make_ref(),
+    StatefulStopLabel = make_ref(),
+    MainFunction = lookup_fun(Funs, "%main"),
+
+    StateTypeValue = aeso_ast_to_icode:type_value(StateType),
+
+    DispatchCode = [%% push two return addresses to stop, one for stateful
+                    %% functions and one for non-stateful functions.
+                    push_label(StatefulStopLabel),
+                    push_label(StopLabel),
+                    %% The calldata is already on the stack when we start. Put
+                    %% it on top (also reorders StatefulStop and Stop).
+                    swap(2),
+
+                    jump(MainFunction),
+                    jumpdest(StatefulStopLabel),
+
+                    %% We need to encode the state type and put it
+                    %% underneath the return value.
+                    assemble_expr(Funs, [], nontail, StateTypeValue), %% StateT Ret
+                    swap(1),                                          %% Ret StateT
+
+                    %% We should also change the state value at address 0 to a
+                    %% pointer to the state value (to allow 0 to represent an
+                    %% unchanged state).
+                    i(?MSIZE),             %% Ptr
+                    push(0), i(?MLOAD),    %% Val Ptr
+                    i(?MSIZE), i(?MSTORE), %% Ptr   Mem[Ptr] := Val
+                    push(0), i(?MSTORE),   %%       Mem[0]   := Ptr
+
+                    %% The pointer to the return value is on top of
+                    %% the stack, but the return instruction takes two
+                    %% stack arguments.
+                    push(0),
+                    i(?RETURN),
+                    jumpdest(StopLabel),
+                    %% Set state pointer to 0 to indicate that we didn't change state
+                    push(0), dup(1), i(?MSTORE),
+                    %% Same as StatefulStopLabel above
+                    push(0),
+                    i(?RETURN)
+                   ],
+    %% Code is a deep list of instructions, containing labels and
+    %% references to them. Labels take the form {'JUMPDEST', Ref}, and
+    %% references take the form {push_label, Ref}, which is translated
+    %% into a PUSH instruction.
+    Code = [assemble_function(Funs, Name, Args, Body)
+            || {Name, _, Args, Body, _Type} <- NewFunctions],
+    resolve_references(
+        [%% i(?COMMENT), "CONTRACT: " ++ ContractName,
+         DispatchCode,
+         Code]).
+
+%% Generate error on correct format.
+
+gen_error(Error) ->
+    error({code_errors, [Error]}).
+
+make_args(Args) ->
+    [{var_ref, [I-1 + $a]} || I <- lists:seq(1, length(Args))].
+
+fun_hash({FName, _, Args, _, TypeRep}) ->
+    ArgType = {tuple, [T || {_, T} <- Args]},
+    <<Hash:256>> = aeb_aevm_abi:function_type_hash(list_to_binary(lists:last(FName)), ArgType, TypeRep),
+    {integer, Hash}.
+
+%% Expects two return addresses below N elements on the stack. Picks the top
+%% one for stateful functions and the bottom one for non-stateful.
+hack_return_address(Fun, N) ->
+    case is_stateful(Fun) of
+        true  -> {inline_asm, [i(?MSIZE)]};
+        false ->
+            {inline_asm,     %% X1 .. XN State NoState
+             [ dup(N + 2)    %% NoState X1 .. XN State NoState
+             , swap(N + 1)   %% State X1 .. XN NoState NoState
+             ]}  %% Top of the stack will be discarded.
+    end.
+
+assemble_function(Funs, Name, Args, Body) ->
+    [jumpdest(lookup_fun(Funs, Name)),
+     assemble_expr(Funs, lists:reverse(Args), tail, Body),
+     %% swap return value and first argument
+     pop_args(length(Args)),
+     swap(1),
+     i(?JUMP)].
+
+%% {seq, Es} - should be "one" operation in terms of stack content
+%% i.e. after the `seq` there should be one new element on the stack.
+assemble_expr(Funs, Stack, Tail, {seq, [E]}) ->
+    assemble_expr(Funs, Stack, Tail, E);
+assemble_expr(Funs, Stack, Tail, {seq, [E | Es]}) ->
+    [assemble_expr(Funs, Stack, nontail, E),
+     assemble_expr(Funs, Stack, Tail, {seq, Es})];
+assemble_expr(_Funs, _Stack, _Tail, {inline_asm, Code}) ->
+    Code;   %% Unsafe! Code should take care to respect the stack!
+assemble_expr(Funs, Stack, _TailPosition, {var_ref, Id}) ->
+    case lists:keymember(Id, 1, Stack) of
+        true ->
+            dup(lookup_var(Id, Stack));
+        false ->
+            %% Build a closure
+            %% When a top-level fun is called directly, we do not
+            %% reach this case.
+            Eta = make_ref(),
+            Continue = make_ref(),
+            [i(?MSIZE),
+             push_label(Eta),
+             dup(2),
+             i(?MSTORE),
+             jump(Continue),
+             %% the code of the closure
+             jumpdest(Eta),
+             %% pop the pointer to the function
+             pop(1),
+             jump(lookup_fun(Funs, Id)),
+             jumpdest(Continue)]
+    end;
+assemble_expr(_, _, _, {missing_field, Format, Args}) ->
+    io:format(Format, Args),
+    gen_error(missing_field);
+assemble_expr(_Funs, _Stack, _, {integer, N}) ->
+    push(N);
+assemble_expr(Funs, Stack, _, {tuple, Cpts}) ->
+    %% We build tuples right-to-left, so that the first write to the
+    %% tuple extends the memory size. Because we use ?MSIZE as the
+    %% heap pointer, we must allocate the tuple AFTER computing the
+    %% first element.
+    %% We store elements into the tuple as soon as possible, to avoid
+    %% keeping them for a long time on the stack.
+    case lists:reverse(Cpts) of
+        [] ->
+            i(?MSIZE);
+        [Last|Rest] ->
+            [assemble_expr(Funs, Stack, nontail, Last),
+             %% allocate the tuple memory
+             i(?MSIZE),
+             %% compute address of last word
+             push(32 * (length(Cpts) - 1)), i(?ADD),
+             %% Stack: <last-value> <pointer>
+             %% Write value to memory (allocates the tuple)
+             swap(1), dup(2), i(?MSTORE),
+             %% Stack: pointer to last word written
+             [[%% Update pointer to next word to be written
+               push(32), swap(1), i(?SUB),
+               %% Compute element
+               assemble_expr(Funs, [pointer|Stack], nontail, A),
+               %% Write element to memory
+               dup(2), i(?MSTORE)]
+               %% And we leave a pointer to the last word written on
+               %% the stack
+              || A <- Rest]]
+            %% The pointer to the entire tuple is on the stack
+    end;
+assemble_expr(_Funs, _Stack, _, {list, []}) ->
+    %% Use Erik's value of -1 for []
+    [push(0), i(?NOT)];
+assemble_expr(Funs, Stack, _, {list, [A|B]}) ->
+    assemble_expr(Funs, Stack, nontail, {tuple, [A, {list, B}]});
+assemble_expr(Funs, Stack, _, {unop, '!', A}) ->
+    case A of
+        {binop, Logical, _, _} when Logical=='&&'; Logical=='||' ->
+            assemble_expr(Funs, Stack, nontail, {ifte, A, {integer, 0}, {integer, 1}});
+        _ ->
+            [assemble_expr(Funs, Stack, nontail, A),
+             i(?ISZERO)
+            ]
+    end;
+assemble_expr(Funs, Stack, _, {event, Topics, Payload}) ->
+    [assemble_exprs(Funs, Stack, Topics ++ [Payload]),
+     case length(Topics) of
+        0 -> i(?LOG0);
+        1 -> i(?LOG1);
+        2 -> i(?LOG2);
+        3 -> i(?LOG3);
+        4 -> i(?LOG4)
+     end, i(?MSIZE)];
+assemble_expr(Funs, Stack, _, {unop, Op, A}) ->
+    [assemble_expr(Funs, Stack, nontail, A),
+     assemble_prefix(Op)];
+assemble_expr(Funs, Stack, Tail, {binop, '&&', A, B}) ->
+    assemble_expr(Funs, Stack, Tail, {ifte, A, B, {integer, 0}});
+assemble_expr(Funs, Stack, Tail, {binop, '||', A, B}) ->
+    assemble_expr(Funs, Stack, Tail, {ifte, A, {integer, 1}, B});
+assemble_expr(Funs, Stack, Tail, {binop, '::', A, B}) ->
+    %% Take advantage of optimizations in tuple construction.
+    assemble_expr(Funs, Stack, Tail, {tuple, [A, B]});
+assemble_expr(Funs, Stack, _, {binop, Op, A, B}) ->
+    %% EEVM binary instructions take their first argument from the top
+    %% of the stack, so to get operands on the stack in the right
+    %% order, we evaluate from right to left.
+    [assemble_expr(Funs, Stack, nontail, B),
+     assemble_expr(Funs, [dummy|Stack], nontail, A),
+     assemble_infix(Op)];
+assemble_expr(Funs, Stack, _, {lambda, Args, Body}) ->
+    Function = make_ref(),
+    FunBody  = make_ref(),
+    Continue = make_ref(),
+    NoMatch  = make_ref(),
+    FreeVars = free_vars({lambda, Args, Body}),
+    {NewVars, MatchingCode} = assemble_pattern(FunBody, NoMatch, {tuple, [{var_ref, "_"}|FreeVars]}),
+    BodyCode = assemble_expr(Funs, NewVars ++ lists:reverse([ {Arg#arg.name, Arg#arg.type} || Arg <- Args ]), tail, Body),
+    [assemble_expr(Funs, Stack, nontail, {tuple, [{label, Function}|FreeVars]}),
+     jump(Continue), %% will be optimized away
+     jumpdest(Function),
+     %% A pointer to the closure is on the stack
+     MatchingCode,
+     jumpdest(FunBody),
+     BodyCode,
+     pop_args(length(Args)+length(NewVars)),
+     swap(1),
+     i(?JUMP),
+     jumpdest(NoMatch), %% dead code--raise an exception just in case
+     push(0),
+     i(?NOT),
+     i(?MLOAD),
+     i(?STOP),
+     jumpdest(Continue)];
+assemble_expr(_, _, _, {label, Label}) ->
+    push_label(Label);
+assemble_expr(Funs, Stack, nontail, {funcall, Fun, Args}) ->
+    Return = make_ref(),
+    %% This is the obvious code:
+    %%   [{push_label, Return},
+    %%    assemble_exprs(Funs, [return_address|Stack], Args++[Fun]),
+    %%    'JUMP',
+    %%    {'JUMPDEST', Return}];
+    %% Its problem is that it stores the return address on the stack
+    %% while the arguments are computed, which is unnecessary. To
+    %% avoid that, we compute the last argument FIRST, and replace it
+    %% with the return address using a SWAP.
+    %%
+    %% assemble_function leaves the code pointer of the function to
+    %% call on top of the stack, and--if the function is not a
+    %% top-level name--a pointer to its tuple of free variables. In
+    %% either case a JUMP is the right way to call it.
+    case Args of
+        [] ->
+            [push_label(Return),
+             assemble_function(Funs, [return_address|Stack], Fun),
+             i(?JUMP),
+             jumpdest(Return)];
+        _ ->
+            {Init, [Last]} = lists:split(length(Args) - 1, Args),
+            [assemble_exprs(Funs, Stack, [Last|Init]),
+             %% Put the return address in the right place, which also
+             %% reorders the args correctly.
+             push_label(Return),
+             swap(length(Args)),
+             assemble_function(Funs, [dummy || _ <- Args] ++ [return_address|Stack], Fun),
+             i(?JUMP),
+             jumpdest(Return)]
+    end;
+assemble_expr(Funs, Stack, tail, {funcall, Fun, Args}) ->
+    IsTopLevel = is_top_level_fun(Stack, Fun),
+    %% If the fun is not top-level, then it may refer to local
+    %% variables and must be computed before stack shuffling.
+    ArgsAndFun = Args++[Fun || not IsTopLevel],
+    ComputeArgsAndFun = assemble_exprs(Funs, Stack, ArgsAndFun),
+    %% Copy arguments back down the stack to the start of the frame
+    ShuffleSpec = lists:seq(length(ArgsAndFun), 1, -1) ++ [discard || _ <- Stack],
+    Shuffle = shuffle_stack(ShuffleSpec),
+    [ComputeArgsAndFun, Shuffle,
+     if IsTopLevel ->
+             %% still need to compute function
+             assemble_function(Funs, [], Fun);
+        true ->
+             %% need to unpack a closure
+             [dup(1), i(?MLOAD)]
+     end,
+     i(?JUMP)];
+assemble_expr(Funs, Stack, Tail, {ifte, Decision, Then, Else}) ->
+    %% This compilation scheme introduces a lot of labels and
+    %% jumps. Unnecessary ones are removed later in
+    %% resolve_references.
+    Close = make_ref(),
+    ThenL = make_ref(),
+    ElseL = make_ref(),
+    [assemble_decision(Funs, Stack, Decision, ThenL, ElseL),
+     jumpdest(ElseL),
+     assemble_expr(Funs, Stack, Tail, Else),
+     jump(Close),
+     jumpdest(ThenL),
+     assemble_expr(Funs, Stack, Tail, Then),
+     jumpdest(Close)
+    ];
+assemble_expr(Funs, Stack, Tail, {switch, A, Cases}) ->
+    Close = make_ref(),
+    [assemble_expr(Funs, Stack, nontail, A),
+     assemble_cases(Funs, Stack, Tail, Close, Cases),
+     {'JUMPDEST', Close}];
+%% State primitives
+%%  (A pointer to) the contract state is stored at address 0.
+assemble_expr(_Funs, _Stack, _Tail, prim_state) ->
+    [push(0), i(?MLOAD)];
+assemble_expr(Funs, Stack, _Tail, #prim_put{ state = State }) ->
+    [assemble_expr(Funs, Stack, nontail, State),
+     push(0), i(?MSTORE),   %% We need something for the unit value on the stack,
+     i(?MSIZE)];            %% MSIZE is the cheapest instruction.
+%% Environment primitives
+assemble_expr(_Funs, _Stack, _Tail, prim_contract_address) ->
+    [i(?ADDRESS)];
+assemble_expr(_Funs, _Stack, _Tail, prim_contract_creator) ->
+    [i(?CREATOR)];
+assemble_expr(_Funs, _Stack, _Tail, prim_call_origin) ->
+    [i(?ORIGIN)];
+assemble_expr(_Funs, _Stack, _Tail, prim_caller) ->
+    [i(?CALLER)];
+assemble_expr(_Funs, _Stack, _Tail, prim_call_value) ->
+    [i(?CALLVALUE)];
+assemble_expr(_Funs, _Stack, _Tail, prim_gas_price) ->
+    [i(?GASPRICE)];
+assemble_expr(_Funs, _Stack, _Tail, prim_gas_left) ->
+    [i(?GAS)];
+assemble_expr(_Funs, _Stack, _Tail, prim_coinbase) ->
+    [i(?COINBASE)];
+assemble_expr(_Funs, _Stack, _Tail, prim_timestamp) ->
+    [i(?TIMESTAMP)];
+assemble_expr(_Funs, _Stack, _Tail, prim_block_height) ->
+    [i(?NUMBER)];
+assemble_expr(_Funs, _Stack, _Tail, prim_difficulty) ->
+    [i(?DIFFICULTY)];
+assemble_expr(_Funs, _Stack, _Tail, prim_gas_limit) ->
+    [i(?GASLIMIT)];
+assemble_expr(Funs, Stack, _Tail, #prim_balance{ address = Addr }) ->
+    [assemble_expr(Funs, Stack, nontail, Addr),
+     i(?BALANCE)];
+assemble_expr(Funs, Stack, _Tail, #prim_block_hash{ height = Height }) ->
+    [assemble_expr(Funs, Stack, nontail, Height),
+     i(?BLOCKHASH)];
+assemble_expr(Funs, Stack, _Tail,
+              #prim_call_contract{ gas      = Gas
+                                 , address  = To
+                                 , value    = Value
+                                 , arg      = Arg
+                                 , type_hash= TypeHash
+                                 }) ->
+    %% ?CALL takes (from the top)
+    %%   Gas, To, Value, Arg, TypeHash, _OOffset,_OSize
+    %% So assemble these in reverse order.
+    [ assemble_exprs(Funs, Stack, [ {integer, 0}, {integer, 0}, TypeHash
+                                  , Arg, Value, To, Gas ])
+    , i(?CALL)
+    ].
+
+
+assemble_exprs(_Funs, _Stack, []) ->
+    [];
+assemble_exprs(Funs, Stack, [E|Es]) ->
+    [assemble_expr(Funs, Stack, nontail, E),
+     assemble_exprs(Funs, [dummy|Stack], Es)].
+
+assemble_decision(Funs, Stack, {binop, '&&', A, B}, Then, Else) ->
+    Label = make_ref(),
+    [assemble_decision(Funs, Stack, A, Label, Else),
+     jumpdest(Label),
+     assemble_decision(Funs, Stack, B, Then, Else)];
+assemble_decision(Funs, Stack, {binop, '||', A, B}, Then, Else) ->
+    Label = make_ref(),
+    [assemble_decision(Funs, Stack, A, Then, Label),
+     jumpdest(Label),
+     assemble_decision(Funs, Stack, B, Then, Else)];
+assemble_decision(Funs, Stack, {unop, '!', A}, Then, Else) ->
+    assemble_decision(Funs, Stack, A, Else, Then);
+assemble_decision(Funs, Stack, {ifte, A, B, C}, Then, Else) ->
+    TrueL  = make_ref(),
+    FalseL = make_ref(),
+    [assemble_decision(Funs, Stack, A, TrueL, FalseL),
+     jumpdest(TrueL),  assemble_decision(Funs, Stack, B, Then, Else),
+     jumpdest(FalseL), assemble_decision(Funs, Stack, C, Then, Else)];
+assemble_decision(Funs, Stack, Decision, Then, Else) ->
+    [assemble_expr(Funs, Stack, nontail, Decision),
+     jump_if(Then), jump(Else)].
+
+%% Entered with value to switch on on top of the stack
+%% Evaluate selected case, then jump to Close with result on the
+%% stack.
+assemble_cases(_Funs, _Stack, _Tail, _Close, []) ->
+    %% No match! What should be do? There's no real way to raise an
+    %% exception, except consuming all the gas.
+    %% There should not be enough gas to do this:
+    [push(1), i(?NOT),
+     i(?MLOAD),
+     %% now stop, so that jump optimizer realizes we will not fall
+     %% through this code.
+     i(?STOP)];
+assemble_cases(Funs, Stack, Tail, Close, [{Pattern, Body}|Cases]) ->
+    Succeed = make_ref(),
+    Fail = make_ref(),
+    {NewVars, MatchingCode} =
+        assemble_pattern(Succeed, Fail, Pattern),
+    %% In the code that follows, if this is NOT the last case, then we
+    %% save the value being switched on, and discard it on
+    %% success. The code is simpler if this IS the last case.
+    [[dup(1) || Cases /= []],   %% save value for next case, if there is one
+     MatchingCode,
+     jumpdest(Succeed),
+     %% Discard saved value, if we saved one
+     [case NewVars of
+          [] ->
+              pop(1);
+          [_] ->
+              %% Special case for peep-hole optimization
+              pop_args(1);
+          _ ->
+              [swap(length(NewVars)), pop(1)]
+      end
+      || Cases/=[]],
+     assemble_expr(Funs,
+                   case Cases of
+                       [] -> NewVars;
+                       _  -> reorder_vars(NewVars)
+                   end
+                   ++Stack, Tail, Body),
+     %% If the Body makes a tail call, then we will not return
+     %% here--but it doesn't matter, because
+     %% (a) the NewVars will be popped before the tailcall
+     %% (b) the code below will be deleted since it is dead
+     pop_args(length(NewVars)),
+     jump(Close),
+     jumpdest(Fail),
+     assemble_cases(Funs, Stack, Tail, Close, Cases)].
+
+%% Entered with value to match on top of the stack.
+%% Generated code removes value, and
+%%   - jumps to Fail if no match, or
+%%   - binds variables, leaves them on the stack, and jumps to Succeed
+%% Result is a list of variables to add to the stack, and the matching
+%% code.
+assemble_pattern(Succeed, Fail, {integer, N}) ->
+    {[], [push(N),
+         i(?EQ),
+         jump_if(Succeed),
+         jump(Fail)]};
+assemble_pattern(Succeed, _Fail, {var_ref, "_"}) ->
+    {[], [i(?POP), jump(Succeed)]};
+assemble_pattern(Succeed, Fail, {missing_field, _, _}) ->
+    %% Missing record fields are quite ok in patterns.
+    assemble_pattern(Succeed, Fail, {var_ref, "_"});
+assemble_pattern(Succeed, _Fail, {var_ref, Id}) ->
+    {[{Id, "_"}], jump(Succeed)};
+assemble_pattern(Succeed, _Fail, {tuple, []}) ->
+    {[], [pop(1), jump(Succeed)]};
+assemble_pattern(Succeed, Fail, {tuple, [A]}) ->
+    %% Treat this case specially, because we don't need to save the
+    %% pointer to the tuple.
+    {AVars, ACode} = assemble_pattern(Succeed, Fail, A),
+    {AVars, [i(?MLOAD),
+            ACode]};
+assemble_pattern(Succeed, Fail, {tuple, [A|B]}) ->
+    %% Entered with the address of the tuple on the top of the
+    %% stack. We will duplicate the address before matching on A.
+    Continue = make_ref(),  %% the label for matching B
+    Pop1Fail = make_ref(),  %% pop 1 word and goto Fail
+    PopNFail = make_ref(),  %% pop length(AVars) words and goto Fail
+    {AVars, ACode} =
+        assemble_pattern(Continue, Pop1Fail, A),
+    {BVars, BCode} =
+        assemble_pattern(Succeed, PopNFail, {tuple, B}),
+    {BVars ++ reorder_vars(AVars),
+     [%% duplicate the pointer so we don't lose it when we match on A
+      dup(1),
+      i(?MLOAD),
+      ACode,
+      jumpdest(Continue),
+      %% Bring the pointer to the top of the stack--this reorders AVars!
+      swap(length(AVars)),
+      push(32),
+      i(?ADD),
+      BCode,
+      case AVars of
+          [] ->
+              [jumpdest(Pop1Fail), pop(1),
+               jumpdest(PopNFail),
+               jump(Fail)];
+          _ ->
+              [{'JUMPDEST', PopNFail}, pop(length(AVars)-1),
+               {'JUMPDEST', Pop1Fail}, pop(1),
+               {push_label, Fail}, 'JUMP']
+      end]};
+assemble_pattern(Succeed, Fail, {list, []}) ->
+    %% [] is represented by -1.
+    {[], [push(1),
+          i(?ADD),
+          jump_if(Fail),
+          jump(Succeed)]};
+assemble_pattern(Succeed, Fail, {list, [A|B]}) ->
+    assemble_pattern(Succeed, Fail, {binop, '::', A, {list, B}});
+assemble_pattern(Succeed, Fail, {binop, '::', A, B}) ->
+    %% Make sure it's not [], then match as tuple.
+    NotNil = make_ref(),
+    {Vars, Code} = assemble_pattern(Succeed, Fail, {tuple, [A, B]}),
+    {Vars, [dup(1), push(1), i(?ADD),   %% Check for [] without consuming the value
+            jump_if(NotNil),            %% so it's still there when matching the tuple.
+            pop(1),                     %% It was [] so discard the saved value.
+            jump(Fail),
+            jumpdest(NotNil),
+            Code]}.
+
+%% When Vars are on the stack, with a value we want to discard
+%% below them, then we swap the top variable with that value and pop.
+%% This reorders the variables on the stack, as follows:
+reorder_vars([]) ->
+    [];
+reorder_vars([V|Vs]) ->
+    Vs ++ [V].
+
+assemble_prefix('sha3') -> [i(?DUP1), i(?MLOAD),          %% length, ptr
+                            i(?SWAP1), push(32), i(?ADD), %% ptr+32, length
+                            i(?SHA3)];
+assemble_prefix('-') -> [push(0), i(?SUB)];
+assemble_prefix('bnot') -> i(?NOT).
+
+assemble_infix('+')    -> i(?ADD);
+assemble_infix('-')    -> i(?SUB);
+assemble_infix('*')    -> i(?MUL);
+assemble_infix('/')    -> i(?SDIV);
+assemble_infix('div')  -> i(?DIV);
+assemble_infix('mod')  -> i(?MOD);
+assemble_infix('^')    -> i(?EXP);
+assemble_infix('bor')  -> i(?OR);
+assemble_infix('band') -> i(?AND);
+assemble_infix('bxor') -> i(?XOR);
+assemble_infix('bsl')  -> i(?SHL);
+assemble_infix('bsr')  -> i(?SHR);
+assemble_infix('<')    -> i(?SLT);    %% comparisons are SIGNED
+assemble_infix('>')    -> i(?SGT);
+assemble_infix('==')   -> i(?EQ);
+assemble_infix('<=')   -> [i(?SGT), i(?ISZERO)];
+assemble_infix('=<')   -> [i(?SGT), i(?ISZERO)];
+assemble_infix('>=')   -> [i(?SLT), i(?ISZERO)];
+assemble_infix('!=')   -> [i(?EQ), i(?ISZERO)];
+assemble_infix('!')    -> [i(?ADD), i(?MLOAD)];
+assemble_infix('byte') -> i(?BYTE).
+%% assemble_infix('::') -> [i(?MSIZE), write_word(0), write_word(1)].
+
+%% a function may either refer to a top-level function, in which case
+%% we fetch the code label from Funs, or it may be a lambda-expression
+%% (including a top-level function passed as a parameter). In the
+%% latter case, the function value is a pointer to a tuple of the code
+%% pointer and the free variables: we keep the pointer and push the
+%% code pointer onto the stack. In either case, we are ready to enter
+%% the function with JUMP.
+assemble_function(Funs, Stack, Fun) ->
+    case is_top_level_fun(Stack, Fun) of
+        true ->
+            {var_ref, Name} = Fun,
+            {push_label, lookup_fun(Funs, Name)};
+        false ->
+            [assemble_expr(Funs, Stack, nontail, Fun),
+             dup(1),
+             i(?MLOAD)]
+    end.
+
+free_vars(V={var_ref, _}) ->
+    [V];
+free_vars({switch, E, Cases}) ->
+    lists:umerge(free_vars(E),
+                 lists:umerge([free_vars(Body)--free_vars(Pattern)
+                               || {Pattern, Body} <- Cases]));
+free_vars({lambda, Args, Body}) ->
+    free_vars(Body) -- [{var_ref, Arg#arg.name} || Arg <- Args];
+free_vars(T) when is_tuple(T) ->
+    free_vars(tuple_to_list(T));
+free_vars([H|T]) ->
+    lists:umerge(free_vars(H), free_vars(T));
+free_vars(_) ->
+    [].
+
+
+
+%% shuffle_stack reorders the stack, for example before a tailcall. It is called
+%% with a description of the current stack, and how the final stack
+%% should appear. The argument is a list containing
+%%   a NUMBER for each element that should be kept, the number being
+%%     the position this element should occupy in the final stack
+%%   discard, for elements that can be discarded.
+%% The positions start at 1, referring to the variable to be placed at
+%% the bottom of the stack, and ranging up to the size of the final stack.
+shuffle_stack([]) ->
+    [];
+shuffle_stack([discard|Stack]) ->
+    [i(?POP) | shuffle_stack(Stack)];
+shuffle_stack([N|Stack]) ->
+    case length(Stack) + 1 - N of
+        0 ->
+            %% the job should be finished
+            CorrectStack = lists:seq(N - 1, 1, -1),
+            CorrectStack = Stack,
+            [];
+        MoveBy ->
+            {Pref, [_|Suff]} = lists:split(MoveBy - 1, Stack),
+            [swap(MoveBy) | shuffle_stack([lists:nth(MoveBy, Stack) | Pref ++ [N|Suff]])]
+    end.
+
+
+
+lookup_fun(Funs, Name) ->
+    case [Ref || {Name1, _, Ref} <- Funs,
+                 Name == Name1] of
+        [Ref] -> Ref;
+        []    -> gen_error({undefined_function, Name})
+    end.
+
+is_top_level_fun(Stack, {var_ref, Id}) ->
+    not lists:keymember(Id, 1, Stack);
+is_top_level_fun(_, _) ->
+    false.
+
+lookup_var(Id, Stack) ->
+    lookup_var(1, Id, Stack).
+
+lookup_var(N, Id, [{Id, _Type}|_]) ->
+    N;
+lookup_var(N, Id, [_|Stack]) ->
+    lookup_var(N + 1, Id, Stack);
+lookup_var(_, Id, []) ->
+    gen_error({var_not_in_scope, Id}).
+
+%% Smart instruction generation
+
+%% TODO: handle references to the stack beyond depth 16. Perhaps the
+%% best way is to repush variables that will be needed in
+%% subexpressions before evaluating he subexpression... i.e. fix the
+%% problem in assemble_expr, rather than here. A fix here would have
+%% to save the top elements of the stack in memory, duplicate the
+%% targetted element, and then repush the values from memory.
+dup(N) when 1 =< N, N =< 16 ->
+    i(?DUP1 + N - 1).
+
+push(N) ->
+    Bytes = binary:encode_unsigned(N),
+    true = size(Bytes) =< 32,
+    [i(?PUSH1 + size(Bytes) - 1) |
+     binary_to_list(Bytes)].
+
+%% Pop N values from UNDER the top element of the stack.
+%% This is a pseudo-instruction so peephole optimization can
+%% combine pop_args(M), pop_args(N) to pop_args(M+N)
+pop_args(0) ->
+    [];
+pop_args(N) ->
+    {pop_args, N}.
+%%    [swap(N), pop(N)].
+
+pop(N) ->
+    [i(?POP) || _ <- lists:seq(1, N)].
+
+swap(0) ->
+    %% Doesn't exist, but is logically a no-op.
+    [];
+swap(N) when 1 =< N, N =< 16 ->
+    i(?SWAP1 + N - 1).
+
+jumpdest(Label)   -> {i(?JUMPDEST), Label}.
+push_label(Label) -> {push_label, Label}.
+
+jump(Label)    -> [push_label(Label), i(?JUMP)].
+jump_if(Label) -> [push_label(Label), i(?JUMPI)].
+
+%% ICode utilities (TODO: move to separate module)
+
+icode_noname() -> #var_ref{name = "_"}.
+
+icode_seq([A]) -> A;
+icode_seq([A | As]) ->
+    icode_seq(A, icode_seq(As)).
+
+icode_seq(A, B) ->
+    #switch{ expr = A, cases = [{icode_noname(), B}] }.
+
+%% Stack: <N elements> ADDR
+%% Write elements at addresses ADDR, ADDR+32, ADDR+64...
+%% Stack afterwards: ADDR
+% write_words(N) ->
+%      [write_word(I) || I <- lists:seq(N-1, 0, -1)].
+
+%% Unused at the moment. Comment out to please dialyzer.
+%% write_word(I) ->
+%%     [%% Stack: elements e ADDR
+%%        swap(1),
+%%        dup(2),
+%%        %% Stack: elements ADDR e ADDR
+%%        push(32*I),
+%%        i(?ADD),
+%%        %% Stack: elements ADDR e ADDR+32I
+%%        i(?MSTORE)].
+
+%% Resolve references, and convert code from deep list to flat list.
+%% List elements are:
+%%   Opcodes
+%%   Byte values
+%%   {'JUMPDEST', Ref}   -- assembles to ?JUMPDEST and sets Ref
+%%   {push_label, Ref}  -- assembles to ?PUSHN address bytes
+
+%% For now, we assemble all code addresses as three bytes.
+
+resolve_references(Code) ->
+    Peephole = peep_hole(lists:flatten(Code)),
+    %% WARNING: Optimizing jumps reorders the code and deletes
+    %% instructions. When debugging the assemble_ functions, it can be
+    %% useful to replace the next line by:
+    %% Instrs = lists:flatten(Code),
+    %% thus disabling the optimization.
+    OptimizedJumps = optimize_jumps(Peephole),
+    Instrs = lists:reverse(peep_hole_backwards(lists:reverse(OptimizedJumps))),
+    Labels = define_labels(0, Instrs),
+    lists:flatten([use_labels(Labels, I) || I <- Instrs]).
+
+define_labels(Addr, [{'JUMPDEST', Lab}|More]) ->
+    [{Lab, Addr}|define_labels(Addr + 1, More)];
+define_labels(Addr, [{push_label, _}|More]) ->
+    define_labels(Addr + 4, More);
+define_labels(Addr, [{pop_args, N}|More]) ->
+    define_labels(Addr + N + 1, More);
+define_labels(Addr, [_|More]) ->
+    define_labels(Addr + 1, More);
+define_labels(_, []) ->
+    [].
+
+use_labels(_, {'JUMPDEST', _}) ->
+    'JUMPDEST';
+use_labels(Labels, {push_label, Ref}) ->
+    case proplists:get_value(Ref, Labels) of
+        undefined ->
+            gen_error({undefined_label, Ref});
+        Addr when is_integer(Addr) ->
+            [i(?PUSH3),
+             Addr div 65536, (Addr div 256) rem 256, Addr rem 256]
+    end;
+use_labels(_, {pop_args, N}) ->
+    [swap(N), pop(N)];
+use_labels(_, I) ->
+    I.
+
+%% Peep-hole optimization.
+%% The compilation of conditionals can introduce jumps depending on
+%% constants 1 and 0. These are removed by peep-hole optimization.
+
+peep_hole(['PUSH1', 0, {push_label, _}, 'JUMPI'|More]) ->
+    peep_hole(More);
+peep_hole(['PUSH1', 1, {push_label, Lab}, 'JUMPI'|More]) ->
+    [{push_label, Lab}, 'JUMP'|peep_hole(More)];
+peep_hole([{pop_args, M}, {pop_args, N}|More]) when M + N =< 16 ->
+    peep_hole([{pop_args, M + N}|More]);
+peep_hole([I|More]) ->
+    [I|peep_hole(More)];
+peep_hole([]) ->
+    [].
+
+%% Peep-hole optimization on reversed instructions lists.
+
+peep_hole_backwards(Code) ->
+    NewCode = peep_hole_backwards1(Code),
+    if Code == NewCode -> Code;
+       true            -> peep_hole_backwards(NewCode)
+    end.
+
+peep_hole_backwards1(['ADD', 0, 'PUSH1'|Code]) ->
+    peep_hole_backwards1(Code);
+peep_hole_backwards1(['POP', UnOp|Code]) when UnOp=='MLOAD';UnOp=='ISZERO';UnOp=='NOT' ->
+    peep_hole_backwards1(['POP'|Code]);
+peep_hole_backwards1(['POP', BinOp|Code]) when
+    %% TODO: more binary operators
+    BinOp=='ADD';BinOp=='SUB';BinOp=='MUL';BinOp=='SDIV' ->
+    peep_hole_backwards1(['POP', 'POP'|Code]);
+peep_hole_backwards1(['POP', _, 'PUSH1'|Code]) ->
+    peep_hole_backwards1(Code);
+peep_hole_backwards1([I|Code]) ->
+    [I|peep_hole_backwards1(Code)];
+peep_hole_backwards1([]) ->
+    [].
+
+%% Jump optimization:
+%%   Replaces a jump to a jump with a jump to the final destination
+%%   Moves basic blocks to eliminate an unconditional jump to them.
+
+%% The compilation of conditionals generates a lot of labels and
+%% jumps, some of them unnecessary. This optimization phase reorders
+%% code so that as many jumps as possible can be eliminated, and
+%% replaced by just falling through to the destination label. This
+%% both optimizes the code generated by conditionals, and converts one
+%% call of a function into falling through into its code--so it
+%% reorders code quite aggressively. Function returns are indirect
+%% jumps, however, and are never optimized away.
+
+%% IMPORTANT: since execution begins at address zero, then the first
+%% block of code must never be moved elsewhere. The code below has
+%% this property, because it processes blocks from left to right, and
+%% because the first block does not begin with a label, and so can
+%% never be jumped to--hence no code can be inserted before it.
+
+%% The optimization works by taking one block of code at a time, and
+%% then prepending blocks that jump directly to it, and appending
+%% blocks that it jumps directly to, resulting in a jump-free sequence
+%% that is as long as possible. To do so, we store blocks in the form
+%% {OptionalLabel, Body, OptionalJump} which represents the code block
+%% OptionalLabel++Body++OptionalJump; the optional parts are the empty
+%% list of instructions if not present.  Two blocks can be merged if
+%% the first ends in an OptionalJump to the OptionalLabel beginning
+%% the second; the OptionalJump can then be removed (and the
+%% OptionalLabel if there are no other references to it--this happens
+%% during dead code elimination.
+
+%% TODO: the present implementation is QUADRATIC, because we search
+%% repeatedly for matching blocks to merge with the first one, storing
+%% the blocks in a list. A near linear time implementation could use
+%% two ets tables, one keyed on the labels, and the other keyed on the
+%% final jumps.
+
+optimize_jumps(Code) ->
+    JJs = jumps_to_jumps(Code),
+    ShortCircuited = [short_circuit_jumps(JJs, Instr) || Instr <- Code],
+    NoDeadCode = eliminate_dead_code(ShortCircuited),
+    MovedCode = merge_blocks(moveable_blocks(NoDeadCode)),
+    %% Moving code may have made some labels superfluous.
+    eliminate_dead_code(MovedCode).
+
+
+jumps_to_jumps([{'JUMPDEST', Label}, {push_label, Target}, 'JUMP'|More]) ->
+    [{Label, Target}|jumps_to_jumps(More)];
+jumps_to_jumps([{'JUMPDEST', Label}, {'JUMPDEST', Target}|More]) ->
+    [{Label, Target}|jumps_to_jumps([{'JUMPDEST', Target}|More])];
+jumps_to_jumps([_|More]) ->
+    jumps_to_jumps(More);
+jumps_to_jumps([]) ->
+    [].
+
+short_circuit_jumps(JJs, {push_label, Lab}) ->
+    case proplists:get_value(Lab, JJs) of
+        undefined ->
+            {push_label, Lab};
+        Target ->
+            %% I wonder if this will ever loop infinitely?
+            short_circuit_jumps(JJs, {push_label, Target})
+    end;
+short_circuit_jumps(_JJs, Instr) ->
+    Instr.
+
+eliminate_dead_code(Code) ->
+    Jumps = lists:usort([Lab || {push_label, Lab} <- Code]),
+    NewCode = live_code(Jumps, Code),
+    if Code==NewCode ->
+            Code;
+       true ->
+            eliminate_dead_code(NewCode)
+    end.
+
+live_code(Jumps, ['JUMP'|More]) ->
+    ['JUMP'|dead_code(Jumps, More)];
+live_code(Jumps, ['STOP'|More]) ->
+    ['STOP'|dead_code(Jumps, More)];
+live_code(Jumps, [{'JUMPDEST', Lab}|More]) ->
+    case lists:member(Lab, Jumps) of
+        true ->
+            [{'JUMPDEST', Lab}|live_code(Jumps, More)];
+        false ->
+            live_code(Jumps, More)
+    end;
+live_code(Jumps, [I|More]) ->
+    [I|live_code(Jumps, More)];
+live_code(_, []) ->
+    [].
+
+dead_code(Jumps, [{'JUMPDEST', Lab}|More]) ->
+    case lists:member(Lab, Jumps) of
+        true ->
+            [{'JUMPDEST', Lab}|live_code(Jumps, More)];
+        false ->
+            dead_code(Jumps, More)
+    end;
+dead_code(Jumps, [_I|More]) ->
+    dead_code(Jumps, More);
+dead_code(_, []) ->
+    [].
+
+%% Split the code into "moveable blocks" that control flow only
+%% reaches via jumps.
+moveable_blocks([]) ->
+    [];
+moveable_blocks([I]) ->
+    [[I]];
+moveable_blocks([Jump|More]) when Jump=='JUMP'; Jump=='STOP' ->
+    [[Jump]|moveable_blocks(More)];
+moveable_blocks([I|More]) ->
+    [Block|MoreBlocks] = moveable_blocks(More),
+    [[I|Block]|MoreBlocks].
+
+%% Merge blocks to eliminate jumps where possible.
+merge_blocks(Blocks) ->
+    BlocksAndTargets = [label_and_jump(B) || B <- Blocks],
+    [I || {Pref, Body, Suff} <- merge_after(BlocksAndTargets),
+          I <- Pref++Body++Suff].
+
+%% Merge the first block with other blocks that come after it
+merge_after(All=[{Label, Body, [{push_label, Target}, 'JUMP']}|BlocksAndTargets]) ->
+    case [{B, J} || {[{'JUMPDEST', L}], B, J} <- BlocksAndTargets,
+                   L == Target] of
+        [{B, J}|_] ->
+            merge_after([{Label, Body ++ [{'JUMPDEST', Target}] ++ B, J}|
+                         lists:delete({[{'JUMPDEST', Target}], B, J},
+                                      BlocksAndTargets)]);
+        [] ->
+            merge_before(All)
+    end;
+merge_after(All) ->
+    merge_before(All).
+
+%% The first block cannot be merged with any blocks that it jumps
+%% to... but maybe it can be merged with a block that jumps to it!
+merge_before([Block={[{'JUMPDEST', Label}], Body, Jump}|BlocksAndTargets]) ->
+    case [{L, B, T} || {L, B, [{push_label, T}, 'JUMP']} <- BlocksAndTargets,
+                     T == Label] of
+        [{L, B, T}|_] ->
+            merge_before([{L, B ++ [{'JUMPDEST', Label}] ++ Body, Jump}
+                          |lists:delete({L, B, [{push_label, T}, 'JUMP']}, BlocksAndTargets)]);
+        _ ->
+            [Block | merge_after(BlocksAndTargets)]
+    end;
+merge_before([Block|BlocksAndTargets]) ->
+    [Block | merge_after(BlocksAndTargets)];
+merge_before([]) ->
+    [].
+
+%% Convert each block to a PREFIX, which is a label or empty, a
+%% middle, and a SUFFIX which is a JUMP to a label, or empty.
+label_and_jump(B) ->
+    {Label, B1} = case B of
+                     [{'JUMPDEST', L}|More1] ->
+                         {[{'JUMPDEST', L}], More1};
+                     _ ->
+                         {[], B}
+                 end,
+    {Target, B2} = case lists:reverse(B1) of
+                      ['JUMP', {push_label, T}|More2] ->
+                          {[{push_label, T}, 'JUMP'], lists:reverse(More2)};
+                      _ ->
+                          {[], B1}
+                  end,
+    {Label, B2, Target}.

src/aeso_parse_lib.erl

@@ -15,8 +15,7 @@
          many/1, many1/1, sep/2, sep1/2,
          infixl/2, infixr/2]).
 
--export([current_file/0, set_current_file/1,
-         current_include_type/0, set_current_include_type/1]).
+-export([current_file/0, set_current_file/1]).
 
 %% -- Types ------------------------------------------------------------------
 
@@ -75,31 +74,25 @@
                     %%   first argument. I.e. no backtracking to the second argument if the first
                     %%   fails.
 
-trampoline({bounce, Cont}) when is_function(Cont, 0) ->
-    trampoline(Cont());
-trampoline(Res) ->
-    Res.
--define(BOUNCE(X), {bounce, fun() -> X end}).
-
 %% Apply a parser to its continuation. This compiles a parser to its low-level representation.
 -spec apply_p(parser(A), fun((A) -> parser1(B))) -> parser1(B).
 apply_p(?lazy(F), K)           -> apply_p(F(), K);
 apply_p(?fail(Err), _)         -> {fail, Err};
-apply_p(?choice([P | Ps]), K)  -> lists:foldl(fun(Q, R) -> choice1(trampoline(apply_p(Q, K)), R) end,
-                                              trampoline(apply_p(P, K)), Ps);
+apply_p(?choice([P | Ps]), K)  -> lists:foldl(fun(Q, R) -> choice1(apply_p(Q, K), R) end,
+                                             apply_p(P, K), Ps);
 apply_p(?bind(P, F), K)        -> apply_p(P, fun(X) -> apply_p(F(X), K) end);
 apply_p(?right(P, Q), K)       -> apply_p(P, fun(_) -> apply_p(Q, K) end);
 apply_p(?left(P, Q), K)        -> apply_p(P, fun(X) -> apply_p(Q, fun(_) -> K(X) end) end);
 apply_p(?map(F, P), K)         -> apply_p(P, fun(X) -> K(F(X)) end);
 apply_p(?layout, K)            -> {layout, K, {fail, {expected, layout_block}}};
 apply_p(?tok(Atom), K)         -> {tok_bind, #{Atom => K}};
-apply_p(?return(X), K)         -> ?BOUNCE(K(X));
+apply_p(?return(X), K)         -> K(X);
 apply_p([P | Q], K)            -> apply_p(P, fun(H) -> apply_p(Q, fun(T) -> K([H | T]) end) end);
 apply_p(T, K) when is_tuple(T) -> apply_p(tuple_to_list(T), fun(Xs) -> K(list_to_tuple(Xs)) end);
 apply_p(M, K) when is_map(M) ->
     {Keys, Ps} = lists:unzip(maps:to_list(M)),
     apply_p(Ps, fun(Vals) -> K(maps:from_list(lists:zip(Keys, Vals))) end);
-apply_p(X, K) -> ?BOUNCE(K(X)).
+apply_p(X, K) -> K(X).
 
 %% -- Primitive combinators --------------------------------------------------
 
@@ -167,7 +160,7 @@ layout() -> ?layout.
 %% @doc Parse a sequence of tokens using a parser. Fails if the parse is ambiguous.
 -spec parse(parser(A), tokens()) -> {ok, A} | {error, term()}.
 parse(P, S) ->
-  case parse1(trampoline(apply_p(P, fun(X) -> {return_plus, X, {fail, no_error}} end)), S) of
+  case parse1(apply_p(P, fun(X) -> {return_plus, X, {fail, no_error}} end), S) of
     {[], {Pos, Err}} -> {error, {add_current_file(Pos), parse_error, flatten_error(Err)}};
     {[A], _}         -> {ok, A};
     {As, _}          -> {error, {{1, 1}, ambiguous_parse, As}}
@@ -248,7 +241,7 @@ col(T)  when is_tuple(T) -> element(2, pos(T)).
 
 %% If both parsers want the next token we grab it and merge the continuations.
 choice1({tok_bind, Map1}, {tok_bind, Map2}) ->
-    {tok_bind, merge_with(fun(F, G) -> fun(T) -> choice1(trampoline(F(T)), trampoline(G(T))) end end, Map1, Map2)};
+    {tok_bind, merge_with(fun(F, G) -> fun(T) -> choice1(F(T), G(T)) end end, Map1, Map2)};
 
 %% If both parsers fail we combine the error messages. If only one fails we discard it.
 choice1({fail, E1}, {fail, E2})             -> {fail, add_error(E1, E2)};
@@ -262,7 +255,7 @@ choice1(P, {return_plus, X, Q})             -> {return_plus, X, choice1(P, Q)};
 %% If both sides want a layout block we combine them. If only one side wants a layout block we
 %% will commit to a layout block is there is one.
 choice1({layout, F, P}, {layout, G, Q})     ->
-    {layout, fun(N) -> choice1(trampoline(F(N)), trampoline(G(N))) end, choice1(P, Q)};
+    {layout, fun(N) -> choice1(F(N), G(N)) end, choice1(P, Q)};
 choice1({layout, F, P}, Q)                  -> {layout, F, choice1(P, Q)};
 choice1(P, {layout, G, Q})                  -> {layout, G, choice1(P, Q)}.
 
@@ -285,8 +278,6 @@ parse1(P, S) ->
 %% The main work horse. Returns a list of possible parses and an error message in case parsing
 %% fails.
 -spec parse1(parser1(A), #ts{}, [A], term()) -> {[A], error()}.
-parse1({bounce, F}, Ts, Acc, Err) ->
-    parse1(F(), Ts, Acc, Err);
 parse1({tok_bind, Map}, Ts, Acc, Err) ->
     case next_token(Ts) of
         {T, Ts1} ->
@@ -364,6 +355,7 @@ unexpected_token_error(Ts, Expect, T) ->
               {con, _, X}   when ExpectId               -> io_lib:format(" Did you mean ~s?", [mk_lower(X)]);
               {qcon, _, Xs} when ExpectCon              -> io_lib:format(" Did you mean ~s?", [lists:last(Xs)]);
               {qid, _,  Xs} when ExpectId               -> io_lib:format(" Did you mean ~s?", [lists:last(Xs)]);
+              {return, _} -> " [Polite reminder that Sophia is not JavaScript]";
               _ -> ""
           end,
     mk_error(Ts, io_lib:format("Unexpected ~s.~s", [describe(T), Fix])).
@@ -466,13 +458,6 @@ merge_with(Fun, Map1, Map2) ->
                         end, Map2, maps:to_list(Map1))
     end.
 
-%% Current include type
-current_include_type() ->
-    get('$current_include_type').
-
-set_current_include_type(IncludeType) ->
-    put('$current_include_type', IncludeType).
-
 %% Current source file
 current_file() ->
     get('$current_file').

src/aeso_parse_lib.hrl

@@ -9,14 +9,12 @@
         false -> fail()
     end).
 
--define(RULE(A,                      Do), map(fun(_1) ->                               Do end, A                       )).
--define(RULE(A, B,                   Do), map(fun({_1, _2}) ->                         Do end, {A, B}                  )).
--define(RULE(A, B, C,                Do), map(fun({_1, _2, _3}) ->                     Do end, {A, B, C}               )).
--define(RULE(A, B, C, D,             Do), map(fun({_1, _2, _3, _4}) ->                 Do end, {A, B, C, D}            )).
--define(RULE(A, B, C, D, E,          Do), map(fun({_1, _2, _3, _4, _5}) ->             Do end, {A, B, C, D, E}         )).
--define(RULE(A, B, C, D, E, F,       Do), map(fun({_1, _2, _3, _4, _5, _6}) ->         Do end, {A, B, C, D, E, F}      )).
--define(RULE(A, B, C, D, E, F, G,    Do), map(fun({_1, _2, _3, _4, _5, _6, _7}) ->     Do end, {A, B, C, D, E, F, G}   )).
--define(RULE(A, B, C, D, E, F, G, H, Do), map(fun({_1, _2, _3, _4, _5, _6, _7, _8}) -> Do end, {A, B, C, D, E, F, G, H})).
+-define(RULE(A,                Do), map(fun(_1) ->                       Do end, A                 )).
+-define(RULE(A, B,             Do), map(fun({_1, _2}) ->                 Do end, {A, B}            )).
+-define(RULE(A, B, C,          Do), map(fun({_1, _2, _3}) ->             Do end, {A, B, C}         )).
+-define(RULE(A, B, C, D,       Do), map(fun({_1, _2, _3, _4}) ->         Do end, {A, B, C, D}      )).
+-define(RULE(A, B, C, D, E,    Do), map(fun({_1, _2, _3, _4, _5}) ->     Do end, {A, B, C, D, E}   )).
+-define(RULE(A, B, C, D, E, F, Do), map(fun({_1, _2, _3, _4, _5, _6}) -> Do end, {A, B, C, D, E, F})).
 
 -import(aeso_parse_lib,
         [tok/1, tok/2, between/3, many/1, many1/1, sep/2, sep1/2,

src/aeso_parser.erl

@@ -3,34 +3,20 @@
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
 -module(aeso_parser).
--compile({no_auto_import,[map_get/2]}).
 
 -export([string/1,
          string/2,
          string/3,
-         auto_imports/1,
          hash_include/2,
-         decl/0,
-         type/0,
-         body/0,
-         maybe_block/1,
-         run_parser/2,
-         run_parser/3]).
+         type/1]).
 
 -include("aeso_parse_lib.hrl").
--import(aeso_parse_lib, [current_file/0, set_current_file/1,
-                         current_include_type/0, set_current_include_type/1]).
+-import(aeso_parse_lib, [current_file/0, set_current_file/1]).
 
--type parse_result() :: aeso_syntax:ast() | {aeso_syntax:ast(), sets:set(include_hash())} | none().
+-type parse_result() :: aeso_syntax:ast() | none().
 
 -type include_hash() :: {string(), binary()}.
 
-
-escape_errors({ok, Ok}) ->
-    Ok;
-escape_errors({error, Err}) ->
-    parse_error(Err).
-
 -spec string(string()) -> parse_result().
 string(String) ->
     string(String, sets:new(), []).
@@ -44,25 +30,27 @@ string(String, Opts) ->
 
 -spec string(string(), sets:set(include_hash()), aeso_compiler:options()) -> parse_result().
 string(String, Included, Opts) ->
-    AST = run_parser(file(), String, Opts),
-    case expand_includes(AST, Included, Opts) of
-        {ok, AST1}   -> AST1;
-        {error, Err} -> parse_error(Err)
+    case parse_and_scan(file(), String, Opts) of
+        {ok, AST} ->
+            case expand_includes(AST, Included, Opts) of
+                {ok, AST1}   -> AST1;
+                {error, Err} -> parse_error(Err)
+            end;
+        {error, Err} ->
+            parse_error(Err)
     end.
 
-
-run_parser(P, Inp) ->
-    escape_errors(parse_and_scan(P, Inp, [])).
-run_parser(P, Inp, Opts) ->
-    escape_errors(parse_and_scan(P, Inp, Opts)).
+type(String) ->
+    case parse_and_scan(type(), String, []) of
+        {ok, AST}    -> {ok, AST};
+        {error, Err} -> {error, [mk_error(Err)]}
+    end.
 
 parse_and_scan(P, S, Opts) ->
     set_current_file(proplists:get_value(src_file, 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);
-        {error, {{Input, Pos}, _}} ->
-            {error, {Pos, scan_error, Input}}
+        Error        -> Error
     end.
 
 -dialyzer({nowarn_function, parse_error/1}).
@@ -72,8 +60,8 @@ parse_error(Err) ->
 mk_p_err(Pos, Msg) ->
     aeso_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)).
 
-mk_error({Pos, scan_error, Input}) ->
-    mk_p_err(Pos, io_lib:format("Lexical error on input: ~s\n", [Input]));
+mk_error({Pos, ScanE}) when ScanE == scan_error; ScanE == scan_error_no_state ->
+    mk_p_err(Pos, "Scan error\n");
 mk_error({Pos, parse_error, Err}) ->
     Msg = io_lib:format("~s\n", [Err]),
     mk_p_err(Pos, Msg);
@@ -95,36 +83,10 @@ decl() ->
     ?LAZY_P(
     choice(
       %% Contract declaration
-    [ ?RULE(token(main), keyword(contract),
-            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})
-    , ?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})
-    , ?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}))
-    , ?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}))
-    , ?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}))
-    , ?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(contract),  con(), tok('='), maybe_block(decl()), {contract, _1, _2, _4})
+    , ?RULE(token(payable),     keyword(contract), con(), tok('='), maybe_block(decl()), add_modifiers([_1], {contract, _2, _3, _5}))
     , ?RULE(keyword(namespace), con(), tok('='), maybe_block(decl()), {namespace, _1, _2, _4})
     , ?RULE(keyword(include),   str(), {include, get_ann(_1), _2})
-    , using()
-    , pragma()
 
       %% Type declarations  TODO: format annotation for "type bla" vs "type bla()"
     , ?RULE(keyword(type),     id(),                                          {type_decl, _1, _2, []})
@@ -137,46 +99,13 @@ decl() ->
     , ?RULE(keyword(datatype), id(), type_vars(), tok('='), typedef(variant), {type_def, _1, _2, _3, _5})
 
       %% Function declarations
-    , ?RULE(modifiers(), fun_or_entry(), maybe_block(fundef_or_decl()), fun_block(_1, _2, _3))
-    , ?RULE(keyword('let'), valdef(), set_pos(get_pos(_1), _2))
+    , ?RULE(modifiers(), fun_or_entry(), id(), tok(':'), type(), add_modifiers(_1, _2, {fun_decl, get_ann(_2), _3, _5}))
+    , ?RULE(modifiers(), fun_or_entry(), fundef(),               add_modifiers(_1, _2, set_pos(get_pos(get_ann(_2)), _3)))
+    , ?RULE(keyword('let'),    valdef(),                         set_pos(get_pos(_1), _2))
     ])).
 
-fun_block(Mods, Kind, [Decl]) ->
-    add_modifiers(Mods, Kind, set_pos(get_pos(Kind), Decl));
-fun_block(Mods, Kind, Decls) ->
-    {block, get_ann(Kind), [ add_modifiers(Mods, Kind, Decl) || Decl <- Decls ]}.
-
-fundef_or_decl() ->
-    choice([?RULE(id(), tok(':'), type(), {fun_decl, get_ann(_1), _1, _3}),
-            fundef()]).
-
-using() ->
-    Alias = {keyword(as), con()},
-    For = ?RULE(keyword(for), bracket_list(id()), {for, _2}),
-    Hiding = ?RULE(keyword(hiding), bracket_list(id()), {hiding, _2}),
-    ?RULE(keyword(using), con(), optional(Alias), optional(choice(For, Hiding)), using(get_ann(_1), _2, _3, _4)).
-
-using(Ann, Con, none, none) ->
-    {using, Ann, Con, none, none};
-using(Ann, Con, {ok, {_, Alias}}, none) ->
-    {using, Ann, Con, Alias, none};
-using(Ann, Con, none, {ok, List}) ->
-    {using, Ann, Con, none, List};
-using(Ann, Con, {ok, {_, Alias}}, {ok, List}) ->
-    {using, Ann, Con, Alias, List}.
-
-pragma() ->
-    Op = choice([token(T) || T <- ['<', '=<', '==', '>=', '>']]),
-    ?RULE(tok('@'), id("compiler"), Op, version(), {pragma, get_ann(_1), {compiler, element(1, _3), _4}}).
-
-version() ->
-    ?RULE(token(int), many({tok('.'), token(int)}), mk_version(_1, _2)).
-
-mk_version({int, _, Maj}, Rest) ->
-    [Maj | [N || {_, {int, _, N}} <- Rest]].
-
 fun_or_entry() ->
-    choice([?RULE(keyword(function),   {function,   _1}),
+    choice([?RULE(keyword(function), {function, _1}),
             ?RULE(keyword(entrypoint), {entrypoint, _1})]).
 
 modifiers() ->
@@ -223,30 +152,22 @@ letdecl() ->
 letdef() -> choice(valdef(), fundef()).
 
 valdef() ->
-    ?RULE(pattern(), tok('='), body(), {letval, [], _1, _3}).
-
-guarded_fundefs() ->
     choice(
-    [ ?RULE(keyword('='), body(), [{guarded, _1, [], _2}])
-    , maybe_block(?RULE(keyword('|'), comma_sep(expr()), tok('='), body(), {guarded, _1, _2, _4}))
-    ]).
+        ?RULE(id(),                   tok('='), body(), {letval, [], _1, type_wildcard(), _3}),
+        ?RULE(id(), tok(':'), type(), tok('='), body(), {letval, [], _1, _3, _5})).
 
 fundef() ->
     choice(
-    [ ?RULE(id(), args(),                   guarded_fundefs(), {letfun, get_ann(_1), _1, _2, type_wildcard(get_ann(_1)), _3})
-    , ?RULE(id(), args(), tok(':'), type(), guarded_fundefs(), {letfun, get_ann(_1), _1, _2, _4, _5})
+    [ ?RULE(id(), args(),                   tok('='), body(), {letfun, [], _1, _2, type_wildcard(), _4})
+    , ?RULE(id(), args(), tok(':'), type(), tok('='), body(), {letfun, [], _1, _2, _4, _6})
     ]).
 
-args() -> paren_list(pattern()).
-lam_args() -> paren_list(arg()).
+args() -> paren_list(arg()).
 
 arg() -> choice(
-    ?RULE(id(),                   {arg, get_ann(_1), _1, type_wildcard(get_ann(_1))}),
+    ?RULE(id(),                   {arg, get_ann(_1), _1, type_wildcard()}),
     ?RULE(id(), tok(':'), type(), {arg, get_ann(_1), _1, _3})).
 
-letpat() ->
-    ?RULE(keyword('('), id(), tok('='), pattern(), tok(')'), {letpat, get_ann(_1), _2, _4}).
-
 %% -- Types ------------------------------------------------------------------
 
 type_vars() -> paren_list(tvar()).
@@ -293,8 +214,7 @@ body() ->
 
 stmt() ->
     ?LAZY_P(choice(
-    [ using()
-    , expr()
+    [ expr()
     , letdecl()
     , {switch, keyword(switch), parens(expr()), maybe_block(branch())}
     , {'if', keyword('if'), parens(expr()), body()}
@@ -303,16 +223,10 @@ stmt() ->
     ])).
 
 branch() ->
-    ?RULE(pattern(), guarded_branches(), {'case', get_ann(lists:nth(1, _2)), _1, _2}).
-
-guarded_branches() ->
-    choice(
-    [ ?RULE(keyword('=>'), body(), [{guarded, _1, [], _2}])
-    , maybe_block(?RULE(tok('|'), comma_sep(expr()), keyword('=>'), body(), {guarded, _3, _2, _4}))
-    ]).
+    ?RULE(pattern(), keyword('=>'), body(), {'case', _2, _1, _3}).
 
 pattern() ->
-    ?LET_P(E, expr(), parse_pattern(E)).
+    ?LET_P(E, expr500(), parse_pattern(E)).
 
 %% -- Expressions ------------------------------------------------------------
 
@@ -320,18 +234,17 @@ expr() -> expr100().
 
 expr100() ->
     Expr100 = ?LAZY_P(expr100()),
-    Expr150 = ?LAZY_P(expr150()),
+    Expr200 = ?LAZY_P(expr200()),
     choice(
-    [ ?RULE(lam_args(), keyword('=>'), body(), {lam, _2, _1, _3})   %% TODO: better location
-    , {'if', keyword('if'), parens(Expr100), Expr150, right(tok(else), Expr100)}
-    , ?RULE(Expr150, optional(right(tok(':'), type())),
+    [ ?RULE(args(), keyword('=>'), body(), {lam, _2, _1, _3})   %% TODO: better location
+    , {'if', keyword('if'), parens(Expr100), Expr200, right(tok(else), Expr100)}
+    , ?RULE(Expr200, optional(right(tok(':'), type())),
             case _2 of
                 none       -> _1;
                 {ok, Type} -> {typed, get_ann(_1), _1, Type}
             end)
     ]).
 
-expr150() -> infixl(expr200(), binop('|>')).
 expr200() -> infixr(expr300(), binop('||')).
 expr300() -> infixr(expr400(), binop('&&')).
 expr400() -> infix(expr500(),  binop(['<', '>', '=<', '>=', '==', '!='])).
@@ -347,7 +260,7 @@ exprAtom() ->
     ?LAZY_P(begin
         Expr = ?LAZY_P(expr()),
         choice(
-        [ id_or_addr(), con(), token(qid), token(qcon), binop_as_lam()
+        [ id_or_addr(), con(), token(qid), token(qcon)
         , token(bytes), token(string), token(char)
         , token(int)
         , ?RULE(token(hex), set_ann(format, hex, setelement(1, _1, int)))
@@ -358,13 +271,9 @@ exprAtom() ->
         , ?RULE(keyword('['), Expr, token('|'), comma_sep(comprehension_exp()), tok(']'), list_comp_e(_1, _2, _4))
         , ?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()
@@ -376,7 +285,7 @@ comprehension_if() ->
     ?RULE(keyword('if'), parens(expr()), {comprehension_if, _1, _2}).
 
 comprehension_bind() ->
-    ?RULE(pattern(), tok('<-'), expr(), {comprehension_bind, _1, _3}).
+    ?RULE(id(), tok('<-'), expr(), {comprehension_bind, _1, _3}).
 
 arg_expr() ->
     ?LAZY_P(
@@ -428,9 +337,7 @@ record(Fs) ->
                         bad_expr_err("Cannot use '@' in map construction", infix({lvalue, FAnn, LV}, {'@', Ann}, Id));
                     ({field, FAnn, LV, _}) ->
                         bad_expr_err("Cannot use nested fields or keys in map construction", {lvalue, FAnn, LV}) end,
-            {map, Ann, lists:map(KV, Fs)};
-        record_or_map_error ->
-            {record_or_map_error, get_ann(hd(Fs)), Fs}
+            {map, Ann, lists:map(KV, Fs)}
     end.
 
 record_or_map(Fields) ->
@@ -442,7 +349,9 @@ record_or_map(Fields) ->
     case lists:usort(lists:map(Kind, Fields)) of
         [proj]    -> record;
         [map_get] -> map;
-        _         -> record_or_map_error %% Defer error until type checking
+        _         ->
+            [{field, Ann, _, _} | _] = Fields,
+            bad_expr_err("Mixed record fields and map keys in", {record, Ann, Fields})
     end.
 
 field_assignment() ->
@@ -487,19 +396,6 @@ id()       -> token(id).
 tvar()     -> token(tvar).
 str()      -> token(string).
 
-binop_as_lam() ->
-    BinOps = ['&&', '||',
-              '+', '-', '*', '/', '^', 'mod',
-              '==', '!=', '<', '>', '<=', '=<', '>=',
-              '::', '++', '|>'],
-    OpToLam = fun(Op = {_, Ann}) ->
-                  IdL = {id, Ann, "l"},
-                  IdR = {id, Ann, "r"},
-                  Arg = fun(Id) -> {arg, Ann, Id, type_wildcard(Ann)} end,
-                  {lam, Ann, [Arg(IdL), Arg(IdR)], infix(IdL, Op, IdR)}
-              end,
-    ?RULE(parens(choice(lists:map(fun token/1, BinOps))), OpToLam(_1)).
-
 token(Tag) ->
     ?RULE(tok(Tag),
     case _1 of
@@ -510,7 +406,7 @@ token(Tag) ->
 id(Id) ->
     ?LET_P({id, A, X} = Y, id(),
            if X == Id -> Y;
-              true    -> fail({A, "expected '" ++ Id ++ "'"})
+              true    -> fail({A, "expected 'bytes'"})
            end).
 
 id_or_addr() ->
@@ -554,11 +450,7 @@ bracket_list(P) -> brackets(comma_sep(P)).
 -type ann_col()  :: aeso_syntax:ann_col().
 
 -spec pos_ann(ann_line(), ann_col()) -> ann().
-pos_ann(Line, Col) ->
-    [ {file, current_file()}
-    , {include_type, current_include_type()}
-    , {line, Line}
-    , {col, Col} ].
+pos_ann(Line, Col) -> [{file, current_file()}, {line, Line}, {col, Col}].
 
 ann_pos(Ann) ->
     {proplists:get_value(file, Ann),
@@ -590,8 +482,8 @@ infix(L, Op, R) -> set_ann(format, infix,  {app, get_ann(L), Op, [L, R]}).
 prefixes(Ops, E) -> lists:foldr(fun prefix/2, E, Ops).
 prefix(Op, E)    -> set_ann(format, prefix, {app, get_ann(Op), Op, [E]}).
 
-type_wildcard(Ann) ->
-    {id, [{origin, system} | Ann], "_"}.
+type_wildcard() ->
+    {id, [{origin, system}], "_"}.
 
 block_e(Stmts) ->
     group_ifs(Stmts, []).
@@ -639,13 +531,9 @@ tuple_e(Ann, Exprs)   -> {tuple, Ann, Exprs}.
 list_comp_e(Ann, Expr, Binds) -> {list_comp, Ann, Expr, Binds}.
 
 -spec parse_pattern(aeso_syntax:expr()) -> aeso_parse_lib:parser(aeso_syntax:pat()).
-parse_pattern({letpat, Ann, Id, Pat}) ->
-    {letpat, Ann, Id, parse_pattern(Pat)};
 parse_pattern({app, Ann, Con = {'::', _}, Es}) ->
     {app, Ann, Con, lists:map(fun parse_pattern/1, Es)};
-parse_pattern({app, Ann, {'-', _}, [{int, _, N}]}) ->
-    {int, Ann, -N};
-parse_pattern({app, Ann, Con = {Tag, _, _}, Es}) when Tag == con; Tag == qcon ->
+parse_pattern({app, Ann, Con = {con, _, _}, Es}) ->
     {app, Ann, Con, lists:map(fun parse_pattern/1, Es)};
 parse_pattern({tuple, Ann, Es}) ->
     {tuple, Ann, lists:map(fun parse_pattern/1, Es)};
@@ -653,10 +541,7 @@ parse_pattern({list, Ann, Es}) ->
     {list, Ann, lists:map(fun parse_pattern/1, Es)};
 parse_pattern({record, Ann, Fs}) ->
     {record, Ann, lists:map(fun parse_field_pattern/1, Fs)};
-parse_pattern({typed, Ann, E, Type}) ->
-    {typed, Ann, parse_pattern(E), Type};
 parse_pattern(E = {con, _, _})    -> E;
-parse_pattern(E = {qcon, _, _})   -> E;
 parse_pattern(E = {id, _, _})     -> E;
 parse_pattern(E = {int, _, _})    -> E;
 parse_pattern(E = {bool, _, _})   -> E;
@@ -687,28 +572,17 @@ expand_includes(AST, Included, Opts) ->
              || File <- lists:usort(auto_imports(AST)) ] ++ AST,
     expand_includes(AST1, Included, [], Opts).
 
-expand_includes([], Included, Acc, Opts) ->
-    case lists:member(keep_included, Opts) of
-        false ->
-            {ok, lists:reverse(Acc)};
-        true ->
-            {ok, {lists:reverse(Acc), Included}}
-    end;
+expand_includes([], _Included, Acc, _Opts) ->
+    {ok, lists:reverse(Acc)};
 expand_includes([{include, Ann, {string, _SAnn, File}} | AST], Included, Acc, Opts) ->
     case get_include_code(File, Ann, Opts) of
         {ok, Code} ->
             Hashed = hash_include(File, Code),
             case sets:is_element(Hashed, Included) of
                 false ->
-                    SrcFile = proplists:get_value(src_file, Opts, no_file),
-                    IncludeType = case proplists:get_value(file, Ann) of
-                                      SrcFile -> direct;
-                                      _       -> indirect
-                                  end,
                     Opts1 = lists:keystore(src_file, 1, Opts, {src_file, File}),
-                    Opts2 = lists:keystore(include_type, 1, Opts1, {include_type, IncludeType}),
                     Included1 = sets:add_element(Hashed, Included),
-                    case parse_and_scan(file(), Code, Opts2) of
+                    case parse_and_scan(file(), Code, Opts1) of
                         {ok, AST1} ->
                             expand_includes(AST1 ++ AST, Included1, Acc, Opts);
                         Err = {error, _} ->
@@ -733,39 +607,16 @@ read_file(File, Opts) ->
             case maps:get(binary_to_list(File), Files, not_found) of
                 not_found -> {error, not_found};
                 Src       -> {ok, Src}
-            end;
-        escript ->
-            try
-                Escript        = escript:script_name(),
-                {ok, Sections} = escript:extract(Escript, []),
-                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, Src};
-                    _                -> {error, not_found}
-                end
-            catch _:_ ->
-                {error, not_found}
             end
     end.
 
 stdlib_options() ->
-    StdLibDir = aeso_stdlib:stdlib_include_path(),
-    case filelib:is_dir(StdLibDir) of
-        true  -> [{include, {file_system, [StdLibDir]}}];
-        false -> [{include, escript}]
-    end.
+    [{include, {file_system, [aeso_stdlib:stdlib_include_path()]}}].
 
 get_include_code(File, Ann, Opts) ->
     case {read_file(File, Opts), read_file(File, stdlib_options())} of
-        {{ok, 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, binary_to_list(Bin)}
-            end;
+        {{ok, _}, {ok,_ }} ->
+            fail(ann_pos(Ann), "Illegal redefinition of standard library " ++ File);
         {_, {ok, Bin}} ->
             {ok, binary_to_list(Bin)};
         {{ok, Bin}, _} ->

src/aeso_pretty.erl

@@ -13,8 +13,6 @@
 
 -export_type([options/0]).
 
--include("aeso_utils.hrl").
-
 -type doc() :: prettypr:document().
 -type options() :: [{indent, non_neg_integer()} | show_generated].
 
@@ -133,10 +131,6 @@ typed(A, Type) ->
         false -> follow(hsep(A, text(":")), type(Type))
     end.
 
-contract_head(contract_main)      -> text("main contract");
-contract_head(contract_child)     -> text("contract");
-contract_head(contract_interface) -> text("contract interface").
-
 %% -- Exports ----------------------------------------------------------------
 
 -spec decls([aeso_syntax:decl()], options()) -> doc().
@@ -151,34 +145,22 @@ 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) ->
-    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));
+decl({contract, _, C, Ds}) ->
+    block(follow(text("contract"), 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);
 decl({type_decl, _, T, Vars}) -> typedecl(alias_t, T, Vars);
 decl({type_def, _, T, Vars, Def}) ->
     Kind = element(1, Def),
     equals(typedecl(Kind, T, Vars), typedef(Def));
 decl({fun_decl, Ann, F, T}) ->
-    Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
-                  text(atom_to_list(Mod));
-             (_) -> empty() end,
     Fun = case aeso_syntax:get_ann(entrypoint, Ann, false) of
             true  -> text("entrypoint");
             false -> text("function")
           end,
-    hsep(lists:map(Mod, Ann) ++ [Fun, typed(name(F), T)]);
+    hsep(Fun, typed(name(F), T));
 decl(D = {letfun, Attrs, _, _, _, _}) ->
-    Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
+    Mod = fun({Mod, true}) when Mod == private; Mod == stateful ->
                             text(atom_to_list(Mod));
              (_) -> empty() end,
     Fun = case aeso_syntax:get_ann(entrypoint, Attrs, false) of
@@ -186,15 +168,7 @@ decl(D = {letfun, Attrs, _, _, _, _}) ->
               false -> "function"
           end,
     hsep(lists:map(Mod, Attrs) ++ [letdecl(Fun, D)]);
-decl({fun_clauses, Ann, Name, Type, Clauses}) ->
-    above([ decl(D) || D <- [{fun_decl, Ann, Name, Type} | Clauses] ]);
-decl(D = {letval, _, _, _}) -> letdecl("let", D);
-decl({block, _, Ds}) ->
-    above([ decl(D) || D <- Ds ]).
-
--spec pragma(aeso_syntax:pragma()) -> doc().
-pragma({compiler, Op, Ver}) ->
-    text("@compiler " ++ atom_to_list(Op) ++ " " ++ string:join([integer_to_list(N) || N <- Ver], ".")).
+decl(D = {letval, _, _, _, _}) -> letdecl("let", D).
 
 -spec expr(aeso_syntax:expr(), options()) -> doc().
 expr(E, Options) ->
@@ -214,12 +188,10 @@ name({tvar, _, Name})  -> text(Name);
 name({typed, _, Name, _}) -> name(Name).
 
 -spec letdecl(string(), aeso_syntax:letbind()) -> doc().
-letdecl(Let, {letval, _, P, E}) ->
-    block_expr(0, hsep([text(Let), expr(P), text("=")]), E);
-letdecl(Let, {letfun, _, F, Args, T, [GuardedBody]}) ->
-    beside(hsep([text(Let), typed(beside(name(F), expr({tuple, [], Args})), T)]), guarded_body(GuardedBody, "="));
-letdecl(Let, {letfun, _, F, Args, T, GuardedBodies}) ->
-    block(hsep([text(Let), typed(beside(name(F), expr({tuple, [], Args})), T)]), above(lists:map(fun(GB) -> guarded_body(GB, "=") end, GuardedBodies))).
+letdecl(Let, {letval, _, F, T, E}) ->
+    block_expr(0, hsep([text(Let), typed(name(F), T), text("=")]), E);
+letdecl(Let, {letfun, _, F, Args, T, E}) ->
+    block_expr(0, hsep([text(Let), typed(beside(name(F), args(Args)), T), text("=")]), E).
 
 -spec args([aeso_syntax:arg()]) -> doc().
 args(Args) ->
@@ -261,8 +233,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}) ->
@@ -278,8 +248,6 @@ type({args_t, _, Args}) ->
 type({bytes_t, _, any}) -> text("bytes(_)");
 type({bytes_t, _, Len}) ->
     text(lists:concat(["bytes(", Len, ")"]));
-type({if_t, _, Id, Then, Else}) ->
-    beside(text("if"), args_type([Id, Then, Else]));
 type({named_arg_t, _, Name, Type, _Default}) ->
     %% Drop the default value
     %% follow(hsep(typed(name(Name), Type), text("=")), expr(Default));
@@ -290,9 +258,7 @@ type(T = {id, _, _})   -> name(T);
 type(T = {qid, _, _})  -> name(T);
 type(T = {con, _, _})  -> name(T);
 type(T = {qcon, _, _}) -> name(T);
-type(T = {tvar, _, _}) -> name(T);
-
-type(var_args) -> text("var_args").
+type(T = {tvar, _, _}) -> name(T).
 
 -spec args_type([aeso_syntax:type()]) -> doc().
 args_type(Args) ->
@@ -308,11 +274,12 @@ tuple_type(Factors) ->
       , text(")")
       ]).
 
--spec expr_p(integer(), aeso_syntax:arg_expr()) -> doc().
-expr_p(P, {letpat, _, Id, Pat}) ->
-    paren(P > 100, follow(hsep(expr(Id), text("=")), expr(Pat)));
-expr_p(P, {named_arg, _, Name, E}) ->
-    paren(P > 100, follow(hsep(expr(Name), text("=")), expr(E)));
+-spec arg_expr(aeso_syntax:arg_expr()) -> doc().
+arg_expr({named_arg, _, Name, E}) ->
+    follow(hsep(expr(Name), text("=")), expr(E));
+arg_expr(E) -> expr(E).
+
+-spec expr_p(integer(), aeso_syntax:expr()) -> doc().
 expr_p(P, {lam, _, Args, E}) ->
     paren(P > 100, follow(hsep(args(Args), text("=>")), expr_p(100, E)));
 expr_p(P, If = {'if', Ann, Cond, Then, Else}) ->
@@ -333,8 +300,6 @@ expr_p(_, {tuple, _, Es}) ->
     tuple(lists:map(fun expr/1, Es));
 expr_p(_, {list, _, Es}) ->
     list(lists:map(fun expr/1, Es));
-expr_p(_, {list_comp, _, E, Binds}) ->
-    list([follow(expr(E), hsep(text("|"), par(punctuate(text(","), lists:map(fun lc_bind/1, Binds)), 0)), 0)]);
 expr_p(_, {record, _, Fs}) ->
     record(lists:map(fun field/1, Fs));
 expr_p(_, {map, Ann, KVs}) ->
@@ -388,19 +353,13 @@ expr_p(_, {Type, _, Bin})
          Type == oracle_query_id ->
     text(binary_to_list(aeser_api_encoder:encode(Type, Bin)));
 expr_p(_, {string, _, <<>>}) -> text("\"\"");
-expr_p(_, {string, _, S}) ->
-    text(io_lib:format("\"~s\"", [binary_to_list(S)]));
+expr_p(_, {string, _, S}) -> term(binary_to_list(S));
 expr_p(_, {char, _, C}) ->
     case C of
         $' -> text("'\\''");
         $" -> text("'\"'");
-        _ when C < 16#80 ->
-            S = lists:flatten(io_lib:format("~p", [[C]])),
-            text("'" ++ tl(lists:droplast(S)) ++ "'");
-        _  ->
-            S = lists:flatten(
-                  io_lib:format("'~ts'", [list_to_binary(aeso_scan:utf8_encode([C]))])),
-            text(S)
+        _  -> S = lists:flatten(io_lib:format("~p", [[C]])),
+              text("'" ++ tl(lists:droplast(S)) ++ "'")
     end;
 %% -- Names
 expr_p(_, E = {id, _, _})   -> name(E);
@@ -423,18 +382,10 @@ stmt_p({else, Else}) ->
         _ -> block_expr(200, text("else"), Else)
     end.
 
-lc_bind({comprehension_bind, P, E}) ->
-    follow(hsep(expr(P), text("<-")), expr(E));
-lc_bind({comprehension_if, _, E}) ->
-    beside([text("if("), expr(E), text(")")]);
-lc_bind(Let) ->
-    letdecl("let", Let).
-
 -spec bin_prec(aeso_syntax:bin_op()) -> {integer(), integer(), integer()}.
 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};
@@ -473,7 +424,7 @@ prefix(P, Op, A) ->
 app(P, F, Args) ->
     paren(P > 900,
     beside(expr_p(900, F),
-           tuple(lists:map(fun expr/1, Args)))).
+           tuple(lists:map(fun arg_expr/1, Args)))).
 
 field({field, _, LV, E}) ->
     follow(hsep(lvalue(LV), text("=")), expr(E));
@@ -493,18 +444,8 @@ elim1(Proj={proj, _, _})      -> beside(text("."), elim(Proj));
 elim1(Get={map_get, _, _})    -> elim(Get);
 elim1(Get={map_get, _, _, _}) -> elim(Get).
 
-alt({'case', _, Pat, [GuardedBody]}) ->
-    beside(expr(Pat), guarded_body(GuardedBody, "=>"));
-alt({'case', _, Pat, GuardedBodies}) ->
-    block(expr(Pat), above(lists:map(fun(GB) -> guarded_body(GB, "=>") end, GuardedBodies))).
-
-guarded_body({guarded, _, Guards, Body}, Then) ->
-    block_expr(0, hsep(guards(Guards), text(Then)), Body).
-
-guards([]) ->
-    text("");
-guards(Guards) ->
-    hsep([text(" |"), par(punctuate(text(","), lists:map(fun expr/1, Guards)), 0)]).
+alt({'case', _, Pat, Body}) ->
+    block_expr(0, hsep(expr_p(500, Pat), text("=>")), Body).
 
 block_expr(_, Header, {block, _, Ss}) ->
     block(Header, statements(Ss));
@@ -514,7 +455,7 @@ block_expr(P, Header, E) ->
 statements(Stmts) ->
     above([ statement(S) || S <- Stmts ]).
 
-statement(S = {letval, _, _, _})       -> letdecl("let", S);
+statement(S = {letval, _, _, _, _})    -> letdecl("let", S);
 statement(S = {letfun, _, _, _, _, _}) -> letdecl("let", S);
 statement(E) -> expr(E).
 
@@ -527,3 +468,6 @@ get_elifs(If = {'if', Ann, Cond, Then, Else}, Elifs) ->
     end;
 get_elifs(Else, Elifs) -> {lists:reverse(Elifs), {else, Else}}.
 
+fmt(Fmt, Args) -> text(lists:flatten(io_lib:format(Fmt, Args))).
+term(X) -> fmt("~p", [X]).
+

src/aeso_scan.erl

@@ -7,34 +7,27 @@
 %%%-------------------------------------------------------------------
 -module(aeso_scan).
 
--export([scan/1, utf8_encode/1]).
+-export([scan/1]).
 
 -import(aeso_scan_lib, [token/1, token/2, symbol/0, skip/0,
                         override/2, push/2, pop/1]).
 
 lexer() ->
-    Number   = fun(Digit) -> [Digit, "+(_", Digit, "+)*"] end,
     DIGIT    = "[0-9]",
     HEXDIGIT = "[0-9a-fA-F]",
     LOWER    = "[a-z_]",
     UPPER    = "[A-Z]",
     CON      = [UPPER, "[a-zA-Z0-9_]*"],
-    INT      = Number(DIGIT),
-    HEX      = ["0x", Number(HEXDIGIT)],
-    BYTES    = ["#", Number(HEXDIGIT)],
+    INT      = [DIGIT, "+"],
+    HEX      = ["0x", HEXDIGIT, "+"],
+    BYTES    = ["#", HEXDIGIT, "+"],
     WS       = "[\\000-\\ ]+",
     ID       = [LOWER, "[a-zA-Z0-9_']*"],
     TVAR     = ["'", ID],
     QID      = ["(", CON, "\\.)+", ID],
     QCON     = ["(", CON, "\\.)+", CON],
     OP       = "[=!<>+\\-*/:&|?~@^]+",
-    %% Five cases for a character
-    %%  * 1 7-bit ascii, not \ or '
-    %%  * 2-4 8-bit values (UTF8)
-    %%  * \ followed by a known modifier [aernrtv]
-    %%  * \xhh
-    %%  * \x{hhh...}
-    CHAR     = "'(([\\x00-\\x26\\x28-\\x5b\\x5d-\\x7f])|([\\x00-\\xff][\\x80-\\xff]{1,3})|(\\\\[befnrtv'\\\\])|(\\\\x[0-9a-fA-F]{2,2})|(\\\\x\\{[0-9a-fA-F]*\\}))'",
+    CHAR     = "'([^'\\\\]|(\\\\.))'",
     STRING   = "\"([^\"\\\\]|(\\\\.))*\"",
 
     CommentStart = {"/\\*", push(comment, skip())},
@@ -45,8 +38,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"
-               ],
+                "return"],
     KW = string:join(Keywords, "|"),
 
     Rules =
@@ -62,7 +54,7 @@ lexer() ->
         , {CHAR,   token(char,   fun parse_char/1)}
         , {STRING, token(string, fun parse_string/1)}
         , {HEX,    token(hex,    fun parse_hex/1)}
-        , {INT,    token(int,    fun parse_int/1)}
+        , {INT,    token(int,    fun list_to_integer/1)}
         , {BYTES,  token(bytes,  fun parse_bytes/1)}
 
           %% Identifiers (qualified first!)
@@ -85,34 +77,34 @@ scan(String) ->
 %% -- Helpers ----------------------------------------------------------------
 
 parse_string([$" | Chars]) ->
-    unicode:characters_to_nfc_binary(unescape(Chars)).
+    unescape(Chars).
 
-parse_char([$' | Chars]) ->
-    case unicode:characters_to_nfc_list(unescape($', Chars, [])) of
-        [Char] -> Char;
-        _Bad   -> {error, "Bad character literal: '" ++ Chars}
-    end.
-
-utf8_encode(Cs) ->
-    binary_to_list(unicode:characters_to_binary(Cs)).
-
-unescape(Str) -> unescape($", Str, []).
-
-unescape(Delim, [Delim], Acc) ->
-    list_to_binary(lists:reverse(Acc));
-unescape(Delim, [$\\, $x, ${ | Chars ], Acc) ->
-    {Ds, [_ | Cs]} = lists:splitwith(fun($}) -> false ; (_) -> true end, Chars),
-    C = list_to_integer(Ds, 16),
-    Utf8Cs = binary_to_list(unicode:characters_to_binary([C])),
-    unescape(Delim, Cs, [Utf8Cs | Acc]);
-unescape(Delim, [$\\, $x, D1, D2 | Chars ], Acc) ->
-    C = list_to_integer([D1, D2], 16),
-    Utf8Cs = binary_to_list(unicode:characters_to_binary([C])),
-    unescape(Delim, Chars, [Utf8Cs | Acc]);
-unescape(Delim, [$\\, Code | Chars], Acc) ->
-    Ok = fun(C) -> unescape(Delim, Chars, [C | Acc]) end,
+parse_char([$', $\\, Code, $']) ->
     case Code of
-        Delim -> Ok(Delim);
+        $'  -> $';
+        $\\ -> $\\;
+        $b  -> $\b;
+        $e  -> $\e;
+        $f  -> $\f;
+        $n  -> $\n;
+        $r  -> $\r;
+        $t  -> $\t;
+        $v  -> $\v;
+        _   -> {error, "Bad control sequence: \\" ++ [Code]}
+    end;
+parse_char([$', C, $']) -> C.
+
+unescape(Str) -> unescape(Str, []).
+
+unescape([$"], Acc) ->
+    list_to_binary(lists:reverse(Acc));
+unescape([$\\, $x, D1, D2 | Chars ], Acc) ->
+    C = list_to_integer([D1, D2], 16),
+    unescape(Chars, [C | Acc]);
+unescape([$\\, Code | Chars], Acc) ->
+    Ok = fun(C) -> unescape(Chars, [C | Acc]) end,
+    case Code of
+        $"  -> Ok($");
         $\\ -> Ok($\\);
         $b  -> Ok($\b);
         $e  -> Ok($\e);
@@ -123,21 +115,13 @@ unescape(Delim, [$\\, Code | Chars], Acc) ->
         $v  -> Ok($\v);
         _   -> error("Bad control sequence: \\" ++ [Code])  %% TODO
     end;
-unescape(Delim, [C | Chars], Acc) ->
-    unescape(Delim, Chars, [C | Acc]).
+unescape([C | Chars], Acc) ->
+    unescape(Chars, [C | Acc]).
 
-strip_underscores(S) ->
-    lists:filter(fun(C) -> C /= $_ end, S).
+parse_hex("0x" ++ Chars) -> list_to_integer(Chars, 16).
 
-parse_hex("0x" ++ S) ->
-    list_to_integer(strip_underscores(S), 16).
-
-parse_int(S) ->
-    list_to_integer(strip_underscores(S)).
-
-parse_bytes("#" ++ S0) ->
-    S      = strip_underscores(S0),
-    N      = list_to_integer(S, 16),
-    Digits = (length(S) + 1) div 2,
+parse_bytes("#" ++ Chars) ->
+    N      = list_to_integer(Chars, 16),
+    Digits = (length(Chars) + 1) div 2,
     <<N:Digits/unit:8>>.
 

src/aeso_syntax.erl

@@ -13,7 +13,7 @@
 -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]).
 -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]).
@@ -25,8 +25,7 @@
 -type ann_origin() :: system | user.
 -type ann_format() :: '?:' | hex | infix | prefix | elif.
 
--type ann() :: [ {line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()}
-               | stateful | private | payable | main | interface | entrypoint].
+-type ann() :: [{line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()} | stateful | private].
 
 -type name() :: string().
 -type id()   :: {id,   ann(), name()}.
@@ -35,39 +34,16 @@
 -type qcon() :: {qcon, ann(), [name()]}.
 -type tvar() :: {tvar, ann(), name()}.
 
--type namespace_alias() :: none | con().
--type namespace_parts() :: none | {for, [id()]} | {hiding, [id()]}.
-
--type decl() :: {contract_main, ann(), con(), [con()], [decl()]}
-              | {contract_child, ann(), con(), [con()], [decl()]}
-              | {contract_interface, ann(), con(), [con()], [decl()]}
+-type decl() :: {contract, 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_decl, ann(), id(), [tvar()]}
               | {type_def, ann(), id(), [tvar()], typedef()}
-              | {fun_clauses, ann(), id(), type(), [letfun() | fundecl()]}
-              | {block, ann(), [decl()]}
-              | {using, ann(), con(), namespace_alias(), namespace_parts()}
-              | fundecl()
-              | letfun()
-              | letval(). % Only for error msgs
-
--type compiler_version() :: [non_neg_integer()].
-
--type pragma() :: {compiler, '==' | '<' | '>' | '=<' | '>=', compiler_version()}.
-
--type guard() :: expr().
--type guarded_expr() :: {guarded, ann(), [guard()], expr()}.
-
--type letval()  :: {letval, ann(), pat(), expr()}.
--type letfun()  :: {letfun, ann(), id(), [pat()], type(), [guarded_expr(),...]}.
--type letpat()  :: {letpat, ann(), id(), pat()}.
--type fundecl() :: {fun_decl, ann(), id(), type()}.
+              | {fun_decl, ann(), id(), type()}
+              | letbind().
 
 -type letbind()
-    :: letfun()
-     | letval().
+    :: {letval, ann(), id(), type(), expr()}
+     | {letfun, ann(), id(), [arg()], type(), expr()}.
 
 -type arg() :: {arg, ann(), id(), type()}.
 
@@ -106,7 +82,7 @@
 
 -type bin_op() :: '+' | '-' | '*' | '/' | mod | '^'
                 | '++' | '::' | '<' | '>' | '=<' | '>=' | '==' | '!='
-                | '||' | '&&' | '..' | '|>'.
+                | '||' | '&&' | '..'.
 -type un_op() :: '-' | '!'.
 
 -type expr()
@@ -119,20 +95,18 @@
      | {list, ann(), [expr()]}
      | {list_comp, ann(), expr(), [comprehension_exp()]}
      | {typed, ann(), expr(), type()}
-     | {record_or_map(), ann(), [field(expr())]}
-     | {record_or_map(), ann(), expr(), [field(expr())]} %% record/map update
+     | {record, ann(), [field(expr())]}
+     | {record, ann(), expr(), [field(expr())]} %% record update
+     | {map, ann(), expr(), [field(expr())]}    %% map update
      | {map, ann(), [{expr(), expr()}]}
      | {map_get, ann(), expr(), expr()}
      | {map_get, ann(), expr(), expr(), expr()}
      | {block, ann(), [stmt()]}
      | {op(), ann()}
      | id() | qid() | con() | qcon()
-     | constant()
-     | letpat().
+     | constant().
 
--type record_or_map() :: record | map | record_or_map_error.
-
--type comprehension_exp() :: [ {comprehension_bind, pat(), expr()}
+-type comprehension_exp() :: [ {comprehension_bind, id(), expr()}
                              | {comprehension_if, ann(), expr()}
                              | letbind() ].
 
@@ -149,7 +123,7 @@
 -type stmt() :: letbind()
               | expr().
 
--type alt() :: {'case', ann(), pat(), [guarded_expr(),...]}.
+-type alt() :: {'case', ann(), pat(), expr()}.
 
 -type lvalue() :: nonempty_list(elim()).
 
@@ -160,9 +134,7 @@
 -type pat() :: {app, ann(), con() | op(), [pat()]}
              | {tuple, ann(), [pat()]}
              | {list, ann(), [pat()]}
-             | {typed, ann(), pat(), type()}
              | {record, ann(), [field(pat())]}
-             | letpat()
              | constant()
              | con()
              | id().

src/aeso_syntax_utils.erl

@@ -41,15 +41,15 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
     Top = Fun(K, X),
     Rec = case X of
             %% lists (bound things in head scope over tail)
-            [A | As]                      -> Scoped(Same(A), Same(As));
+            [A | As]                 -> Scoped(Same(A), Same(As));
             %% decl()
-            {contract, _, _, Ds}          -> Decl(Ds);
-            {namespace, _, _, Ds}         -> Decl(Ds);
-            {type_def, _, I, _, D}        -> Plus(BindType(I), Decl(D));
-            {fun_decl, _, _, T}           -> Type(T);
-            {letval, _, P, E}             -> Scoped(BindExpr(P), Expr(E));
-            {letfun, _, F, Xs, T, GEs} -> Sum([BindExpr(F), Type(T), Expr(Xs ++ GEs)]);
-            {fun_clauses, _, _, T, Cs}    -> Sum([Type(T) | [Decl(C) || C <- Cs]]);
+            {contract, _, _, Ds}     -> Decl(Ds);
+            {namespace, _, _, Ds}    -> Decl(Ds);
+            {type_decl, _, I, _}     -> BindType(I);
+            {type_def, _, I, _, D}   -> Plus(BindType(I), Decl(D));
+            {fun_decl, _, _, T}      -> Type(T);
+            {letval, _, F, T, E}     -> Sum([BindExpr(F), Type(T), Expr(E)]);
+            {letfun, _, F, Xs, T, E} -> Sum([BindExpr(F), Type(T), Expr(Xs ++ [E])]);
             %% typedef()
             {alias_t, T}    -> Type(T);
             {record_t, Fs}  -> Type(Fs);
@@ -76,8 +76,8 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
                 Plus(Expr(E), Scoped(BindExpr(I), Expr({list_comp, A, Y, R})));
             {list_comp, A, Y, [{comprehension_if, _, E}|R]} ->
                 Plus(Expr(E), Expr({list_comp, A, Y, R}));
-            {list_comp, A, Y, [D = {letval, _, Pat, _} | R]} ->
-                Plus(Decl(D), Scoped(BindExpr(Pat), Expr({list_comp, A, Y, R})));
+            {list_comp, A, Y, [D = {letval, _, F, _, _} | R]} ->
+                Plus(Decl(D), Scoped(BindExpr(F), Expr({list_comp, A, Y, R})));
             {list_comp, A, Y, [D = {letfun, _, F, _, _, _} | R]} ->
                 Plus(Decl(D), Scoped(BindExpr(F), Expr({list_comp, A, Y, R})));
             {typed, _, E, T}       -> Plus(Expr(E), Type(T));
@@ -88,15 +88,13 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
             {map_get, _, A, B}     -> Expr([A, B]);
             {map_get, _, A, B, C}  -> Expr([A, B, C]);
             {block, _, Ss}         -> Expr(Ss);
-            {letpat, _, X, P}      -> Plus(BindExpr(X), Expr(P));
-            {guarded, _, Gs, E}    -> Expr([E | Gs]);
             %% field()
             {field, _, LV, E}    -> Expr([LV, E]);
             {field, _, LV, _, E} -> Expr([LV, E]);
             %% arg()
             {arg, _, Y, T} -> Plus(BindExpr(Y), Type(T));
             %% alt()
-            {'case', _, P, GEs} -> Scoped(BindExpr(P), Expr(GEs));
+            {'case', _, P, E} -> Scoped(BindExpr(P), Expr(E));
             %% elim()
             {proj, _, _}    -> Zero;
             {map_get, _, E} -> Expr(E);

src/aeso_utils.hrl

@@ -1,6 +0,0 @@
--define(IS_CONTRACT_HEAD(X),
-        (X =:= contract_main orelse
-         X =:= contract_interface orelse
-         X =:= contract_child
-        )
-       ).

src/aeso_vm_decode.erl

@@ -1,25 +1,77 @@
 %%%-------------------------------------------------------------------
 %%% @copyright (C) 2017, Aeternity Anstalt
-%%% @doc Decoding fate data to AST
+%%% @doc Decoding aevm and fate data to AST
+%%%
 %%% @end
 %%%-------------------------------------------------------------------
 
 -module(aeso_vm_decode).
 
--export([ from_fate/2 ]).
+-export([ from_aevm/3, from_fate/2 ]).
 
 -include_lib("aebytecode/include/aeb_fate_data.hrl").
 
+address_literal(Type, N) -> {Type, [], <<N:256>>}.
+
+-spec from_aevm(aeb_aevm_data:type(), aeso_syntax:type(), aeb_aevm_data:data()) -> aeso_syntax:expr().
+from_aevm(word, {id, _, "address"},                     N) -> address_literal(account_pubkey, N);
+from_aevm(word, {app_t, _, {id, _, "oracle"}, _},       N) -> address_literal(oracle_pubkey, N);
+from_aevm(word, {app_t, _, {id, _, "oracle_query"}, _}, N) -> address_literal(oracle_query_id, N);
+from_aevm(word, {con, _, _Name},                        N) -> address_literal(contract_pubkey, N);
+from_aevm(word, {id, _, "int"},     N) -> <<N1:256/signed>> = <<N:256>>, {int, [], N1};
+from_aevm(word, {id, _, "bits"},    N) -> error({todo, bits, N});
+from_aevm(word, {id, _, "bool"},    N) -> {bool, [], N /= 0};
+from_aevm(word, {bytes_t, _, Len}, Val) when Len =< 32 ->
+    <<Bytes:Len/unit:8, _/binary>> = <<Val:32/unit:8>>,
+    {bytes, [], <<Bytes:Len/unit:8>>};
+from_aevm({tuple, _}, {bytes_t, _, Len}, Val) ->
+    {bytes, [], binary:part(<< <<W:32/unit:8>> || W <- tuple_to_list(Val) >>, 0, Len)};
+from_aevm(string, {id, _, "string"}, S) -> {string, [], S};
+from_aevm({list, VmType}, {app_t, _, {id, _, "list"}, [Type]}, List) ->
+    {list, [], [from_aevm(VmType, Type, X) || X <- List]};
+from_aevm({variant, [[], [VmType]]}, {app_t, _, {id, _, "option"}, [Type]}, Val) ->
+    case Val of
+        {variant, 0, []}  -> {con, [], "None"};
+        {variant, 1, [X]} -> {app, [], {con, [], "Some"}, [from_aevm(VmType, Type, X)]}
+    end;
+from_aevm({tuple, VmTypes}, {tuple_t, _, Types}, Val)
+        when length(VmTypes) == length(Types),
+             length(VmTypes) == tuple_size(Val) ->
+    {tuple, [], [from_aevm(VmType, Type, X)
+                 || {VmType, Type, X} <- lists:zip3(VmTypes, Types, tuple_to_list(Val))]};
+from_aevm({tuple, VmTypes}, {record_t, Fields}, Val)
+        when length(VmTypes) == length(Fields),
+             length(VmTypes) == tuple_size(Val) ->
+    {record, [], [ {field, [], [{proj, [], FName}], from_aevm(VmType, FType, X)}
+                   || {VmType, {field_t, _, FName, FType}, X} <- lists:zip3(VmTypes, Fields, tuple_to_list(Val)) ]};
+from_aevm({map, VmKeyType, VmValType}, {app_t, _, {id, _, "map"}, [KeyType, ValType]}, Map)
+        when is_map(Map) ->
+    {map, [], [ {from_aevm(VmKeyType, KeyType, Key),
+                 from_aevm(VmValType, ValType, Val)}
+                || {Key, Val} <- maps:to_list(Map) ]};
+from_aevm({variant, VmCons}, {variant_t, Cons}, {variant, Tag, Args})
+        when length(VmCons) == length(Cons),
+             length(VmCons) > Tag ->
+    VmTypes = lists:nth(Tag + 1, VmCons),
+    ConType = lists:nth(Tag + 1, Cons),
+    from_aevm(VmTypes, ConType, Args);
+from_aevm(VmTypes, {constr_t, _, Con, Types}, Args)
+        when length(VmTypes) == length(Types),
+             length(VmTypes) == length(Args) ->
+    {app, [], Con, [ from_aevm(VmType, Type, Arg)
+                     || {VmType, Type, Arg} <- lists:zip3(VmTypes, Types, Args) ]};
+from_aevm(_VmType, _Type, _Data) ->
+    throw(cannot_translate_to_sophia).
+
+
 -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({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, _, 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) ->
-    if N < 0 -> {app, [{format, prefix}], {'-', []}, [{int, [], -N}]};
-       true  -> {int, [], N} end;
+from_fate({id, _, "bits"},  ?FATE_BITS(Bin)) -> error({todo, bits, Bin});
+from_fate({id, _, "int"},     N) when is_integer(N) -> {int, [], N};
 from_fate({id, _, "bool"},    B) when is_boolean(B) -> {bool, [], B};
 from_fate({id, _, "string"}, S) when is_binary(S) -> {string, [], S};
 from_fate({app_t, _, {id, _, "list"}, [Type]}, List) when is_list(List) ->
@@ -35,8 +87,6 @@ from_fate({tuple_t, _, Types}, ?FATE_TUPLE(Val))
         when length(Types) == tuple_size(Val) ->
     {tuple, [], [from_fate(Type, X)
                  || {Type, X} <- lists:zip(Types, tuple_to_list(Val))]};
-from_fate({record_t, [{field_t, _, FName, FType}]}, Val) ->
-    {record, [], [{field, [], [{proj, [], FName}], from_fate(FType, Val)}]};
 from_fate({record_t, Fields}, ?FATE_TUPLE(Val))
         when length(Fields) == tuple_size(Val) ->
     {record, [], [ {field, [], [{proj, [], FName}], from_fate(FType, X)}
@@ -55,118 +105,9 @@ from_fate({variant_t, Cons}, {variant, Ar, Tag, Args})
             from_fate(ConType, ArgList);
         _ -> throw(cannot_translate_to_sophia)
     end;
-from_fate({constr_t, _, Con, []}, []) -> Con;
 from_fate({constr_t, _, Con, Types}, Args)
         when length(Types) == length(Args) ->
     {app, [], Con, [ from_fate(Type, Arg)
                      || {Type, Arg} <- lists:zip(Types, Args) ]};
-from_fate({qid, _, QType}, Val) ->
-    from_fate_builtin(QType, Val);
 from_fate(_Type, _Data) ->
     throw(cannot_translate_to_sophia).
-
-
-from_fate_builtin(QType, Val) ->
-    Con = fun([Name | _] = Names) when is_list(Name) -> {qcon, [], Names};
-             (Name) -> {con, [], Name} end,
-    App = fun(Name, []) -> Con(Name);
-             (Name, Value) -> {app, [], Con(Name), Value} end,
-    Chk = fun(Type, Value) -> from_fate(Type, Value) end,
-    Int = {id, [], "int"},
-    Str = {id, [], "string"},
-    Adr = {id, [], "address"},
-    Hsh = {bytes_t, [], 32},
-    I32 = {bytes_t, [], 32},
-    I48 = {bytes_t, [], 48},
-    Qid = fun(Name) -> {qid, [], Name} end,
-    Map = fun(KT, VT) -> {app_t, [], {id, [], "map"}, [KT, VT]} end,
-    ChainTxArities = [3, 0, 0, 0, 0, 0, 1, 1, 1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 0],
-
-    case {QType, Val} of
-        {["Chain", "ttl"], {variant, [1, 1], 0, {X}}} -> App("RelativeTTL", [Chk(Int, X)]);
-        {["Chain", "ttl"], {variant, [1, 1], 1, {X}}} -> App("FixedTTL", [Chk(Int, X)]);
-
-        {["AENS", "name"], {variant, [3], 0, {Addr, TTL, Ptrs}}} ->
-            App(["AENS","Name"], [Chk(Adr, Addr), Chk(Qid(["Chain", "ttl"]), TTL),
-                              Chk(Map(Str, Qid(["AENS", "pointee"])), Ptrs)]);
-
-        {["AENS", "pointee"], {variant, [1, 1, 1, 1], 0, {Addr}}} ->
-            App(["AENS","AccountPt"], [Chk(Adr, Addr)]);
-        {["AENS", "pointee"], {variant, [1, 1, 1, 1], 1, {Addr}}} ->
-            App(["AENS","OraclePt"], [Chk(Adr, Addr)]);
-        {["AENS", "pointee"], {variant, [1, 1, 1, 1], 2, {Addr}}} ->
-            App(["AENS","ContractPt"], [Chk(Adr, Addr)]);
-        {["AENS", "pointee"], {variant, [1, 1, 1, 1], 3, {Addr}}} ->
-            App(["AENS","ChannelPt"], [Chk(Adr, Addr)]);
-
-        {["Chain", "ga_meta_tx"], {variant, [2], 0, {Addr, X}}} ->
-            App(["Chain","GAMetaTx"], [Chk(Adr, Addr), Chk(Int, X)]);
-
-        {["Chain", "paying_for_tx"], {variant, [2], 0, {Addr, X}}} ->
-            App(["Chain","PayingForTx"], [Chk(Adr, Addr), Chk(Int, X)]);
-
-        {["Chain", "base_tx"], {variant, ChainTxArities, 0, {Addr, Fee, Payload}}} ->
-            App(["Chain","SpendTx"], [Chk(Adr, Addr), Chk(Int, Fee), Chk(Str, Payload)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 1, {}}} ->
-            App(["Chain","OracleRegisterTx"], []);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 2, {}}} ->
-            App(["Chain","OracleQueryTx"], []);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 3, {}}} ->
-            App(["Chain","OracleResponseTx"], []);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 4, {}}} ->
-            App(["Chain","OracleExtendTx"], []);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 5, {}}} ->
-            App(["Chain","NamePreclaimTx"], []);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 6, {Name}}} ->
-            App(["Chain","NameClaimTx"], [Chk(Str, Name)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 7, {NameHash}}} ->
-            App(["Chain","NameUpdateTx"], [Chk(Hsh, NameHash)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 8, {NameHash}}} ->
-            App(["Chain","NameRevokeTx"], [Chk(Hsh, NameHash)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 9, {NewOwner, NameHash}}} ->
-            App(["Chain","NameTransferTx"], [Chk(Adr, NewOwner), Chk(Hsh, NameHash)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 10, {Addr}}} ->
-            App(["Chain","ChannelCreateTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 11, {Addr, Amount}}} ->
-            App(["Chain","ChannelDepositTx"], [Chk(Adr, Addr), Chk(Int, Amount)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 12, {Addr, Amount}}} ->
-            App(["Chain","ChannelWithdrawTx"], [Chk(Adr, Addr), Chk(Int, Amount)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 13, {Addr}}} ->
-            App(["Chain","ChannelForceProgressTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 14, {Addr}}} ->
-            App(["Chain","ChannelCloseMutualTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 15, {Addr}}} ->
-            App(["Chain","ChannelCloseSoloTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 16, {Addr}}} ->
-            App(["Chain","ChannelSlashTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 17, {Addr}}} ->
-            App(["Chain","ChannelSettleTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 18, {Addr}}} ->
-            App(["Chain","ChannelSnapshotSoloTx"], [Chk(Adr, Addr)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 19, {Amount}}} ->
-            App(["Chain","ContractCreateTx"], [Chk(Int, Amount)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 20, {Addr, Amount}}} ->
-            App(["Chain","ContractCallTx"], [Chk(Adr, Addr), Chk(Int, Amount)]);
-        {["Chain", "base_tx"], {variant, ChainTxArities, 21, {}}} ->
-            App(["Chain","GAAttachTx"], []);
-
-        {["MCL_BLS12_381", "fp"], X} ->
-            App(["MCL_BLS12_381", "fp"], [Chk(I32, X)]);
-        {["MCL_BLS12_381", "fr"], X} ->
-            App(["MCL_BLS12_381", "fr"], [Chk(I48, X)]);
-
-        _ ->
-            throw(cannot_translate_to_sophia)
-    end.
-
-make_bits(N) ->
-    Id = fun(F) -> {qid, [], ["Bits", F]} end,
-    if N < 0 -> make_bits(Id("clear"), Id("all"), 0, bnot N);
-       true  -> make_bits(Id("set"), Id("none"), 0, N) end.
-
-make_bits(_Set, Zero, _I, 0) -> Zero;
-make_bits(Set, Zero, I, N) when 0 == N rem 2 ->
-    make_bits(Set, Zero, I + 1, N div 2);
-make_bits(Set, Zero, I, N) ->
-    {app, [], Set, [make_bits(Set, Zero, I + 1, N div 2), {int, [], I}]}.
-

src/aeso_warnings.erl

@@ -1,31 +0,0 @@
--module(aeso_warnings).
-
--record(warn, { pos     :: aeso_errors:pos()
-              , message :: iolist()
-              }).
-
--opaque warning() :: #warn{}.
-
--export_type([warning/0]).
-
--export([ new/1
-        , new/2
-        , warn_to_err/2
-        , sort_warnings/1
-        , pp/1
-        ]).
-
-new(Msg) ->
-    new(aeso_errors:pos(0, 0), Msg).
-
-new(Pos, Msg) ->
-    #warn{ pos = Pos, message = Msg }.
-
-warn_to_err(Kind, #warn{ pos = Pos, message = Msg }) ->
-    aeso_errors:new(Kind, Pos, lists:flatten(Msg)).
-
-sort_warnings(Warnings) ->
-    lists:sort(fun(W1, W2) -> W1#warn.pos =< W2#warn.pos end, Warnings).
-
-pp(#warn{ pos = Pos, message = Msg }) ->
-    lists:flatten(io_lib:format("Warning~s:\n~s", [aeso_errors:pp_pos(Pos), Msg])).

src/aesophia.app.src

@@ -1,6 +1,6 @@
 {application, aesophia,
- [{description, "Compiler for Aeternity Sophia language"},
-  {vsn, "7.1.0"},
+ [{description, "Contract Language for aeternity"},
+  {vsn, "4.0.0-rc4"},
   {registered, []},
   {applications,
    [kernel,

test/aeso_abi_tests.erl

@@ -5,6 +5,7 @@
 
 -define(SANDBOX(Code), sandbox(fun() -> Code end)).
 -define(DUMMY_HASH_WORD, 16#123).
+-define(DUMMY_HASH, <<0:30/unit:8, 127, 119>>). %% 16#123
 -define(DUMMY_HASH_LIT, "#0000000000000000000000000000000000000000000000000000000000000123").
 
 sandbox(Code) ->
@@ -19,6 +20,12 @@ sandbox(Code) ->
         {error, loop}
     end.
 
+malicious_from_binary_test() ->
+    CircularList = from_words([32, 1, 32]), %% Xs = 1 :: Xs
+    {ok, {error, circular_references}}   = ?SANDBOX(aeb_heap:from_binary({list, word}, CircularList)),
+    {ok, {error, {binary_too_short, _}}} = ?SANDBOX(aeb_heap:from_binary(word, <<1, 2, 3, 4>>)),
+    ok.
+
 from_words(Ws) ->
     << <<(from_word(W))/binary>> || W <- Ws >>.
 
@@ -30,14 +37,23 @@ from_word(S) when is_list(S) ->
     <<Len:256, Bin/binary>>.
 
 encode_decode_test() ->
-    Tests =
-        [42, 1, 0 -1, <<"Hello">>,
-         {tuple, {}}, {tuple, {42}}, {tuple, {21, 37}},
-         [], [42], [21, 37],
-         {variant, [0, 1], 0, {}}, {variant, [0, 1], 1, {42}}, {variant, [2], 0, {21, 37}},
-         {typerep, string}, {typerep, integer}, {typerep, {list, integer}}, {typerep, {tuple, [integer]}}
-        ],
-    [?assertEqual(Test, encode_decode(Test)) || Test <- Tests],
+    encode_decode(word, 42),
+    42 = encode_decode(word, 42),
+    -1 = encode_decode(signed_word, -1),
+    <<"Hello world">> = encode_decode(string, <<"Hello world">>),
+    {} = encode_decode({tuple, []}, {}),
+    {42} = encode_decode({tuple, [word]}, {42}),
+    {42, 0} = encode_decode({tuple, [word, word]}, {42, 0}),
+    [] = encode_decode({list, word}, []),
+    [32] = encode_decode({list, word}, [32]),
+    none = encode_decode({option, word}, none),
+    {some, 1} = encode_decode({option, word}, {some, 1}),
+    string = encode_decode(typerep, string),
+    word = encode_decode(typerep, word),
+    {list, word} = encode_decode(typerep, {list, word}),
+    {tuple, [word]} = encode_decode(typerep, {tuple, [word]}),
+    1 = encode_decode(word, 1),
+    0 = encode_decode(word, 0),
     ok.
 
 encode_decode_sophia_test() ->
@@ -46,7 +62,7 @@ encode_decode_sophia_test() ->
                                 Other -> Other
                               end end,
     ok = Check("int", "42"),
-    ok = Check("int", "- 42"),
+    ok = Check("int", "-42"),
     ok = Check("bool", "true"),
     ok = Check("bool", "false"),
     ok = Check("string", "\"Hello\""),
@@ -56,67 +72,55 @@ encode_decode_sophia_test() ->
     ok = Check("r", "{x = (\"foo\", 0), y = Red}"),
     ok.
 
-to_sophia_value_mcl_bls12_381_test() ->
-    Code = "include \"BLS12_381.aes\"\n"
-           "contract C =\n"
-           "  entrypoint test_bls12_381_fp(x : int) = BLS12_381.int_to_fp(x)\n"
-           "  entrypoint test_bls12_381_fr(x : int) = BLS12_381.int_to_fr(x)\n"
-           "  entrypoint test_bls12_381_g1(x : int) = BLS12_381.mk_g1(x, x, x)\n",
-
-    Opts = [{backend, fate}],
-
-    CallValue32 = aeb_fate_encoding:serialize({bytes, <<20:256>>}),
-    CallValue48 = aeb_fate_encoding:serialize({bytes, <<55:384>>}),
-    CallValueTp = aeb_fate_encoding:serialize({tuple, {{bytes, <<15:256>>}, {bytes, <<160:256>>}, {bytes, <<1234:256>>}}}),
-
-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue32, Opts),
-    {error,  _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue48, Opts),
-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue48, Opts),
-    {error,  _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue32, Opts),
-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_g1", ok, CallValueTp, Opts),
-
-    ok.
-
 to_sophia_value_neg_test() ->
     Code = [ "contract Foo =\n"
-             "  entrypoint f(x : int) : string = \"hello\"\n" ],
+             "  entrypoint x(y : int) : string = \"hello\"\n" ],
 
-    {error, [Err1]} = aeso_compiler:to_sophia_value(Code, "f", ok, encode(12)),
-    ?assertEqual("Data error:\nCannot translate FATE value 12\n  of Sophia type string\n", aeso_errors:pp(Err1)),
+    {error, [Err1]} = aeso_compiler:to_sophia_value(Code, "x", ok, encode(12)),
+    ?assertEqual("Data error:\nFailed to decode binary as type string\n", aeso_errors:pp(Err1)),
+    {error, [Err2]} = aeso_compiler:to_sophia_value(Code, "x", ok, encode(12), [{backend, fate}]),
+    ?assertEqual("Data error:\nFailed to decode binary as type string\n", aeso_errors:pp(Err2)),
 
-    {error, [Err2]} = aeso_compiler:to_sophia_value(Code, "f", revert, encode(12)),
-    ?assertEqual("Data error:\nCould not deserialize the revert message\n", aeso_errors:pp(Err2)),
+    {error, [Err3]} = aeso_compiler:to_sophia_value(Code, "x", revert, encode(12)),
+    ?assertEqual("Data error:\nCould not interpret the revert message\n", aeso_errors:pp(Err3)),
+    {error, [Err4]} = aeso_compiler:to_sophia_value(Code, "x", revert, encode(12), [{backend, fate}]),
+    ?assertEqual("Data error:\nCould not deserialize the revert message\n", aeso_errors:pp(Err4)),
     ok.
 
 encode_calldata_neg_test() ->
     Code = [ "contract Foo =\n"
-             "  entrypoint f(x : int) : string = \"hello\"\n" ],
+             "  entrypoint x(y : int) : string = \"hello\"\n" ],
 
-    ExpErr1 = "Type error at line 5, col 34:\nCannot unify `int` and `bool`\n"
-              "when checking the application of\n"
-              "  `f : (int) => string`\n"
-              "to arguments\n"
-              "  `true : bool`\n",
-    {error, [Err1]} = aeso_compiler:create_calldata(Code, "f", ["true"]),
+    ExpErr1 = "Type error at line 5, col 34:\nCannot unify int\n         and bool\n"
+              "when checking the application at line 5, column 34 of\n"
+              "  x : (int) => string\nto arguments\n  true : bool\n",
+    {error, [Err1]} = aeso_compiler:create_calldata(Code, "x", ["true"]),
     ?assertEqual(ExpErr1, aeso_errors:pp(Err1)),
+    {error, [Err2]} = aeso_compiler:create_calldata(Code, "x", ["true"], [{backend, fate}]),
+    ?assertEqual(ExpErr1, aeso_errors:pp(Err2)),
 
     ok.
 
 decode_calldata_neg_test() ->
     Code1 = [ "contract Foo =\n"
-              "  entrypoint f(x : int) : string = \"hello\"\n" ],
+              "  entrypoint x(y : int) : string = \"hello\"\n" ],
     Code2 = [ "contract Foo =\n"
-              "  entrypoint f(x : string) : int = 42\n" ],
+              "  entrypoint x(y : string) : int = 42\n" ],
 
-    {ok, CallDataFATE} = aeso_compiler:create_calldata(Code1, "f", ["42"]),
+    {ok, CallDataAEVM} = aeso_compiler:create_calldata(Code1, "x", ["42"]),
+    {ok, CallDataFATE} = aeso_compiler:create_calldata(Code1, "x", ["42"], [{backend, fate}]),
 
-    {error, [Err1]} = aeso_compiler:decode_calldata(Code2, "f", <<1,2,3>>),
-    ?assertEqual("Data error:\nFailed to decode calldata binary\n", aeso_errors:pp(Err1)),
-    {error, [Err2]} = aeso_compiler:decode_calldata(Code2, "f", CallDataFATE),
-    ?assertEqual("Data error:\nCannot translate FATE value \"*\"\n  to Sophia type (string)\n", aeso_errors:pp(Err2)),
+    {error, [Err1]} = aeso_compiler:decode_calldata(Code2, "x", CallDataAEVM),
+    ?assertEqual("Data error:\nFailed to decode calldata as type {tuple,[string]}\n", aeso_errors:pp(Err1)),
+    {error, [Err2]} = aeso_compiler:decode_calldata(Code2, "x", <<1,2,3>>, [{backend, fate}]),
+    ?assertEqual("Data error:\nFailed to decode calldata binary\n", aeso_errors:pp(Err2)),
+    {error, [Err3]} = aeso_compiler:decode_calldata(Code2, "x", CallDataFATE, [{backend, fate}]),
+    ?assertEqual("Data error:\nCannot translate FATE value \"*\"\n  to Sophia type (string)\n", aeso_errors:pp(Err3)),
 
-    {error, [Err3]} = aeso_compiler:decode_calldata(Code2, "x", CallDataFATE),
-    ?assertEqual("Data error at line 1, col 1:\nFunction 'x' is missing in contract\n", aeso_errors:pp(Err3)),
+    {error, [Err4]} = aeso_compiler:decode_calldata(Code2, "y", CallDataAEVM),
+    ?assertEqual("Data error at line 1, col 1:\nFunction 'y' is missing in contract\n", aeso_errors:pp(Err4)),
+    {error, [Err5]} = aeso_compiler:decode_calldata(Code2, "y", CallDataFATE, [{backend, fate}]),
+    ?assertEqual("Data error at line 1, col 1:\nFunction 'y' is missing in contract\n", aeso_errors:pp(Err5)),
     ok.
 
 
@@ -129,7 +133,8 @@ encode_decode_sophia_string(SophiaType, String) ->
            , "  datatype variant = Red | Blue(map(string, int))\n"
            , "  entrypoint foo : arg_type => arg_type\n" ],
     case aeso_compiler:check_call(lists:flatten(Code), "foo", [String], [no_code]) of
-        {ok, _, [Arg]} ->
+        {ok, _, {[Type], _}, [Arg]} ->
+            io:format("Type ~p~n", [Type]),
             Data = encode(Arg),
             case aeso_compiler:to_sophia_value(Code, "foo", ok, Data, [no_code]) of
                 {ok, Sophia} ->
@@ -145,32 +150,30 @@ encode_decode_sophia_string(SophiaType, String) ->
 
 calldata_test() ->
     [42, <<"foobar">>] = encode_decode_calldata("foo", ["int", "string"], ["42", "\"foobar\""]),
-    [{variant, [0,1], 1, {#{ <<"a">> := 4 }}}, {tuple, {{tuple, {<<"b">>, 5}}, {variant, [0,1], 0, {}}}}] =
+    Map = #{ <<"a">> => 4 },
+    [{variant, 1, [Map]}, {{<<"b">>, 5}, {variant, 0, []}}] =
         encode_decode_calldata("foo", ["variant", "r"], ["Blue({[\"a\"] = 4})", "{x = (\"b\", 5), y = Red}"]),
-    [{bytes, <<291:256>>}, {address, <<1110:256>>}] =
-        encode_decode_calldata("foo", ["bytes(32)", "address"],
-                               [?DUMMY_HASH_LIT, "ak_1111111111111111111111111111113AFEFpt5"]),
-    [{bytes, <<291:256>>}, {bytes, <<291:256>>}] =
+    [?DUMMY_HASH_WORD, 16#456] = encode_decode_calldata("foo", ["bytes(32)", "address"],
+                                                        [?DUMMY_HASH_LIT, "ak_1111111111111111111111111111113AFEFpt5"]),
+    [?DUMMY_HASH_WORD, ?DUMMY_HASH_WORD] =
         encode_decode_calldata("foo", ["bytes(32)", "hash"], [?DUMMY_HASH_LIT, ?DUMMY_HASH_LIT]),
 
-    [119, {bytes, <<0:64/unit:8>>}] = encode_decode_calldata("foo", ["int", "signature"], ["119", [$# | lists:duplicate(128, $0)]]),
+    [119, {0, 0}] = encode_decode_calldata("foo", ["int", "signature"], ["119", [$# | lists:duplicate(128, $0)]]),
 
-    [{contract, <<1110:256>>}] = encode_decode_calldata("foo", ["Remote"], ["ct_1111111111111111111111111111113AFEFpt5"]),
+    [16#456] = encode_decode_calldata("foo", ["Remote"], ["ct_1111111111111111111111111111113AFEFpt5"]),
 
     ok.
 
 calldata_init_test() ->
-    encode_decode_calldata("init", ["int"], ["42"]),
+    encode_decode_calldata("init", ["int"], ["42"], {tuple, [typerep, word]}),
 
     Code = parameterized_contract("foo", ["int"]),
-    encode_decode_calldata_(Code, "init", []),
-
-    ok.
+    encode_decode_calldata_(Code, "init", [], {tuple, [typerep, {tuple, []}]}).
 
 calldata_indent_test() ->
     Test = fun(Extra) ->
             Code = parameterized_contract(Extra, "foo", ["int"]),
-            encode_decode_calldata_(Code, "foo", ["42"])
+            encode_decode_calldata_(Code, "foo", ["42"], word)
            end,
     Test("  stateful entrypoint bla() = ()"),
     Test("  type x = int"),
@@ -187,7 +190,7 @@ parameterized_contract(ExtraCode, FunName, Types) ->
     lists:flatten(
         ["contract Remote =\n"
          "  entrypoint bla : () => unit\n\n"
-         "main contract Dummy =\n",
+         "contract Dummy =\n",
          ExtraCode, "\n",
          "  type an_alias('a) = string * 'a\n"
          "  record r = {x : an_alias(int), y : variant}\n"
@@ -199,9 +202,9 @@ oracle_test() ->
         "contract OracleTest =\n"
         "  entrypoint question(o, q : oracle_query(list(string), option(int))) =\n"
         "    Oracle.get_question(o, q)\n",
-    ?assertEqual({ok, "question", [{oracle, <<291:256>>}, {oracle_query, <<1110:256>>}]},
-                 aeso_compiler:check_call(Contract, "question", ["ok_111111111111111111111111111111ZrdqRz9",
-                                                                 "oq_1111111111111111111111111111113AFEFpt5"], [no_code])),
+    {ok, _, {[word, word], {list, string}}, [16#123, 16#456]} =
+        aeso_compiler:check_call(Contract, "question", ["ok_111111111111111111111111111111ZrdqRz9",
+                                                        "oq_1111111111111111111111111111113AFEFpt5"], [no_code]),
 
     ok.
 
@@ -217,26 +220,35 @@ permissive_literals_fail_test() ->
     ok.
 
 encode_decode_calldata(FunName, Types, Args) ->
-    Code = parameterized_contract(FunName, Types),
-    encode_decode_calldata_(Code, FunName, Args).
+    encode_decode_calldata(FunName, Types, Args, word).
 
-encode_decode_calldata_(Code, FunName, Args) ->
+encode_decode_calldata(FunName, Types, Args, RetType) ->
+    Code = parameterized_contract(FunName, Types),
+    encode_decode_calldata_(Code, FunName, Args, RetType).
+
+encode_decode_calldata_(Code, FunName, Args, RetVMType) ->
     {ok, Calldata} = aeso_compiler:create_calldata(Code, FunName, Args, []),
-    {ok, _, _} = aeso_compiler:check_call(Code, FunName, Args, [no_code]),
+    {ok, _, {ArgTypes, RetType}, _} = aeso_compiler:check_call(Code, FunName, Args, [{backend, aevm}, no_code]),
+    ?assertEqual(RetType, RetVMType),
+    CalldataType = {tuple, [word, {tuple, ArgTypes}]},
+    {ok, {_Hash, ArgTuple}} = aeb_heap:from_binary(CalldataType, Calldata),
     case FunName of
         "init" ->
-            [];
+            ok;
         _ ->
-            {ok, FateArgs} = aeb_fate_abi:decode_calldata(FunName, Calldata),
-            FateArgs
-    end.
+            {ok, _ArgTypes, ValueASTs} = aeso_compiler:decode_calldata(Code, FunName, Calldata, []),
+            Values = [ prettypr:format(aeso_pretty:expr(V)) || V <- ValueASTs ],
+            ?assertMatch({X, X}, {Args, Values})
+    end,
+    tuple_to_list(ArgTuple).
 
-encode_decode(D) ->
-    ?assertEqual(D, decode(encode(D))),
+encode_decode(T, D) ->
+    ?assertEqual(D, decode(T, encode(D))),
     D.
 
 encode(D) ->
-    aeb_fate_encoding:serialize(D).
+    aeb_heap:to_binary(D).
 
-decode(B) ->
-    aeb_fate_encoding:deserialize(B).
+decode(T,B) ->
+    {ok, D} = aeb_heap:from_binary(T, B),
+    D.

test/aeso_aci_tests.erl

@@ -11,19 +11,15 @@ test_contract(N) ->
     {Contract,MapACI,DecACI} = test_cases(N),
     {ok,JSON} = aeso_aci:contract_interface(json, Contract),
     ?assertEqual([MapACI], JSON),
-    ?assertEqual({ok, DecACI}, aeso_aci:render_aci_json(JSON)),
-    %% Check if the compiler provides correct aci
-    {ok,#{aci := JSON2}} = aeso_compiler:from_string(Contract, [{aci, json}]),
-    ?assertEqual(JSON, JSON2).
+    ?assertEqual({ok, DecACI}, aeso_aci:render_aci_json(JSON)).
 
 test_cases(1) ->
     Contract = <<"payable contract C =\n"
 		 "  payable stateful entrypoint a(i : int) = i+1\n">>,
     MapACI = #{contract =>
 		   #{name => <<"C">>,
-		     typedefs => [],
-         payable => true,
-         kind => contract_main,
+		     type_defs => [],
+                     payable => true,
 		     functions =>
 			 [#{name => <<"a">>,
 			    arguments =>
@@ -32,64 +28,63 @@ test_cases(1) ->
 			    returns => <<"int">>,
 			    stateful => true,
                             payable  => true}]}},
-    DecACI = <<"payable main contract C =\n"
-	       "  payable stateful entrypoint a : (int) => int\n">>,
+    DecACI = <<"payable contract C =\n"
+	       "  payable entrypoint a : (int) => int\n">>,
     {Contract,MapACI,DecACI};
 
 test_cases(2) ->
-    Contract = <<"main contract C =\n"
+    Contract = <<"contract C =\n"
 		 "  type allan = int\n"
 		 "  entrypoint a(i : allan) = i+1\n">>,
     MapACI = #{contract =>
-                   #{name => <<"C">>, payable => false,
-                     kind => contract_main,
-                     typedefs =>
-                         [#{name => <<"allan">>,
-                            typedef => <<"int">>,
-                            vars => []}],
-                     functions =>
-                         [#{arguments =>
-                                [#{name => <<"i">>,
-                                   type => <<"C.allan">>}],
-                            name => <<"a">>,
-                            returns => <<"int">>,
-                            stateful => false,
-                            payable  => false}]}},
-    DecACI = <<"main contract C =\n"
+                       #{name => <<"C">>, payable => false,
+                         type_defs =>
+                             [#{name => <<"allan">>,
+                                typedef => <<"int">>,
+                                vars => []}],
+			 functions =>
+                             [#{arguments =>
+                                    [#{name => <<"i">>,
+                                       type => <<"C.allan">>}],
+                                name => <<"a">>,
+                                returns => <<"int">>,
+                                stateful => false,
+                                payable  => false}]}},
+    DecACI = <<"contract C =\n"
                "  type allan = int\n"
                "  entrypoint a : (C.allan) => int\n">>,
     {Contract,MapACI,DecACI};
 test_cases(3) ->
-    Contract = <<"main contract C =\n"
+    Contract = <<"contract C =\n"
                  "  type state = unit\n"
                  "  datatype event = SingleEventDefined\n"
-                 "  datatype bert('a) = Bin('a)\n"
-                 "  entrypoint a(i : bert(string)) = 1\n">>,
+		 "  datatype bert('a) = Bin('a)\n"
+		 "  entrypoint a(i : bert(string)) = 1\n">>,
     MapACI = #{contract =>
 		   #{functions =>
-             [#{arguments =>
-                    [#{name => <<"i">>,
-                       type =>
-                           #{<<"C.bert">> => [<<"string">>]}}],
-                name => <<"a">>,returns => <<"int">>,
-                stateful => false, payable  => false}],
-		     name => <<"C">>, payable => false, kind => contract_main,
-         event => #{variant => [#{<<"SingleEventDefined">> => []}]},
-         state => <<"unit">>,
-		     typedefs =>
-             [#{name => <<"bert">>,
-                typedef =>
-                    #{variant =>
-                          [#{<<"Bin">> => [<<"'a">>]}]},
-                vars => [#{name => <<"'a">>}]}]}},
-    DecACI = <<"main contract C =\n"
+			 [#{arguments =>
+				[#{name => <<"i">>,
+				   type =>
+				       #{<<"C.bert">> => [<<"string">>]}}],
+			    name => <<"a">>,returns => <<"int">>,
+			    stateful => false, payable  => false}],
+		     name => <<"C">>, payable => false,
+                     event => #{variant => [#{<<"SingleEventDefined">> => []}]},
+                     state => <<"unit">>,
+		     type_defs =>
+			 [#{name => <<"bert">>,
+			    typedef =>
+				#{variant =>
+				      [#{<<"Bin">> => [<<"'a">>]}]},
+			    vars => [#{name => <<"'a">>}]}]}},
+    DecACI = <<"contract C =\n"
                "  type state = unit\n"
                "  datatype event = SingleEventDefined\n"
-               "  datatype bert('a) = Bin('a)\n"
-               "  entrypoint a : (C.bert(string)) => int\n">>,
+	       "  datatype bert('a) = Bin('a)\n"
+	       "  entrypoint a : (C.bert(string)) => int\n">>,
     {Contract,MapACI,DecACI}.
 
-%% Roundtrip
+%% Rounttrip
 aci_test_() ->
     [{"Testing ACI generation for " ++ ContractName,
       fun() -> aci_test_contract(ContractName) end}
@@ -99,43 +94,32 @@ all_contracts() -> aeso_compiler_tests:compilable_contracts().
 
 aci_test_contract(Name) ->
     String = aeso_test_utils:read_contract(Name),
-    Opts   = case lists:member(Name, aeso_compiler_tests:debug_mode_contracts()) of
-                 true  -> [debug_mode];
-                 false -> []
-             end ++ [{include, {file_system, [aeso_test_utils:contract_path()]}}],
-    JSON = case aeso_aci:contract_interface(json, String, Opts) of
-               {ok, J} -> J;
-               {error, ErrorStringJ} when is_binary(ErrorStringJ) -> error(ErrorStringJ);
-               {error, ErrorJ} -> aeso_compiler_tests:print_and_throw(ErrorJ)
-           end,
-    case aeso_compiler:from_string(String, [{aci, json} | Opts]) of
-        {ok, #{aci := JSON1}} ->
-            ?assertEqual(JSON, JSON1),
-            io:format("JSON:\n~p\n", [JSON]),
-            {ok, ContractStub} = aeso_aci:render_aci_json(JSON),
+    Opts   = [{include, {file_system, [aeso_test_utils:contract_path()]}}],
+    {ok, JSON} = aeso_aci:contract_interface(json, String, Opts),
 
-            io:format("STUB:\n~s\n", [ContractStub]),
-            check_stub(ContractStub, [{src_file, Name}]),
+    io:format("JSON:\n~p\n", [JSON]),
+    {ok, ContractStub} = aeso_aci:render_aci_json(JSON),
 
-            ok;
-        {error, ErrorString} when is_binary(ErrorString) -> error(ErrorString);
-        {error, Error} -> aeso_compiler_tests:print_and_throw(Error)
-    end.
+    io:format("STUB:\n~s\n", [ContractStub]),
+    check_stub(ContractStub, [{src_file, Name}]),
+
+    ok.
 
 check_stub(Stub, Options) ->
-    try aeso_parser:string(binary_to_list(Stub), Options) of
+    case aeso_parser:string(binary_to_list(Stub), Options) of
         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);
                   _:R ->
                 io:format("Error: ~p\n", [R]),
                 error(R)
-            end
-    catch throw:{error, Errs} ->
-        _ = [ io:format("~s\n", [aeso_errors:pp(E)]) || E <- Errs ],
-        error({parse_errors, Errs})
+            end;
+        {error, E} ->
+            io:format("Error: ~p\n", [E]),
+            error({parse_error, E})
     end.
+

test/aeso_calldata_tests.erl

@@ -19,49 +19,53 @@ calldata_test_() ->
      [ {"Testing " ++ ContractName ++ " contract calling " ++ Fun,
         fun() ->
            ContractString = aeso_test_utils:read_contract(ContractName),
-           FateExprs = ast_exprs(ContractString, Fun, Args),
-           ParsedExprs = parse_args(Fun, Args),
-           ?assertEqual(ParsedExprs, FateExprs),
-           ok
+           AevmExprs =
+              case not lists:member(ContractName, not_yet_compilable(aevm)) of
+                  true -> ast_exprs(ContractString, Fun, Args, [{backend, aevm}]);
+                  false -> undefined
+              end,
+           FateExprs =
+              case not lists:member(ContractName, not_yet_compilable(fate)) of
+                  true -> ast_exprs(ContractString, Fun, Args, [{backend, fate}]);
+                  false -> undefined
+              end,
+           case FateExprs == undefined orelse AevmExprs == undefined of
+               true -> ok;
+               false ->
+                   ?assertEqual(FateExprs, AevmExprs)
+           end
         end} || {ContractName, Fun, Args} <- compilable_contracts()].
 
 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),
-           ParsedExprs = parse_args(Fun, Args),
-           ?assertEqual(ParsedExprs, FateExprs),
-           ok
+           AevmExprs =
+              case not lists:member(ContractName, not_yet_compilable(aevm)) of
+                  true -> ast_exprs(ContractACI, Fun, Args, [{backend, aevm}]);
+                  false -> undefined
+              end,
+           FateExprs =
+              case not lists:member(ContractName, not_yet_compilable(fate)) of
+                  true -> ast_exprs(ContractACI, Fun, Args, [{backend, fate}]);
+                  false -> undefined
+              end,
+           case FateExprs == undefined orelse AevmExprs == undefined of
+               true -> ok;
+               false ->
+                   ?assertEqual(FateExprs, AevmExprs)
+           end
         end} || {ContractName, Fun, Args} <- compilable_contracts()].
 
-parse_args(Fun, Args) ->
-    [{contract_main, _, _, _, [{letfun, _, _, _, _, [{guarded, _, [], {app, _, _, AST}}]}]}] =
-        aeso_parser:string("main contract Temp = function foo() = " ++ Fun ++ "(" ++ string:join(Args, ", ") ++ ")"),
-    strip_ann(AST).
 
-strip_ann(T) when is_tuple(T) ->
-    strip_ann1(setelement(2, T, []));
-strip_ann(X) -> strip_ann1(X).
-
-strip_ann1({map, [], KVs}) ->
-    {map, [], [{strip_ann(K), strip_ann(V)} || {K, V} <- KVs]};
-strip_ann1(T) when is_tuple(T) ->
-    list_to_tuple(strip_ann1(tuple_to_list(T)));
-strip_ann1(L) when is_list(L) ->
-    lists:map(fun strip_ann/1, L);
-strip_ann1(X) -> X.
-
-ast_exprs(ContractString, Fun, Args) ->
-    ast_exprs(ContractString, Fun, Args, []).
 ast_exprs(ContractString, Fun, Args, Opts) ->
     {ok, Data} = (catch aeso_compiler:create_calldata(ContractString, Fun, Args, Opts)),
     {ok, _Types, Exprs} = (catch aeso_compiler:decode_calldata(ContractString, Fun, Data, Opts)),
     ?assert(is_list(Exprs)),
-    strip_ann(Exprs).
+    Exprs.
 
 check_errors(Expect, ErrorString) ->
     %% This removes the final single \n as well.
@@ -81,9 +85,7 @@ compilable_contracts() ->
      {"maps", "init", []},
      {"funargs", "menot", ["false"]},
      {"funargs", "append", ["[\"false\", \" is\", \" not\", \" true\"]"]},
-     {"funargs", "bitsum", ["Bits.all"]},
-     {"funargs", "bitsum", ["Bits.clear(Bits.clear(Bits.all, 4), 2)"]}, %% Order matters for test
-     {"funargs", "bitsum", ["Bits.set(Bits.set(Bits.none, 4), 2)"]},
+     %% TODO {"funargs", "bitsum", ["Bits.all"]},
      {"funargs", "read", ["{label = \"question 1\", result = 4}"]},
      {"funargs", "sjutton", ["#0011012003100011012003100011012003"]},
      {"funargs", "sextiosju", ["#01020304050607080910111213141516171819202122232425262728293031323334353637383940"
@@ -94,28 +96,7 @@ compilable_contracts() ->
      {"funargs", "traffic_light", ["Green"]},
      {"funargs", "traffic_light", ["Pantone(12)"]},
      {"funargs", "tuples", ["()"]},
-     {"funargs", "due", ["FixedTTL(1020)"]},
-     {"funargs", "singleton_rec", ["{x = 1000}"]},
-     {"funargs", "aens_name", ["AENS.Name(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, RelativeTTL(100), {[\"pt1\"] = AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)})"]},
-     {"funargs", "aens_pointee", ["AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
-     {"funargs", "aens_pointee", ["AENS.OraclePt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
-     {"funargs", "aens_pointee", ["AENS.ContractPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
-     {"funargs", "aens_pointee", ["AENS.ChannelPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
-     {"funargs", "chain_ga_meta_tx", ["Chain.GAMetaTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42)"]},
-     {"funargs", "chain_paying_for_tx", ["Chain.PayingForTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42)"]},
-     {"funargs", "chain_base_tx", ["Chain.SpendTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42,\"foo\")"]},
-     {"funargs", "chain_base_tx", ["Chain.ContractCreateTx(12234)"]},
-     {"funargs", "chain_base_tx", ["Chain.ContractCallTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 12234)"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleRegisterTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleQueryTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleResponseTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleExtendTx"]},
-     {"funargs", "chain_base_tx", ["Chain.NamePreclaimTx"]},
-     {"funargs", "chain_base_tx", ["Chain.NameClaimTx(\"acoolname.chain\")"]},
-     {"funargs", "chain_base_tx", ["Chain.NameUpdateTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
-     {"funargs", "chain_base_tx", ["Chain.NameRevokeTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
-     {"funargs", "chain_base_tx", ["Chain.NameTransferTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
-     {"funargs", "chain_base_tx", ["Chain.GAAttachTx"]},
+     %% TODO {"funargs", "due", ["FixedTTL(1020)"]},
      {"variant_types", "init", []},
      {"basic_auth", "init", []},
      {"address_literals", "init", []},
@@ -141,3 +122,8 @@ compilable_contracts() ->
      {"stub", "foo", ["-42"]},
      {"payable", "foo", ["42"]}
     ].
+
+not_yet_compilable(fate) ->
+    [];
+not_yet_compilable(aevm) ->
+    [].

test/aeso_parser_tests.erl

@@ -4,20 +4,18 @@
 
 -include_lib("eunit/include/eunit.hrl").
 
-id(X) -> X.
-
 simple_contracts_test_() ->
     {foreach,
      fun() -> ok end,
      fun(_) -> ok end,
      [{"Parse a contract with an identity function.",
        fun() ->
-            Text = "main contract Identity =\n"
+            Text = "contract Identity =\n"
                    "  function id(x) = x\n",
             ?assertMatch(
-                [{contract_main, _, {con, _, "Identity"}, _,
-                    [{letfun, _, {id, _, "id"}, [{id, _, "x"}], {id, _, "_"},
-                        [{guarded, _, [], {id, _, "x"}}]}]}], parse_string(Text)),
+                [{contract, _, {con, _, "Identity"},
+                    [{letfun, _, {id, _, "id"}, [{arg, _, {id, _, "x"}, {id, _, "_"}}], {id, _, "_"},
+                        {id, _, "x"}}]}], parse_string(Text)),
             ok
        end},
       {"Operator precedence test.",
@@ -32,7 +30,7 @@ simple_contracts_test_() ->
                     end,
             Parse = fun(S) ->
                     try remove_line_numbers(parse_expr(S))
-                    catch _:_ -> ?assertMatch(ok, id({parse_fail, S})) end
+                    catch _:_ -> ?assertMatch(ok, {parse_fail, S}) end
                 end,
             CheckParens = fun(Expr) ->
                     ?assertEqual(Parse(NoPar(Expr)), Parse(Par(Expr)))
@@ -40,6 +38,7 @@ simple_contracts_test_() ->
             LeftAssoc  = fun(Op) -> CheckParens({{a, Op, b}, Op, c}) end,
             RightAssoc = fun(Op) -> CheckParens({a, Op, {b, Op, c}}) end,
             NonAssoc   = fun(Op) ->
+                            OpAtom = list_to_atom(Op),
                             ?assertThrow({error, [_]},
                                          parse_expr(NoPar({a, Op, {b, Op, c}}))) end,
             Stronger = fun(Op1, Op2) ->
@@ -63,8 +62,7 @@ simple_contracts_test_() ->
      %% Parse tests of example contracts
      [ {lists:concat(["Parse the ", Contract, " contract."]),
         fun() -> roundtrip_contract(Contract) end}
-        || Contract <- [counter, voting, all_syntax, '05_greeter', aeproof,
-                        multi_sig, simple_storage, fundme, dutch_auction, utf8] ]
+        || Contract <- [counter, voting, all_syntax, '05_greeter', aeproof, multi_sig, simple_storage, fundme, dutch_auction] ]
     }.
 
 parse_contract(Name) ->
@@ -79,14 +77,14 @@ parse_string(Text, Opts) ->
     aeso_parser:string(Text, Opts).
 
 parse_expr(Text) ->
-    [{letval, _, _, Expr}] =
+    [{letval, _, _, _, Expr}] =
         parse_string("let _ = " ++ Text),
     Expr.
 
 round_trip(Text) ->
     Contract  = parse_string(Text),
     Text1     = prettypr:format(aeso_pretty:decls(strip_stdlib(Contract))),
-    Contract1 = parse_string(aeso_scan:utf8_encode(Text1)),
+    Contract1 = parse_string(Text1),
     NoSrcLoc  = remove_line_numbers(Contract),
     NoSrcLoc1 = remove_line_numbers(Contract1),
     ?assertMatch(NoSrcLoc, diff(NoSrcLoc, NoSrcLoc1)).

test/contracts/05_greeter.aes

@@ -58,7 +58,8 @@ contract Greeter =
 
     let state = { greeting = "Hello" }
 
-    function setGreeting(greeting: string) =
+    let setGreeting =
+        (greeting: string) =>
             state{ greeting = greeting }
 
 

test/contracts/Makefile

@@ -0,0 +1,15 @@
+
+## Requires ocaml >= 4.02, < 4.06
+## and reason-3.0.0 (opam install reason).
+
+default : voting_test
+
+%.ml : %.re
+	refmt -p ml $< > $@
+
+
+voting_test : rte.ml voting.ml voting_test.ml
+	ocamlopt -o $@ $^
+
+clean :
+	rm -f *.cmi *.cmx *.ml *.o voting_test

test/contracts/__call.aes

@@ -1,5 +1,5 @@
 
 contract Identity =
-  function main_fun (x:int) = x
+  function main (x:int) = x
 
   function __call() = 12

test/contracts/abort_test.aes

@@ -0,0 +1,31 @@
+// A simple test of the abort built-in function.
+
+contract AbortTest =
+
+  record state = { value : int }
+
+  public function init(v : int) =
+    { value = v }
+
+  // Aborting
+  public function do_abort(v : int, s : string) : unit =
+    put_value(v)
+    revert_abort(s)
+
+  // Accessing the value
+  public function get_value() = state.value
+  public function put_value(v : int) = put(state{value = v})
+  public function get_values() : list(int) = [state.value]
+  public function put_values(v : int) = put(state{value = v})
+
+  // Some basic statistics
+  public function get_stats(acct : address) =
+    ( Contract.balance, Chain.balance(acct) )
+
+  // Abort functions.
+  private function revert_abort(s : string) =
+    abort(s)
+
+  // This is still legal but will be stripped out.
+  // TODO: This function confuses the type inference, so it cannot be present.
+  //private function abort(s : string) = 42

test/contracts/abort_test_int.aes

@@ -0,0 +1,27 @@
+contract Interface =
+  function do_abort : (int, string) => unit
+  function get_value : () => int
+  function put_value : (int) => unit
+  function get_values : () => list(int)
+  function put_values : (int) => unit
+
+contract AbortTestInt =
+
+  record state = {r : Interface, value : int}
+
+  public function init(r : Interface, value : int) =
+    {r = r, value = value}
+
+  // Aborting
+  public function do_abort(v : int, s : string) =
+    put_value(v)
+    state.r.do_abort(v + 100, s)
+
+  // Accessing the value
+  public function put_value(v : int) = put(state{value = v})
+  public function get_value() = state.value
+  public function get_values() : list(int) =
+    state.value :: state.r.get_values()
+  public function put_values(v : int) =
+    put_value(v)
+    state.r.put_values(v + 1000)

test/contracts/address_chain.aes

@@ -1,5 +1,5 @@
-contract interface Remote =
-  entrypoint main_fun : (int) => unit
+contract Remote =
+  entrypoint main : (int) => unit
 
 contract AddrChain =
   type o_type = oracle(string, map(string, int))

test/contracts/address_literals.aes

@@ -1,5 +1,5 @@
 
-contract interface Remote =
+contract Remote =
   entrypoint foo : () => unit
 
 contract AddressLiterals =
@@ -11,6 +11,4 @@ contract AddressLiterals =
     oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
   entrypoint contr() : Remote =
     ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
-  entrypoint contr_addr() : Remote =
-    Address.to_contract(addr())
 

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)
@@ -44,22 +33,7 @@ main contract AENSTest =
                                 sign : signature) : unit =
     AENS.claim(addr, name, salt, name_fee, signature = sign)
 
-
-  stateful entrypoint update(owner      : address,
-                             name       : string,
-                             ttl        : option(Chain.ttl),
-                             client_ttl : option(int),
-                             pointers   : option(map(string, AENS.pointee))) : unit =
-    AENS.update(owner, name, ttl, client_ttl, pointers)
-
-  stateful entrypoint signedUpdate(owner      : address,
-                                   name       : string,
-                                   ttl        : option(Chain.ttl),
-                                   client_ttl : option(int),
-                                   pointers   : option(map(string, AENS.pointee)),
-                                   sign       : signature) : unit =
-    AENS.update(owner, name, ttl, client_ttl, pointers, signature = sign)
-
+  // TODO: update() -- how to handle pointers?
 
   stateful entrypoint transfer(owner     : address,
                              new_owner : address,

test/contracts/aens_update.aes

@@ -1,17 +0,0 @@
-contract AENSUpdate =
-  stateful entrypoint update_name(owner : address, name : string) =
-    let p1 : AENS.pointee = AENS.AccountPt(Call.caller)
-    let p2 : AENS.pointee = AENS.OraclePt(Call.caller)
-    let p3 : AENS.pointee = AENS.ContractPt(Call.caller)
-    let p4 : AENS.pointee = AENS.ChannelPt(Call.caller)
-    AENS.update(owner, name, None, None,
-                Some({ ["account_pubkey"] = p1, ["oracle_pubkey"] = p2,
-                       ["contract_pubkey"] = p3, ["misc"] = p4 }))
-
-  entrypoint get_ttl(name : string) =
-    switch(AENS.lookup(name))
-     Some(AENS.Name(_, FixedTTL(ttl), _)) => ttl
-
-  entrypoint expiry(o : oracle(int, int)) : int =
-    Oracle.expiry(o)
-

test/contracts/all_syntax.aes

@@ -1,83 +1,44 @@
 // Try to cover all syntactic constructs.
-@compiler > 0
-@compiler =< 10.1.1.1.1.1.2.3.4
 
+contract AllSyntaxType =
+  type typeDecl /* bla */
+  type paramTypeDecl('a, 'b)
 
-namespace Ns =
-  datatype d('a) = D | S(int) | M('a, list('a), int)
-  private function fff() = 123
-
-  stateful entrypoint
-    f (1, x) = (_) => x
-
-payable contract AllSyntaxType =
   /** Multi-
     * line
     * comment
     */
-  stateful function foo : _
-  entrypoint bar : int => (int * 'a)
-
+  function foo : _
 
 contract AllSyntax =
 
-  datatype mickiewicz = Adam | Mickiewicz
-  record goethe('a, 'b) = {
-    johann : int,
-    wolfgang : 'a,
-    von : 'a * 'b * int,
-    goethe : unit
-    }
-  type dante = Ns.d(int)
-  type shakespeare('a) = goethe('a, 'a)
+  type typeDecl = int
+  type paramTypeDecl('a, 'b) = (('a, 'b) => 'b) => list('a) => 'b => 'b
 
-  type state = shakespeare(int)
+  record nestedRecord = { x : int }
+  record recordType = { z : nestedRecord, y : int }
+  datatype variantType('a) = None | Some('a)
 
-  entrypoint init() = {
-    johann = 1000,
-    wolfgang = -10,
+  let valWithType : map(int, int) => option(int) = (m) => Map.get(m, 42)
+  let valNoType =
+        if(valWithType(Map.empty) == None)
+          print(42 mod 10 * 5 / 3)
 
-/* TODO: This does not compile because of bug in the parser tester.
-    von = (2 + 2, 0, List.sum([x | k <- [1,2,3]
-                                 , let l = k + 1
-                                 , if(l < 10)
-                                 , let f(x) = x + 100
-                                 , Adam <- [Adam, Mickiewicz]
-                                 , let x = f(l)
-                                 ])),
-*/
-    von = (2 + 2, 0, List.sum([1,2,3,4])),
-    goethe = () }
+  function funWithType(x : int, y) : int * list(int) = (x, 0 :: [y] ++ [])
+  function funNoType() =
+    let foo = (x, y : bool) =>
+                if (! (y && x =< 0x0b || true)) [x]
+                else [11..20]
+    let setY(r : recordType) : unit = r{ y = 5 }
+    let setX(r : recordType, x : int) : recordType = r { z.x = x }  // nested record update
+    let getY(r) = switch(r) {y = y} => y
+    switch (funWithType(1, -2))
+      (x, [y, z]) => bar({x = z, y = -y + - -z * (-1)})
+      (x, y :: _) => ()
 
-  function f() =
-     let kp = "nietzsche"
-     // let p = "Пушкин" // TODO: this also doesn't do right round_trip...
-     let k(x : bytes(8)) : bytes(8) = Bytes.to_int(#fedcba9876543210)
+  let hash : address = #01ab0fff11
+  let b = false
+  let qcon = Mod.Con
+  let str = "blabla\nfoo"
+  let chr = '"'
 
-     let f : () => address = () => ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt
-     if(Bits.test(Bits.all, 10))
-       abort("ohno")
-     if(true && false)
-       require(true, "ohyes")
-     elif(false || 2 == 2)
-       ()
-     else
-       ()
-     if(true) f(1,2)((1,2))
-     else switch(1::[1,2,3])
-       [] => 1
-       a::b => 123
-       1::2::3 => 123123
-       [2,3,4] => 1
-       _ => 13
-       1::[2] => 2138
-     put(state{johann = 1})
-     
-     let m = {["foo"] = 19, /*hey wanna talk about inlined comments?*/ ["bar"] = 42}
-     let n = {}
-     m{ ["x" = 0] @ z = z + state.johann }
-
-     let sh : shakespeare(shakespeare(int)) =
-       {wolfgang = state}
-     sh{wolfgang.wolfgang = sh.wolfgang} // comment
-     exit("hope you had fun reading this")

test/contracts/ambiguous_main.aes

@@ -1,5 +0,0 @@
-contract C =
-  entrypoint f() = 123
-
-contract D =
-  entrypoint f() = 123

test/contracts/assign_pattern_to_pattern.aes

@@ -1,4 +0,0 @@
-contract AssignPatternToPattern =
-    entrypoint f() =
-        let x::(t::z = y) = [1, 2, 3]
-        (x + t)::y

test/contracts/assign_patterns.aes

@@ -1,16 +0,0 @@
-include "List.aes"
-
-contract AssignPatterns =
-
-  entrypoint test() = foo([1, 0, 2], (2, Some(3)), Some([4, 5]))
-
-  entrypoint foo(xs : list(int), p : int * option(int), some : option(list(int))) =
-    let x::(t = y::_)  = xs
-    let z::_ = t
-
-    let (a, (o = Some(b)))  = p
-
-    let Some((f = g::_)) = some
-    g + List.get(1, f)
-
-    x + y + z + a + b

test/contracts/bad_address_literals.aes

@@ -1,5 +1,5 @@
 
-contract interface Remote =
+contract Remote =
   entrypoint foo : () => unit
 
 contract AddressLiterals =
@@ -30,6 +30,4 @@ contract AddressLiterals =
     ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
   entrypoint contr3() : bytes(32) =
     ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
-  entrypoint contr4() : address =
-    Address.to_contract(Contract.address)
 

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/bad_arity.aes

@@ -1,4 +0,0 @@
-contract C =
-  type id('a) = 'a
-  entrypoint f() : id = 123
-  entrypoint g() : id(int, int) = 123

test/contracts/bad_function_block.aes

@@ -1,5 +0,0 @@
-contract C =
-  function
-    g(1) = 2
-    f(2) = 3
-    h(1) = 123

test/contracts/bad_include_and_ns.aes

@@ -1,4 +1,5 @@
-contract BadCon =
+contract Bad =
+  include "included.aes"
   namespace Foo =
     function foo() = 42
 

test/contracts/bad_number_of_args.aes

@@ -1,6 +0,0 @@
-contract Test =
-  entrypoint f() = ()
-  entrypoint g(x : int, y : string) = f(1)
-  entrypoint h() = g(1)
-  entrypoint i() = g("Litwo, ojczyzno moja")
-  

test/contracts/bad_protected_call.aes

@@ -1,6 +0,0 @@
-contract interface Remote =
-  entrypoint id : int => int
-
-contract ProtectedCall =
-  entrypoint bad(r : Remote) =
-    r.id(protected = 0 == 1, 18)

test/contracts/bad_records.aes

@@ -1,5 +0,0 @@
-contract BadRecord =
-  entrypoint foo() =
-    let r = {x = 0, [0] = 1}
-    r{x = 0, [0] = 1}
-    r{}

test/contracts/bad_state.aes

@@ -1,5 +0,0 @@
-contract C =
-  record state = { foo : int }
-  entrypoint init(i : int) =
-    state{ foo = i,
-           foo = 42 }

test/contracts/bad_top_level_decl.aes

@@ -1,3 +1,3 @@
 function square(x) = x ^ 2
 contract Main =
-  entrypoint main_fun() = square(10)
+  entrypoint main() = square(10)

test/contracts/bad_unnamed_map_update_default.aes

@@ -1,5 +0,0 @@
-contract C =
-  entrypoint f() =
-    let z = 123
-    {}{ [1 = 0] = z + 1 }
-    2

test/contracts/basic_auth_tx.aes

@@ -1,74 +0,0 @@
-// namespace Chain =
-//   record tx = { paying_for : option(Chain.paying_for_tx)
-//               , ga_metas : list(Chain.ga_meta_tx)
-//               , actor : address
-//               , fee   : int
-//               , ttl   : int
-//               , tx    : Chain.base_tx }
-
-//   datatype ga_meta_tx = GAMetaTx(address, int)
-//   datatype paying_for_tx = PayingForTx(address, int)
-//   datatype base_tx = SpendTx(address, int, string)
-//                    | OracleRegisterTx | OracleQueryTx | OracleResponseTx | OracleExtendTx
-//                    | NamePreclaimTx | NameClaimTx(hash) | NameUpdateTx(string)
-//                    | NameRevokeTx(hash) | NameTransferTx(address, string)
-//                    | ChannelCreateTx(address) | ChannelDepositTx(address, int) | ChannelWithdrawTx(address, int) |
-//                    | ChannelForceProgressTx(address) | ChannelCloseMutualTx(address) | ChannelCloseSoloTx(address)
-//                    | ChannelSlashTx(address) | ChannelSettleTx(address) | ChannelSnapshotSoloTx(address)
-//                    | ContractCreateTx(int) | ContractCallTx(address, int)
-//                    | GAAttachTx
-
-
-// Contract replicating "normal" Aeternity authentication
-contract BasicAuthTx =
-  record state = { nonce : int, owner : address }
-  datatype foo = Bar | Baz()
-
-  entrypoint init() = { nonce = 1, owner = Call.caller }
-
-  stateful entrypoint authorize(n : int, s : signature) : bool =
-    require(n >= state.nonce, "Nonce too low")
-    require(n =< state.nonce, "Nonce too high")
-    put(state{ nonce = n + 1 })
-    switch(Auth.tx_hash)
-      None          => abort("Not in Auth context")
-      Some(tx_hash) =>
-        let Some(tx0) = Auth.tx
-        let x : option(Chain.paying_for_tx) = tx0.paying_for
-        let x : list(Chain.ga_meta_tx) = tx0.ga_metas
-        let x : int = tx0.fee + tx0.ttl
-        let x : address = tx0.actor
-        let x : Chain.tx = { tx = Chain.NamePreclaimTx, paying_for = None, ga_metas = [],
-                             fee = 123, ttl = 0, actor = Call.caller }
-        switch(tx0.tx)
-          Chain.SpendTx(receiver, amount, payload) => verify(tx_hash, n, s)
-          Chain.OracleRegisterTx                   => false
-          Chain.OracleQueryTx                      => false
-          Chain.OracleResponseTx                   => false
-          Chain.OracleExtendTx                     => false
-          Chain.NamePreclaimTx                     => false
-          Chain.NameClaimTx(name)                  => false
-          Chain.NameUpdateTx(name)                 => false
-          Chain.NameRevokeTx(name)                 => false
-          Chain.NameTransferTx(to, name)           => false
-          Chain.ChannelCreateTx(other_party)       => false
-          Chain.ChannelDepositTx(channel, amount)  => false
-          Chain.ChannelWithdrawTx(channel, amount) => false
-          Chain.ChannelForceProgressTx(channel)    => false
-          Chain.ChannelCloseMutualTx(channel)      => false
-          Chain.ChannelCloseSoloTx(channel)        => false
-          Chain.ChannelSlashTx(channel)            => false
-          Chain.ChannelSettleTx(channel)           => false
-          Chain.ChannelSnapshotSoloTx(channel)     => false
-          Chain.ContractCreateTx(amount)           => false
-          Chain.ContractCallTx(ct_address, amount) => false
-          Chain.GAAttachTx                         => false
-
-  function verify(tx_hash, n, s) =
-    Crypto.verify_sig(to_sign(tx_hash, n), state.owner, s)
-
-  entrypoint to_sign(h : hash, n : int) =
-    Crypto.blake2b((h, n))
-
-  entrypoint weird_string() : string =
-    "\x19Weird String\x42\nMore\n"

test/contracts/bytes_to_x.aes

@@ -1,4 +1,4 @@
-include "String.aes"
+
 contract BytesToX =
 
   entrypoint to_int(b : bytes(42)) : int = Bytes.to_int(b)

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/channel_env.aes

@@ -0,0 +1,8 @@
+contract ChannelEnv =
+  public function coinbase() : address = Chain.coinbase
+
+  public function timestamp() : int = Chain.timestamp
+
+  public function block_height() : int = Chain.block_height
+
+  public function difficulty() : int = Chain.difficulty

test/contracts/channel_on_chain_contract_name_resolution.aes

@@ -0,0 +1,7 @@
+contract ChannelOnChainContractNameResolution =
+
+  public function can_resolve(name: string, key: string) : bool =
+    switch(AENS.resolve(name, key) : option(string))
+      None           => false
+      Some(_address) => true
+

test/contracts/channel_on_chain_contract_oracle.aes

@@ -0,0 +1,48 @@
+contract ChannelOnChainContractOracle =
+
+  type query_t  = string
+  type answer_t = string
+  type oracle_id = oracle(query_t, answer_t)
+  type query_id = oracle_query(query_t, answer_t)
+
+  record state = { oracle        : oracle_id,
+                   question      : string,
+                   bets          : map(string, address)
+                   }
+
+
+  public function init(oracle: oracle_id, question: string) : state =
+    { oracle   = oracle,
+      question = question,
+      bets     = {}
+      }
+
+  public stateful function place_bet(answer: string) = 
+    switch(Map.lookup(answer, state.bets))
+      None =>
+        put(state{ bets = state.bets{[answer] = Call.caller}})
+        "ok"
+      Some(_value) =>
+        "bet_already_taken"
+
+  public function query_fee() =
+    Oracle.query_fee(state.oracle)
+
+  public function get_question(q: query_id) =
+    Oracle.get_question(state.oracle, q)
+
+  public stateful function resolve(q: query_id) =
+    switch(Oracle.get_answer(state.oracle, q))
+      None         =>
+        "no response"
+      Some(result) => 
+        if(state.question == Oracle.get_question(state.oracle, q))
+            switch(Map.lookup(result, state.bets))
+              None         =>
+                "no winning bet"
+              Some(winner) =>
+                Chain.spend(winner, Contract.balance)
+                "ok"
+        else
+          "different question"
+

test/contracts/channel_remote_on_chain_contract_name_resolution.aes

@@ -0,0 +1,9 @@
+contract Remote =
+  function get : () => int
+  function can_resolve : (string, string) => bool
+
+contract RemoteCall =
+
+    function remote_resolve(r : Remote, name: string, key: string) : bool =
+        r.can_resolve(name, key)
+

test/contracts/chess.aes

@@ -0,0 +1,51 @@
+
+contract Chess =
+
+  type board = map(int, map(int, string))
+  type state = board
+
+  private function get_row(r, m : board) =
+    Map.lookup_default(r, m, {})
+
+  private function set_piece(r, c, p, m : board) =
+    m { [r] = get_row(r, m) { [c] = p } }
+
+  private function get_piece(r, c, m : board) =
+    Map.lookup(c, get_row(r, m))
+
+  private function from_list(xs, m : board) =
+    switch(xs)
+      []              => m
+      (r, c, p) :: xs => from_list(xs, set_piece(r, c, p, m))
+
+  function init() =
+    from_list([ (2, 1, "white pawn"),   (7, 1, "black pawn")
+              , (2, 2, "white pawn"),   (7, 2, "black pawn")
+              , (2, 3, "white pawn"),   (7, 3, "black pawn")
+              , (2, 4, "white pawn"),   (7, 4, "black pawn")
+              , (2, 5, "white pawn"),   (7, 5, "black pawn")
+              , (2, 6, "white pawn"),   (7, 6, "black pawn")
+              , (2, 7, "white pawn"),   (7, 7, "black pawn")
+              , (2, 8, "white pawn"),   (7, 8, "black pawn")
+              , (1, 1, "white rook"),   (8, 1, "black rook")
+              , (1, 2, "white knight"), (8, 2, "black knight")
+              , (1, 3, "white bishop"), (8, 3, "black bishop")
+              , (1, 4, "white queen"),  (8, 4, "black queen")
+              , (1, 5, "white king"),   (8, 5, "black king")
+              , (1, 6, "white bishop"), (8, 6, "black bishop")
+              , (1, 7, "white knight"), (8, 7, "black knight")
+              , (1, 8, "white rook"),   (8, 8, "black rook")
+              ], {})
+
+  function piece(r, c) = get_piece(r, c, state)
+
+  function move_piece(r, c, r1, c1) =
+    switch(piece(r, c))
+      Some(p) => put(set_piece(r1, c1, p, state))
+
+  function destroy_piece(r, c) =
+    put(state{ [r] = Map.delete(c, get_row(r, state)) })
+
+  function delete_row(r) =
+    put(Map.delete(r, state))
+

test/contracts/child_contract_init_bug.aes

@@ -1,8 +0,0 @@
-contract Identity =
-  record state = {foo: int, bar: string}
-  entrypoint init() = {foo = 0, bar = ""}
-
-main contract IdentityService =
-  stateful entrypoint createNewIdentity() : Identity =
-    put(())
-    Chain.create()

test/contracts/child_with_decls.aes

@@ -1,5 +0,0 @@
-contract C =
-  entrypoint f : () => unit
-
-main contract M =
-  entrypoint f() = 123

test/contracts/clone.aes

@@ -1,28 +0,0 @@
-
-contract interface HigherOrderState =
-  entrypoint init : () => void
-  entrypoint apply : int => int
-  stateful entrypoint inc : int => unit
-
-contract interface LowerDisorderAnarchy =
-  entrypoint init : (int) => void
-
-
-main contract C =
-  // both `s` and `l` should be of type `HigherOrderState` in this test
-  stateful entrypoint run_clone(s : HigherOrderState, l : LowerDisorderAnarchy) : HigherOrderState =
-    let s1 = Chain.clone(ref=s)
-    let Some(s2) = Chain.clone(ref=s, protected=true)
-    let None = Chain.clone(ref=s, protected=true, gas=1)
-    let None = Chain.clone(ref=l, protected=true, 123) // since it should be HigherOrderState underneath
-    let s3 = Chain.clone(ref=s1)
-    require(s1.apply(2137) == 2137, "APPLY_S1_0")
-    require(s2.apply(2137) == 2137, "APPLY_S2_0")
-    require(s3.apply(2137) == 2137, "APPLY_S3_0")
-    s1.inc(1)
-    s2.inc(1)
-    s1.inc(1)
-    require(s1.apply(2137) == 2139, "APPLY_S1_2")
-    require(s2.apply(2137) == 2138, "APPLY_S2_1")
-    require(s3.apply(2137) == 2137, "APPLY_S3_0")
-    s1

test/contracts/clone_simple.aes

@@ -1,7 +0,0 @@
-contract interface I =
-  entrypoint init : () => void
-
-contract C =
-  stateful entrypoint f(i : I) =
-    let Some(c1) = Chain.clone(ref=i, protected = true)
-    2

test/contracts/code_errors/bad_aens_resolve.aes

@@ -5,5 +5,5 @@ contract BadAENSresolve =
   function fail() : t(int) =
     AENS.resolve("foo.aet", "whatever")
 
-  entrypoint main_fun() = ()
+  entrypoint main() = ()