Compare commits

...

7 Commits

Author SHA1 Message Date
Cyrill Leutwiler aef42ab07e release resolc v0.1.0
Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-27 11:52:40 +02:00
xermicus ed9dc60417 bump dependencies (#331)
Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-27 11:24:15 +02:00
xermicus 3b9144ef3b add installation instructions to the readme (#330)
Closes #294

---------

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-27 10:23:42 +02:00
xermicus bd4e108bb0 resolc crate (#328)
- Factor the YUL crate out of `revive-solidity`.
- `revive-solidity` is in reality not a Solidity implementation but the
revive solidity compiler driver (`resolc`). By renaming we not only get
this straight but also a binary with the same name as the crate which
should be less confusing.

---------

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-27 09:48:43 +02:00
xermicus 090e3ac13c bugfix an env var in the release workflow (#329)
Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-27 09:29:25 +02:00
xermicus 3389865af7 solc-json-interface: make the input Cloneable (#323)
It helps external consumers working with the
`revive-solc-json-interface` crate.

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-21 10:03:32 +02:00
xermicus af39d506d9 update emsdk (#324)
Update Emscripten SDK to latest version `v4.0.9`.

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2025-05-21 07:01:41 +02:00
113 changed files with 1048 additions and 852 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ inputs:
version: version:
description: "" description: ""
required: false required: false
default: "3.1.64" default: "4.0.9"
runs: runs:
+1 -1
View File
@@ -94,7 +94,7 @@ jobs:
- name: Install LLVM Builder - name: Install LLVM Builder
run: | run: |
cargo install --path crates/llvm-builder cargo install --locked --force --path crates/llvm-builder
- name: Clone LLVM - name: Clone LLVM
run: | run: |
+1 -1
View File
@@ -143,7 +143,7 @@ jobs:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
needs: [check-version-changed] needs: [check-version-changed]
env: env:
RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
+1
View File
@@ -19,6 +19,7 @@ Supported `polkadot-sdk` rev: `2503.0.1`
### Changed ### Changed
- Supported `polkadot-sdk` version is now `2503.0.1` - Supported `polkadot-sdk` version is now `2503.0.1`
- The `emsdk` version is now `4.0.9`
### Fixed ### Fixed
Generated
+403 -206
View File
File diff suppressed because it is too large Load Diff
+36 -35
View File
@@ -3,7 +3,7 @@ resolver = "2"
members = ["crates/*"] members = ["crates/*"]
[workspace.package] [workspace.package]
version = "0.1.0-dev.16" version = "0.1.0"
authors = [ authors = [
"Cyrill Leutwiler <cyrill@parity.io>", "Cyrill Leutwiler <cyrill@parity.io>",
"Parity Technologies <admin@parity.io>", "Parity Technologies <admin@parity.io>",
@@ -14,56 +14,57 @@ repository = "https://github.com/paritytech/revive"
rust-version = "1.85.0" rust-version = "1.85.0"
[workspace.dependencies] [workspace.dependencies]
revive-benchmarks = { version = "0.1.0-dev.16", path = "crates/benchmarks" } resolc = { version = "0.1.0", path = "crates/resolc" }
revive-builtins = { version = "0.1.0-dev.16", path = "crates/builtins" } revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
revive-common = { version = "0.1.0-dev.16", path = "crates/common" } revive-builtins = { version = "0.1.0", path = "crates/builtins" }
revive-differential = { version = "0.1.0-dev.16", path = "crates/differential" } revive-common = { version = "0.1.0", path = "crates/common" }
revive-integration = { version = "0.1.0-dev.16", path = "crates/integration" } revive-differential = { version = "0.1.0", path = "crates/differential" }
revive-linker = { version = "0.1.0-dev.16", path = "crates/linker" } revive-integration = { version = "0.1.0", path = "crates/integration" }
lld-sys = { version = "0.1.0-dev.16", path = "crates/lld-sys" } revive-linker = { version = "0.1.0", path = "crates/linker" }
revive-llvm-context = { version = "0.1.0-dev.16", path = "crates/llvm-context" } lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
revive-runtime-api = { version = "0.1.0-dev.16", path = "crates/runtime-api" } revive-llvm-context = { version = "0.1.0", path = "crates/llvm-context" }
revive-runner = { version = "0.1.0-dev.16", path = "crates/runner" } revive-runtime-api = { version = "0.1.0", path = "crates/runtime-api" }
revive-solc-json-interface = { version = "0.1.0-dev.16", path = "crates/solc-json-interface" } revive-runner = { version = "0.1.0", path = "crates/runner" }
revive-solidity = { version = "0.1.0-dev.16", path = "crates/solidity" } revive-solc-json-interface = { version = "0.1.0", path = "crates/solc-json-interface" }
revive-stdlib = { version = "0.1.0-dev.16", path = "crates/stdlib" } revive-stdlib = { version = "0.1.0", path = "crates/stdlib" }
revive-build-utils = { version = "0.1.0-dev.16", path = "crates/build-utils" } revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
revive-yul = { version = "0.1.0", path = "crates/yul" }
hex = "0.4.3" hex = "0.4.3"
cc = "1.2" cc = "1.2"
libc = "0.2.172" libc = "0.2.172"
tempfile = "3.17" tempfile = "3.20"
anyhow = "1.0" anyhow = "1.0"
semver = { version = "1.0", features = ["serde"] } semver = { version = "1.0", features = ["serde"] }
itertools = "0.14" itertools = "0.14"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", features = ["arbitrary_precision"] } serde_json = { version = "1.0", features = ["arbitrary_precision"] }
regex = "1.10" regex = "1.11"
once_cell = "1.20" once_cell = "1.21"
num = "0.4.3" num = "0.4.3"
sha1 = "0.10" sha1 = "0.10"
sha3 = "0.10" sha3 = "0.10"
thiserror = "2.0" thiserror = "2.0"
which = "7.0" which = "7.0"
path-slash = "0.2" path-slash = "0.2"
rayon = "1.8" rayon = "1.10"
clap = { version = "4", default-features = false, features = ["derive"] } clap = { version = "4", default-features = false, features = ["derive"] }
polkavm-common = "0.21.0" polkavm-common = "0.24.0"
polkavm-linker = "0.21.0" polkavm-linker = "0.24.0"
polkavm-disassembler = "0.21.0" polkavm-disassembler = "0.24.0"
polkavm = "0.21.0" polkavm = "0.24.0"
alloy-primitives = { version = "0.8.21", features = ["serde"] } alloy-primitives = { version = "1.1", features = ["serde"] }
alloy-sol-types = "0.8.21" alloy-sol-types = "1.1"
alloy-genesis = "0.11.1" alloy-genesis = "1.0"
alloy-serde = "0.11.1" alloy-serde = "1.0"
env_logger = { version = "0.11.6", default-features = false } env_logger = { version = "0.11.8", default-features = false }
serde_stacker = "0.1.11" serde_stacker = "0.1.12"
criterion = { version = "0.5.1", features = ["html_reports"] } criterion = { version = "0.6", features = ["html_reports"] }
log = { version = "0.4.25" } log = { version = "0.4.27" }
git2 = { version = "0.20.0", default-features = false } git2 = { version = "0.20.2", default-features = false }
downloader = "0.2.8" downloader = "0.2.8"
flate2 = "1.0.35" flate2 = "1.1"
fs_extra = "1.3.0" fs_extra = "1.3"
num_cpus = "1" num_cpus = "1"
tar = "0.4" tar = "0.4"
toml = "0.8" toml = "0.8"
@@ -71,7 +72,7 @@ assert_cmd = "2.0"
assert_fs = "1.1" assert_fs = "1.1"
# polkadot-sdk and friends # polkadot-sdk and friends
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" } codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
scale-info = { version = "2.11.6", default-features = false } scale-info = { version = "2.11.6", default-features = false }
polkadot-sdk = { version = "2503.0.1" } polkadot-sdk = { version = "2503.0.1" }
+9 -9
View File
@@ -11,7 +11,7 @@
machete \ machete \
test \ test \
test-integration \ test-integration \
test-solidity \ test-resolc \
test-workspace \ test-workspace \
test-cli \ test-cli \
test-wasm \ test-wasm \
@@ -24,24 +24,24 @@
install: install-bin install-npm install: install-bin install-npm
install-bin: install-bin:
cargo install --locked --path crates/solidity cargo install --force --locked --path crates/resolc
install-npm: install-npm:
npm install && npm fund npm install && npm fund
install-wasm: install-npm install-wasm: install-npm
cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
npm run build:package npm run build:package
install-llvm-builder: install-llvm-builder:
cargo install --path crates/llvm-builder cargo install --force --locked --path crates/llvm-builder
install-llvm: install-llvm-builder install-llvm: install-llvm-builder
revive-llvm clone revive-llvm clone
revive-llvm build --llvm-projects lld --llvm-projects clang revive-llvm build --llvm-projects lld --llvm-projects clang
install-revive-runner: install-revive-runner:
cargo install --path crates/runner --no-default-features --locked cargo install --locked --force --path crates/runner --no-default-features
format: format:
cargo fmt --all --check cargo fmt --all --check
@@ -58,8 +58,8 @@ test: format clippy machete test-cli test-workspace install-revive-runner
test-integration: install-bin test-integration: install-bin
cargo test --package revive-integration cargo test --package revive-integration
test-solidity: install test-resolc: install
cargo test --package revive-solidity cargo test --package resolc
test-workspace: install test-workspace: install
cargo test --workspace --exclude revive-llvm-builder cargo test --workspace --exclude revive-llvm-builder
@@ -90,6 +90,6 @@ clean:
cargo clean ; \ cargo clean ; \
revive-llvm clean ; \ revive-llvm clean ; \
rm -rf node_modules ; \ rm -rf node_modules ; \
rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \ rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
cargo uninstall revive-solidity ; \ cargo uninstall resolc ; \
cargo uninstall revive-llvm-builder ; cargo uninstall revive-llvm-builder ;
+38 -3
View File
@@ -14,7 +14,39 @@ This is experimental software in active development and not ready just yet for p
Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1). Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
## Installation ## Installation
Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions. Building Solidity contracts for PolkaVM requires installing the following two compilers:
- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
### `resolc` binary releases
`resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
<details>
<summary>MacOS users</summary>
> **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
> ```sh
> xattr -rc resolc-universal-apple-darwin
> chmod +x resolc-universal-apple-darwin
> ```
</details>
<details>
<summary>Linux users</summary>
> **Linux** users need to set the executable flag.
> ```sh
> chmod +x resolc-x86_64-unknown-linux-musl
> ```
</details>
### `resolc` NPM package
We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
## Building from source ## Building from source
@@ -99,8 +131,6 @@ Ensure that your branch passes `make test` locally when submitting a pull reques
### Design overview ### Design overview
See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works.
[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
### Tests ### Tests
Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth). Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
@@ -109,3 +139,8 @@ Once Geth is installed, you can run the tests using the following command:
```sh ```sh
make test make test
``` ```
# Acknowledgements
The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
+3 -3
View File
@@ -4,11 +4,11 @@ Prior to the first stable release we neither have formal release processes nor d
To create a new pre-release: To create a new pre-release:
1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly. 1. Create a release PR which updates the versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
2. If the CI passes, merge the release PR. 2. If the CI passes, merge the release PR.
3. Push a tag that has the same `-dev.X` version as in `Cargo.toml` 3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version. 4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name. 5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts. 6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes. 7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly 8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
+1 -1
View File
@@ -13,7 +13,7 @@ alloy-sol-types = { workspace = true }
hex = { workspace = true } hex = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
revive-solidity = { workspace = true } resolc = { workspace = true }
revive-runner = { workspace = true } revive-runner = { workspace = true }
revive-llvm-context = { workspace = true } revive-llvm-context = { workspace = true }
+1 -1
View File
@@ -1,8 +1,8 @@
use alloy_primitives::{Address, Bytes, I256, U256}; use alloy_primitives::{Address, Bytes, I256, U256};
use alloy_sol_types::{sol, SolCall, SolConstructor}; use alloy_sol_types::{sol, SolCall, SolConstructor};
use resolc::test_utils::*;
use revive_llvm_context::OptimizerSettings; use revive_llvm_context::OptimizerSettings;
use revive_solidity::test_utils::*;
#[derive(Clone)] #[derive(Clone)]
pub struct Contract { pub struct Contract {
+1 -1
View File
@@ -38,7 +38,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git"; pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
/// The emscripten SDK version. /// The emscripten SDK version.
pub const EMSDK_VERSION: &str = "3.1.64"; pub const EMSDK_VERSION: &str = "4.0.9";
/// The subprocess runner. /// The subprocess runner.
/// ///
@@ -1,5 +1,5 @@
[package] [package]
name = "revive-solidity" name = "resolc"
version.workspace = true version.workspace = true
license.workspace = true license.workspace = true
edition.workspace = true edition.workspace = true
@@ -18,26 +18,23 @@ path = "src/resolc/main.rs"
doctest = false doctest = false
[dependencies] [dependencies]
clap = { workspace = true }
thiserror = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
which = { workspace = true } clap = { workspace = true }
hex = { workspace = true }
inkwell = { workspace = true }
once_cell = { workspace = true }
path-slash = { workspace = true } path-slash = { workspace = true }
rayon = { workspace = true, optional = true } rayon = { workspace = true, optional = true }
semver = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
semver = { workspace = true }
once_cell = { workspace = true }
regex = { workspace = true }
hex = { workspace = true }
num = { workspace = true }
sha3 = { workspace = true } sha3 = { workspace = true }
inkwell = { workspace = true } which = { workspace = true }
revive-common = { workspace = true } revive-common = { workspace = true }
revive-llvm-context = { workspace = true } revive-llvm-context = { workspace = true }
revive-solc-json-interface = { workspace = true, features = ["resolc"] } revive-solc-json-interface = { workspace = true, features = ["resolc"] }
revive-yul = { workspace = true }
[target.'cfg(target_env = "musl")'.dependencies] [target.'cfg(target_env = "musl")'.dependencies]
mimalloc = { version = "*", default-features = false } mimalloc = { version = "*", default-features = false }
@@ -7,7 +7,6 @@ pub(crate) mod process;
pub(crate) mod project; pub(crate) mod project;
pub(crate) mod solc; pub(crate) mod solc;
pub(crate) mod version; pub(crate) mod version;
pub(crate) mod yul;
pub use self::build::contract::Contract as ContractBuild; pub use self::build::contract::Contract as ContractBuild;
pub use self::build::Build; pub use self::build::Build;
@@ -8,7 +8,7 @@ use std::collections::HashSet;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::parser::statement::object::Object; use revive_yul::parser::statement::object::Object;
use self::llvm_ir::LLVMIR; use self::llvm_ir::LLVMIR;
use self::yul::Yul; use self::yul::Yul;
@@ -5,7 +5,7 @@ use std::collections::HashSet;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::parser::statement::object::Object; use revive_yul::parser::statement::object::Object;
/// The contract Yul source code. /// The contract Yul source code.
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -9,11 +9,14 @@ use std::path::Path;
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
use rayon::iter::{IntoParallelIterator, ParallelIterator}; use rayon::iter::{IntoParallelIterator, ParallelIterator};
use revive_solc_json_interface::SolcStandardJsonOutput;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use sha3::Digest; use sha3::Digest;
use revive_solc_json_interface::SolcStandardJsonOutput;
use revive_yul::lexer::Lexer;
use revive_yul::parser::statement::object::Object;
use crate::build::contract::Contract as ContractBuild; use crate::build::contract::Contract as ContractBuild;
use crate::build::Build; use crate::build::Build;
use crate::missing_libraries::MissingLibraries; use crate::missing_libraries::MissingLibraries;
@@ -22,8 +25,6 @@ use crate::process::Process;
use crate::project::contract::ir::IR; use crate::project::contract::ir::IR;
use crate::solc::version::Version as SolcVersion; use crate::solc::version::Version as SolcVersion;
use crate::solc::Compiler; use crate::solc::Compiler;
use crate::yul::lexer::Lexer;
use crate::yul::parser::statement::object::Object;
use self::contract::Contract; use self::contract::Contract;
@@ -5,7 +5,7 @@ pub mod arguments;
use std::io::Write; use std::io::Write;
use std::str::FromStr; use std::str::FromStr;
use revive_solidity::Process; use resolc::Process;
use self::arguments::Arguments; use self::arguments::Arguments;
@@ -36,7 +36,7 @@ fn main_inner() -> anyhow::Result<()> {
std::io::stdout(), std::io::stdout(),
"{} version {}", "{} version {}",
env!("CARGO_PKG_DESCRIPTION"), env!("CARGO_PKG_DESCRIPTION"),
revive_solidity::ResolcVersion::default().long resolc::ResolcVersion::default().long
)?; )?;
return Ok(()); return Ok(());
} }
@@ -45,8 +45,8 @@ fn main_inner() -> anyhow::Result<()> {
writeln!( writeln!(
std::io::stdout(), std::io::stdout(),
">={},<={}", ">={},<={}",
revive_solidity::SolcFirstSupportedVersion, resolc::SolcFirstSupportedVersion,
revive_solidity::SolcLastSupportedVersion, resolc::SolcLastSupportedVersion,
)?; )?;
return Ok(()); return Ok(());
} }
@@ -71,20 +71,20 @@ fn main_inner() -> anyhow::Result<()> {
let mut infile = std::fs::File::open(fname)?; let mut infile = std::fs::File::open(fname)?;
#[cfg(target_os = "emscripten")] #[cfg(target_os = "emscripten")]
{ {
return revive_solidity::WorkerProcess::run(Some(&mut infile)); return resolc::WorkerProcess::run(Some(&mut infile));
} }
#[cfg(not(target_os = "emscripten"))] #[cfg(not(target_os = "emscripten"))]
{ {
return revive_solidity::NativeProcess::run(Some(&mut infile)); return resolc::NativeProcess::run(Some(&mut infile));
} }
} }
#[cfg(target_os = "emscripten")] #[cfg(target_os = "emscripten")]
{ {
return revive_solidity::WorkerProcess::run(None); return resolc::WorkerProcess::run(None);
} }
#[cfg(not(target_os = "emscripten"))] #[cfg(not(target_os = "emscripten"))]
{ {
return revive_solidity::NativeProcess::run(None); return resolc::NativeProcess::run(None);
} }
} }
@@ -111,14 +111,16 @@ fn main_inner() -> anyhow::Result<()> {
let mut solc = { let mut solc = {
#[cfg(target_os = "emscripten")] #[cfg(target_os = "emscripten")]
{ {
revive_solidity::SoljsonCompiler resolc::SoljsonCompiler
} }
#[cfg(not(target_os = "emscripten"))] #[cfg(not(target_os = "emscripten"))]
{ {
revive_solidity::SolcCompiler::new(arguments.solc.unwrap_or_else(|| { resolc::SolcCompiler::new(
revive_solidity::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned() arguments
}))? .solc
.unwrap_or_else(|| resolc::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()),
)?
} }
}; };
@@ -158,7 +160,7 @@ fn main_inner() -> anyhow::Result<()> {
} }
let build = if arguments.yul { let build = if arguments.yul {
revive_solidity::yul( resolc::yul(
input_files.as_slice(), input_files.as_slice(),
&mut solc, &mut solc,
optimizer_settings, optimizer_settings,
@@ -168,7 +170,7 @@ fn main_inner() -> anyhow::Result<()> {
memory_config, memory_config,
) )
} else if arguments.llvm_ir { } else if arguments.llvm_ir {
revive_solidity::llvm_ir( resolc::llvm_ir(
input_files.as_slice(), input_files.as_slice(),
optimizer_settings, optimizer_settings,
include_metadata_hash, include_metadata_hash,
@@ -177,7 +179,7 @@ fn main_inner() -> anyhow::Result<()> {
memory_config, memory_config,
) )
} else if arguments.standard_json { } else if arguments.standard_json {
revive_solidity::standard_json( resolc::standard_json(
&mut solc, &mut solc,
arguments.detect_missing_libraries, arguments.detect_missing_libraries,
arguments.base_path, arguments.base_path,
@@ -188,7 +190,7 @@ fn main_inner() -> anyhow::Result<()> {
)?; )?;
return Ok(()); return Ok(());
} else if let Some(format) = arguments.combined_json { } else if let Some(format) = arguments.combined_json {
revive_solidity::combined_json( resolc::combined_json(
format, format,
input_files.as_slice(), input_files.as_slice(),
arguments.libraries, arguments.libraries,
@@ -210,7 +212,7 @@ fn main_inner() -> anyhow::Result<()> {
)?; )?;
return Ok(()); return Ok(());
} else { } else {
revive_solidity::standard_output( resolc::standard_output(
input_files.as_slice(), input_files.as_slice(),
arguments.libraries, arguments.libraries,
&mut solc, &mut solc,
+2 -2
View File
@@ -17,7 +17,7 @@ path = "src/main.rs"
[features] [features]
std = ["polkadot-sdk/std"] std = ["polkadot-sdk/std"]
default = ["solidity"] default = ["solidity"]
solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"] solidity = ["resolc", "revive-differential", "revive-llvm-context"]
[dependencies] [dependencies]
env_logger = { workspace = true } env_logger = { workspace = true }
@@ -39,6 +39,6 @@ polkadot-sdk.features = [
"pallet-timestamp" "pallet-timestamp"
] ]
revive-solidity = { workspace = true, optional = true } resolc = { workspace = true, optional = true }
revive-differential = { workspace = true, optional = true } revive-differential = { workspace = true, optional = true }
revive-llvm-context = { workspace = true, optional = true } revive-llvm-context = { workspace = true, optional = true }
+3 -3
View File
@@ -44,7 +44,7 @@ pub use crate::specs::*;
mod runtime; mod runtime;
mod specs; mod specs;
#[cfg(not(feature = "revive-solidity"))] #[cfg(not(feature = "resolc"))]
pub(crate) const NO_SOLIDITY_FRONTEND: &str = pub(crate) const NO_SOLIDITY_FRONTEND: &str =
"revive-runner was built without the solidity frontend; please enable the 'solidity' feature!"; "revive-runner was built without the solidity frontend; please enable the 'solidity' feature!";
@@ -234,7 +234,7 @@ impl CallResult {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub enum Code { pub enum Code {
#[cfg(feature = "revive-solidity")] #[cfg(feature = "resolc")]
/// Compile a single solidity source and use the blob of `contract` /// Compile a single solidity source and use the blob of `contract`
Solidity { Solidity {
path: Option<std::path::PathBuf>, path: Option<std::path::PathBuf>,
@@ -270,7 +270,7 @@ impl From<Code> for pallet_revive::Code {
let Ok(source_code) = std::fs::read_to_string(&path) else { let Ok(source_code) = std::fs::read_to_string(&path) else {
panic!("Failed to reead source code from {}", path.display()); panic!("Failed to reead source code from {}", path.display());
}; };
pallet_revive::Code::Upload(revive_solidity::test_utils::compile_blob_with_options( pallet_revive::Code::Upload(resolc::test_utils::compile_blob_with_options(
&contract, &contract,
&source_code, &source_code,
solc_optimizer.unwrap_or(true), solc_optimizer.unwrap_or(true),
+7 -7
View File
@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};
use crate::*; use crate::*;
use alloy_primitives::keccak256; use alloy_primitives::keccak256;
#[cfg(feature = "revive-solidity")] #[cfg(feature = "resolc")]
use alloy_primitives::Address; use alloy_primitives::Address;
#[cfg(feature = "revive-solidity")] #[cfg(feature = "resolc")]
use resolc::test_utils::*;
#[cfg(feature = "resolc")]
use revive_differential::{Evm, EvmLog}; use revive_differential::{Evm, EvmLog};
#[cfg(feature = "revive-solidity")]
use revive_solidity::test_utils::*;
const SPEC_MARKER_BEGIN: &str = "/* runner.json"; const SPEC_MARKER_BEGIN: &str = "/* runner.json";
const SPEC_MARKER_END: &str = "*/"; const SPEC_MARKER_END: &str = "*/";
@@ -256,7 +256,7 @@ impl Specs {
}; };
match code { match code {
#[cfg(feature = "revive-solidity")] #[cfg(feature = "resolc")]
Code::Bytes(bytes) if bytes.is_empty() => { Code::Bytes(bytes) if bytes.is_empty() => {
let contract_source = match std::fs::read_to_string(contract_path) { let contract_source = match std::fs::read_to_string(contract_path) {
Err(err) => panic!("unable to read {contract_path}: {err}"), Err(err) => panic!("unable to read {contract_path}: {err}"),
@@ -264,9 +264,9 @@ impl Specs {
}; };
*bytes = compile_blob(contract_name, &contract_source) *bytes = compile_blob(contract_name, &contract_source)
} }
#[cfg(not(feature = "revive-solidity"))] #[cfg(not(feature = "resolc"))]
Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"), Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
#[cfg(feature = "revive-solidity")] #[cfg(feature = "resolc")]
Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()), Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
_ => continue, _ => continue,
} }
@@ -25,7 +25,7 @@ use self::settings::Settings;
use self::source::Source; use self::source::Source;
/// The `solc --standard-json` input. /// The `solc --standard-json` input.
#[derive(Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Input { pub struct Input {
/// The input language. /// The input language.
@@ -6,7 +6,7 @@ use serde::Serialize;
use crate::standard_json::input::settings::metadata_hash::MetadataHash; use crate::standard_json::input::settings::metadata_hash::MetadataHash;
/// The `solc --standard-json` input settings metadata. /// The `solc --standard-json` input settings metadata.
#[derive(Debug, Default, Serialize, Deserialize)] #[derive(Clone, Debug, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Metadata { pub struct Metadata {
/// The bytecode hash mode. /// The bytecode hash mode.
@@ -18,7 +18,7 @@ use self::polkavm::PolkaVM;
use self::selection::Selection; use self::selection::Selection;
/// The `solc --standard-json` input settings. /// The `solc --standard-json` input settings.
#[derive(Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Settings { pub struct Settings {
/// The target EVM version. /// The target EVM version.
@@ -4,7 +4,7 @@ use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
/// The `solc --standard-json` input settings optimizer details. /// The `solc --standard-json` input settings optimizer details.
#[derive(Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Details { pub struct Details {
/// Whether the pass is enabled. /// Whether the pass is enabled.
@@ -8,7 +8,7 @@ use serde::Serialize;
use self::details::Details; use self::details::Details;
/// The `solc --standard-json` input settings optimizer. /// The `solc --standard-json` input settings optimizer.
#[derive(Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Optimizer { pub struct Optimizer {
/// Whether the optimizer is enabled. /// Whether the optimizer is enabled.
@@ -10,7 +10,7 @@ use serde::Serialize;
use self::flag::Flag as SelectionFlag; use self::flag::Flag as SelectionFlag;
/// The `solc --standard-json` output file selection. /// The `solc --standard-json` output file selection.
#[derive(Debug, Default, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
pub struct File { pub struct File {
/// The per-file output selections. /// The per-file output selections.
#[serde(rename = "", skip_serializing_if = "Option::is_none")] #[serde(rename = "", skip_serializing_if = "Option::is_none")]
@@ -10,7 +10,7 @@ use serde::Serialize;
use self::file::File as FileSelection; use self::file::File as FileSelection;
/// The `solc --standard-json` output selection. /// The `solc --standard-json` output selection.
#[derive(Debug, Serialize, Deserialize, Default, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize, Default, PartialEq)]
pub struct Selection { pub struct Selection {
/// Only the 'all' wildcard is available for robustness reasons. /// Only the 'all' wildcard is available for robustness reasons.
#[serde(rename = "*", skip_serializing_if = "Option::is_none")] #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
@@ -7,7 +7,7 @@ use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
/// The `solc --standard-json` input source. /// The `solc --standard-json` input source.
#[derive(Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Source { pub struct Source {
/// The source code file content. /// The source code file content.
+20
View File
@@ -0,0 +1,20 @@
[package]
name = "revive-yul"
description = "The revive YUL parser library."
version.workspace = true
authors.workspace = true
license.workspace = true
edition.workspace = true
repository.workspace = true
rust-version.workspace = true
[dependencies]
anyhow = { workspace = true }
inkwell = { workspace = true }
num = { workspace = true }
regex = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
revive-common = { workspace = true }
revive-llvm-context = { workspace = true }
@@ -1,7 +1,7 @@
//! The Yul IR error. //! The Yul IR error.
use crate::yul::lexer::error::Error as LexerError; use crate::lexer::error::Error as LexerError;
use crate::yul::parser::error::Error as ParserError; use crate::parser::error::Error as ParserError;
/// The Yul IR error. /// The Yul IR error.
#[derive(Debug, thiserror::Error, PartialEq, Eq)] #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -1,6 +1,6 @@
//! The Yul IR lexer error. //! The Yul IR lexer error.
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
/// The Yul IR lexer error. /// The Yul IR lexer error.
#[derive(Debug, thiserror::Error, PartialEq, Eq)] #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -42,6 +42,7 @@ impl Lexer {
} }
/// Advances the lexer, returning the next lexeme. /// Advances the lexer, returning the next lexeme.
#[allow(clippy::should_implement_trait)]
pub fn next(&mut self) -> Result<Token, Error> { pub fn next(&mut self) -> Result<Token, Error> {
if let Some(peeked) = self.peeked.take() { if let Some(peeked) = self.peeked.take() {
return Ok(peeked); return Ok(peeked);
@@ -1,9 +1,9 @@
//! The Yul IR lexer tests. //! The Yul IR lexer tests.
use crate::yul::lexer::error::Error; use crate::lexer::error::Error;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
#[test] #[test]
fn default() { fn default() {
@@ -3,7 +3,7 @@
pub mod multi_line; pub mod multi_line;
pub mod single_line; pub mod single_line;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use self::multi_line::Comment as MultiLineComment; use self::multi_line::Comment as MultiLineComment;
use self::single_line::Comment as SingleLineComment; use self::single_line::Comment as SingleLineComment;
@@ -1,8 +1,8 @@
//! The multi-line comment lexeme. //! The multi-line comment lexeme.
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The multi-line comment lexeme. /// The multi-line comment lexeme.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,8 +1,8 @@
//! The single-line comment lexeme. //! The single-line comment lexeme.
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The single-line comment lexeme. /// The single-line comment lexeme.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,9 +1,9 @@
//! The identifier lexeme. //! The identifier lexeme.
use crate::yul::lexer::token::lexeme::keyword::Keyword; use crate::lexer::token::lexeme::keyword::Keyword;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The identifier lexeme. /// The identifier lexeme.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,10 +1,10 @@
//! The keyword lexeme. //! The keyword lexeme.
use crate::yul::lexer::token::lexeme::literal::boolean::Boolean as BooleanLiteral; use crate::lexer::token::lexeme::literal::boolean::Boolean as BooleanLiteral;
use crate::yul::lexer::token::lexeme::literal::Literal; use crate::lexer::token::lexeme::literal::Literal;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The keyword lexeme. /// The keyword lexeme.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -3,7 +3,7 @@
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::lexer::token::lexeme::keyword::Keyword; use crate::lexer::token::lexeme::keyword::Keyword;
/// The boolean literal lexeme. /// The boolean literal lexeme.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -3,10 +3,10 @@
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::lexeme::Literal; use crate::lexer::token::lexeme::Literal;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The integer literal lexeme. /// The integer literal lexeme.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -3,10 +3,10 @@
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::lexeme::Literal; use crate::lexer::token::lexeme::Literal;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The string literal lexeme. /// The string literal lexeme.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -1,8 +1,8 @@
//! The symbol lexeme. //! The symbol lexeme.
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
/// The symbol lexeme. /// The symbol lexeme.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -2,7 +2,7 @@
use std::collections::BTreeSet; use std::collections::BTreeSet;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
/// The Yul IR parser error. /// The Yul IR parser error.
#[derive(Debug, thiserror::Error, PartialEq, Eq)] #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -3,13 +3,13 @@
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::error::Error; use crate::error::Error;
use crate::yul::lexer::token::lexeme::symbol::Symbol; use crate::lexer::token::lexeme::symbol::Symbol;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::r#type::Type; use crate::parser::r#type::Type;
/// The YUL source code identifier. /// The YUL source code identifier.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -50,7 +50,7 @@ impl Identifier {
let mut expected_comma = false; let mut expected_comma = false;
loop { loop {
let token = crate::yul::parser::take_or_next(initial.take(), lexer)?; let token = crate::parser::take_or_next(initial.take(), lexer)?;
match token { match token {
Token { Token {
@@ -81,7 +81,7 @@ impl Identifier {
let mut expected_comma = false; let mut expected_comma = false;
loop { loop {
let token = crate::yul::parser::take_or_next(initial.take(), lexer)?; let token = crate::parser::take_or_next(initial.take(), lexer)?;
match token { match token {
Token { Token {
@@ -5,9 +5,9 @@ pub mod identifier;
pub mod statement; pub mod statement;
pub mod r#type; pub mod r#type;
use crate::yul::lexer::error::Error as LexerError; use crate::lexer::error::Error as LexerError;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
/// Returns the `token` value if it is `Some(_)`, otherwise takes the next token from the `stream`. /// Returns the `token` value if it is `Some(_)`, otherwise takes the next token from the `stream`.
pub fn take_or_next(mut token: Option<Token>, lexer: &mut Lexer) -> Result<Token, LexerError> { pub fn take_or_next(mut token: Option<Token>, lexer: &mut Lexer) -> Result<Token, LexerError> {
@@ -6,15 +6,15 @@ use inkwell::types::BasicType;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::error::Error; use crate::error::Error;
use crate::yul::lexer::token::lexeme::symbol::Symbol; use crate::lexer::token::lexeme::symbol::Symbol;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error as ParserError; use crate::parser::error::Error as ParserError;
use crate::yul::parser::identifier::Identifier; use crate::parser::identifier::Identifier;
use crate::yul::parser::statement::expression::Expression; use crate::parser::statement::expression::Expression;
/// The Yul assignment expression statement. /// The Yul assignment expression statement.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -30,7 +30,7 @@ pub struct Assignment {
impl Assignment { impl Assignment {
/// The element parser. /// The element parser.
pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> { pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> {
let token = crate::yul::parser::take_or_next(initial, lexer)?; let token = crate::parser::take_or_next(initial, lexer)?;
let (location, identifier) = match token { let (location, identifier) = match token {
Token { Token {
@@ -75,7 +75,7 @@ impl Assignment {
Some(Token::new(location, Lexeme::Identifier(identifier), length)), Some(Token::new(location, Lexeme::Identifier(identifier), length)),
)?; )?;
match crate::yul::parser::take_or_next(next, lexer)? { match crate::parser::take_or_next(next, lexer)? {
Token { Token {
lexeme: Lexeme::Symbol(Symbol::Assignment), lexeme: Lexeme::Symbol(Symbol::Assignment),
.. ..
@@ -7,16 +7,16 @@ use serde::Serialize;
use inkwell::debug_info::AsDIScope; use inkwell::debug_info::AsDIScope;
use crate::yul::error::Error; use crate::error::Error;
use crate::yul::lexer::token::lexeme::symbol::Symbol; use crate::lexer::token::lexeme::symbol::Symbol;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error as ParserError; use crate::parser::error::Error as ParserError;
use crate::yul::parser::statement::assignment::Assignment; use crate::parser::statement::assignment::Assignment;
use crate::yul::parser::statement::expression::Expression; use crate::parser::statement::expression::Expression;
use crate::yul::parser::statement::Statement; use crate::parser::statement::Statement;
/// The Yul source code block. /// The Yul source code block.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -30,7 +30,7 @@ pub struct Block {
impl Block { impl Block {
/// The element parser. /// The element parser.
pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> { pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> {
let token = crate::yul::parser::take_or_next(initial, lexer)?; let token = crate::parser::take_or_next(initial, lexer)?;
let mut statements = Vec::new(); let mut statements = Vec::new();
@@ -53,7 +53,7 @@ impl Block {
let mut remaining = None; let mut remaining = None;
loop { loop {
match crate::yul::parser::take_or_next(remaining.take(), lexer)? { match crate::parser::take_or_next(remaining.take(), lexer)? {
token @ Token { token @ Token {
lexeme: Lexeme::Keyword(_), lexeme: Lexeme::Keyword(_),
.. ..
@@ -221,10 +221,10 @@ where
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error; use crate::parser::error::Error;
use crate::yul::parser::statement::object::Object; use crate::parser::statement::object::Object;
#[test] #[test]
fn error_invalid_token_bracket_curly_left() { fn error_invalid_token_bracket_curly_left() {
@@ -5,14 +5,14 @@ use std::collections::HashSet;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::error::Error; use crate::error::Error;
use crate::yul::lexer::token::lexeme::keyword::Keyword; use crate::lexer::token::lexeme::keyword::Keyword;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error as ParserError; use crate::parser::error::Error as ParserError;
use crate::yul::parser::statement::block::Block; use crate::parser::statement::block::Block;
/// The YUL code entity, which is the first block of the object. /// The YUL code entity, which is the first block of the object.
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -26,7 +26,7 @@ pub struct Code {
impl Code { impl Code {
/// The element parser. /// The element parser.
pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> { pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> {
let token = crate::yul::parser::take_or_next(initial, lexer)?; let token = crate::parser::take_or_next(initial, lexer)?;
let location = match token { let location = match token {
Token { Token {
@@ -68,10 +68,10 @@ where
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error; use crate::parser::error::Error;
use crate::yul::parser::statement::object::Object; use crate::parser::statement::object::Object;
#[test] #[test]
fn error_invalid_token_code() { fn error_invalid_token_code() {
@@ -9,16 +9,16 @@ use inkwell::values::BasicValue;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use crate::yul::error::Error; use crate::error::Error;
use crate::yul::lexer::token::lexeme::literal::Literal as LexicalLiteral; use crate::lexer::token::lexeme::literal::Literal as LexicalLiteral;
use crate::yul::lexer::token::lexeme::symbol::Symbol; use crate::lexer::token::lexeme::symbol::Symbol;
use crate::yul::lexer::token::lexeme::Lexeme; use crate::lexer::token::lexeme::Lexeme;
use crate::yul::lexer::token::location::Location; use crate::lexer::token::location::Location;
use crate::yul::lexer::token::Token; use crate::lexer::token::Token;
use crate::yul::lexer::Lexer; use crate::lexer::Lexer;
use crate::yul::parser::error::Error as ParserError; use crate::parser::error::Error as ParserError;
use crate::yul::parser::statement::expression::literal::Literal; use crate::parser::statement::expression::literal::Literal;
use crate::yul::parser::statement::expression::Expression; use crate::parser::statement::expression::Expression;
use self::name::Name; use self::name::Name;
@@ -36,7 +36,7 @@ pub struct FunctionCall {
impl FunctionCall { impl FunctionCall {
/// The element parser. /// The element parser.
pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> { pub fn parse(lexer: &mut Lexer, initial: Option<Token>) -> Result<Self, Error> {
let token = crate::yul::parser::take_or_next(initial, lexer)?; let token = crate::parser::take_or_next(initial, lexer)?;
let (location, name) = match token { let (location, name) = match token {
Token { Token {
@@ -1,6 +1,6 @@
//! Translates the verbatim simulations. //! Translates the verbatim simulations.
use crate::yul::parser::statement::expression::function_call::FunctionCall; use crate::parser::statement::expression::function_call::FunctionCall;
/// Translates the verbatim simulations. /// Translates the verbatim simulations.
pub fn verbatim<'ctx, D>( pub fn verbatim<'ctx, D>(

Some files were not shown because too many files have changed in this diff Show More