Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(bind-json): replace solang with solar #9616

Merged
merged 5 commits into from
Jan 5, 2025
Merged

chore(bind-json): replace solang with solar #9616

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7922b0
chore(`bind-json`): replace solang with solar
yash-atreya Jan 2, 2025
02bd295
fix
yash-atreya Jan 5, 2025
544f1e5
fix
yash-atreya Jan 5, 2025
9b66930
rm refs
yash-atreya Jan 5, 2025
33d9130
refactor: implement with a visitor
DaniPopes Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 66 additions & 53 deletions crates/forge/bin/cmd/bind_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ use foundry_compilers::{
use foundry_config::Config;
use itertools::Itertools;
use rayon::prelude::*;
use solang_parser::pt as solang_ast;
use solar_ast::{
ast::{Arena, FunctionKind, ItemKind, VarMut},
interface::source_map::FileName,
};
use solar_parse::{interface::Session, Parser as SolarParser};
use std::{
collections::{BTreeMap, BTreeSet},
fmt,
fmt::Write,
fmt::{self, Write},
path::PathBuf,
sync::Arc,
};
Expand Down Expand Up @@ -93,70 +96,80 @@ impl BindJsonArgs {
.0
.into_par_iter()
.map(|(path, source)| {
let mut locs_to_update = Vec::new();
let mut content = Arc::unwrap_or_clone(source.content);
let (parsed, _) = solang_parser::parse(&content, 0)
.map_err(|errors| eyre::eyre!("Parser failed: {errors:?}"))?;

// All function definitions in the file
let mut functions = Vec::new();

for part in &parsed.0 {
if let solang_ast::SourceUnitPart::FunctionDefinition(def) = part {
functions.push(def);
}
if let solang_ast::SourceUnitPart::ContractDefinition(contract) = part {
for part in &contract.parts {
match part {
solang_ast::ContractPart::FunctionDefinition(def) => {
functions.push(def);
}
// Remove `immutable` attributes
solang_ast::ContractPart::VariableDefinition(def) => {
for attr in &def.attrs {
if let solang_ast::VariableAttribute::Immutable(loc) =
attr
{
let sess = Session::builder().with_stderr_emitter().build();

let result = sess.enter(|| -> solar_ast::interface::Result<()> {
let arena = Arena::new();
let mut funcs = Vec::new();
let mut locs_to_update = Vec::new();
let mut parser = SolarParser::from_source_code(
&sess,
&arena,
FileName::Real(path.clone()),
content.to_string(),
)?;

let parsed = parser.parse_file().map_err(|e| e.emit())?;

for item in parsed.items {
if let ItemKind::Function(def) = &item.kind {
DaniPopes marked this conversation as resolved.
Show resolved Hide resolved
funcs.push(def);
}
if let ItemKind::Contract(ref contract) = item.kind {
for part in contract.body.iter() {
match part.kind {
ItemKind::Function(ref def) => {
funcs.push(def);
}
ItemKind::Variable(ref def) => {
yash-atreya marked this conversation as resolved.
Show resolved Hide resolved
if let Some(VarMut::Immutable) = def.mutability {
locs_to_update.push((
loc.start(),
loc.end(),
def.span.lo().0,
def.span.hi().0,
String::new(),
));
}
}
_ => {}
}
_ => {}
}
}
};
}
}

for def in functions {
// If there's no body block, keep the function as is
let Some(solang_ast::Statement::Block { loc, .. }) = def.body else {
continue;
};
let new_body = match def.ty {
solang_ast::FunctionTy::Modifier => "{ _; }",
_ => "{ revert(); }",
};
let start = loc.start();
let end = loc.end();
locs_to_update.push((start, end + 1, new_body.to_string()));
}
for func in funcs {
// If there's no body block, keep the function as is
let Some(stmt) = &func.body else {
continue;
};
let new_body = match func.kind {
FunctionKind::Modifier => "_;",
_ => "revert();",
};
let start = stmt.first().map(|s| s.span.lo().0);
let end = stmt.last().map(|s| s.span.hi().0);
if let (Some(start), Some(end)) = (start, end) {
locs_to_update.push((start, end, new_body.to_string()));
}
}

locs_to_update.sort_by_key(|(start, _, _)| *start);
locs_to_update.sort_by_key(|(start, _, _)| *start);

let mut shift = 0_i64;
let mut shift = 0_i64;

for (start, end, new) in locs_to_update {
let start = ((start as i64) - shift) as usize;
let end = ((end as i64) - shift) as usize;
for (start, end, new) in locs_to_update {
let start = ((start as i64) - shift) as usize;
let end = ((end as i64) - shift) as usize;

content.replace_range(start..end, new.as_str());
shift += (end - start) as i64;
shift -= new.len() as i64;
}
content.replace_range(start..end, new.as_str());
shift += (end - start) as i64;
shift -= new.len() as i64;
}

Ok(())
});

eyre::ensure!(result.is_ok(), "parsing failed");

Ok((path, Source::new(content)))
})
Expand Down
Loading