chore: update solang-parser (#4661)

* wip update solang * remove Chisel check * update patch section * bump * update patch * update patch to git * bump ethers * add repro * add tracing and move tests to tests/it/ * cargo update * add CodeLocationExt * patch --------- Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
foundry-rs · Apr 18, 2023 · a9ad3ae · a9ad3ae
1 parent 04ce078
commit a9ad3ae
Show file tree

Hide file tree

Showing 32 changed files with 900 additions and 1,731 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,16 +69,14 @@ ethers-middleware = { version = "2", default-features = false }
 ethers-etherscan = { version = "2", default-features = false }
 ethers-solc = { version = "2", default-features = false }
 
-# # Patch ethers-rs with a local checkout then run `cargo update -p ethers`
-# [patch."https://github.com/gakonst/ethers-rs"]
-# ethers = { path = "../ethers-rs" }
+#[patch.crates-io]
+# ethers = { path = "../ethers-rs/ethers" }
 # ethers-addressbook = { path = "../ethers-rs/ethers-addressbook" }
-# ethers-core = { path = "../ethers-rs/ethers-core" }
 # ethers-contract = { path = "../ethers-rs/ethers-contract" }
+# ethers-core = { path = "../ethers-rs/ethers-core" }
+# ethers-etherscan = { path = "../ethers-rs/ethers-etherscan" }
+# ethers-middleware = { path = "../ethers-rs/ethers-middleware" }
 # ethers-providers = { path = "../ethers-rs/ethers-providers" }
 # ethers-signers = { path = "../ethers-rs/ethers-signers" }
-# ethers-etherscan = { path = "../ethers-rs/ethers-etherscan" }
 # ethers-solc = { path = "../ethers-rs/ethers-solc" }
-
-# [patch.crates-io]
 # revm = { path = "../revm/crates/revm" }
diff --git a/chisel/Cargo.toml b/chisel/Cargo.toml
@@ -37,7 +37,7 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls"] }
 # misc
 clap = { version = "4.2", features = ["derive", "env", "wrap_help"] }
 rustyline = "11.0"
-solang-parser = "=0.2.3"
+solang-parser = "=0.2.4"
 yansi = "0.5"
 strum = { version = "0.24.1", features = ["derive"] }
 serde = "1.0.159"

diff --git a/chisel/src/executor.rs b/chisel/src/executor.rs
@@ -461,7 +461,7 @@ impl Type {
             pt::Expression::New(_, inner) |                 // new <inner>
             pt::Expression::UnaryPlus(_, inner) |           // +<inner>
             // ops
-            pt::Expression::Complement(_, inner) |          // ~<inner>
+            pt::Expression::BitwiseNot(_, inner) |          // ~<inner>
             pt::Expression::ArraySlice(_, inner, _, _) |    // <inner>[*start*:*end*]
             // assign ops
             pt::Expression::PreDecrement(_, inner) |        // --<inner>

diff --git a/chisel/src/solidity_helper.rs b/chisel/src/solidity_helper.rs
@@ -103,7 +103,7 @@ impl SolidityHelper {
 
     /// Highlights a solidity source string
     pub fn highlight(input: &str) -> Cow<str> {
-        if !Paint::is_enabled() || Self::skip_input(input) {
+        if !Paint::is_enabled() {
             return Cow::Borrowed(input)
         }
 
@@ -150,11 +150,6 @@ impl SolidityHelper {
 
     /// Validate that a source snippet is closed (i.e., all braces and parenthesis are matched).
     fn validate_closed(input: &str) -> ValidationResult {
-        if Self::skip_input(input) {
-            let msg = Paint::red("\nInput must not start with `.<number>`");
-            return ValidationResult::Invalid(Some(msg.to_string()))
-        }
-
         let mut bracket_depth = 0usize;
         let mut paren_depth = 0usize;
         let mut brace_depth = 0usize;
@@ -218,14 +213,6 @@ impl SolidityHelper {
         Self::paint_unchecked(string, style, &mut out);
         out
     }
-
-    /// Whether to skip parsing this input due to known errors or panics
-    #[inline]
-    fn skip_input(input: &str) -> bool {
-        // input.startsWith(/\.[0-9]/)
-        let mut chars = input.chars();
-        chars.next() == Some('.') && chars.next().map(|c| c.is_ascii_digit()).unwrap_or_default()
-    }
 }
 
 impl Highlighter for SolidityHelper {

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -23,7 +23,7 @@ ui = { path = "../ui" }
 
 # eth
 ethers = { workspace = true, features = ["rustls"] }
-solang-parser = "=0.2.3"
+solang-parser = "=0.2.4"
 
 # cli
 clap = { version = "4.2", features = ["derive", "env", "unicode", "wrap_help"] }

diff --git a/cli/src/cmd/forge/geiger/visitor.rs b/cli/src/cmd/forge/geiger/visitor.rs
@@ -92,7 +92,7 @@ impl Visitor for CheatcodeVisitor {
             Expression::Not(_, expr) => {
                 expr.visit(self)?;
             }
-            Expression::Complement(_, expr) => {
+            Expression::BitwiseNot(_, expr) => {
                 expr.visit(self)?;
             }
             Expression::Delete(_, expr) => {

diff --git a/doc/Cargo.toml b/doc/Cargo.toml
@@ -32,7 +32,7 @@ tokio = { version = "1.27", features = ["macros", "rt-multi-thread"] }
 futures-util = "0.3"
 
 # misc
-solang-parser = "=0.2.3"
+solang-parser = "=0.2.4"
 eyre = "0.6"
 thiserror = "1.0.40"
 rayon = "1.7"

diff --git a/doc/src/lib.rs b/doc/src/lib.rs
@@ -35,4 +35,4 @@ pub use parser::{
 pub use preprocessor::*;
 
 /// Traits for formatting items into doc output.
-pub use writer::{AsDoc, AsDocResult, AsString, BufWriter, Markdown};
+pub use writer::{AsDoc, AsDocResult, BufWriter, Markdown};
diff --git a/doc/src/writer/as_doc.rs b/doc/src/writer/as_doc.rs
@@ -4,7 +4,7 @@ use crate::{
     document::{read_context, DocumentContent},
     parser::ParseSource,
     writer::BufWriter,
-    AsString, CommentTag, Comments, CommentsRef, Document, Markdown, PreprocessorOutput,
+    CommentTag, Comments, CommentsRef, Document, Markdown, PreprocessorOutput,
     CONTRACT_INHERITANCE_ID, GIT_SOURCE_ID, INHERITDOC_ID,
 };
 use forge_fmt::solang_ext::SafeUnwrap;
@@ -91,7 +91,7 @@ impl AsDoc for Document {
                             "({})",
                             func.params
                                 .iter()
-                                .map(|p| p.1.as_ref().map(|p| p.ty.as_string()).unwrap_or_default())
+                                .map(|p| p.1.as_ref().map(|p| p.ty.to_string()).unwrap_or_default())
                                 .join(", ")
                         ));
                     }

diff --git a/doc/src/writer/as_string.rs b/doc/src/writer/as_string.rs
diff --git a/doc/src/writer/buf_writer.rs b/doc/src/writer/buf_writer.rs
@@ -3,7 +3,7 @@ use once_cell::sync::Lazy;
 use solang_parser::pt::Parameter;
 use std::fmt::{self, Display, Write};
 
-use crate::{AsDoc, AsString, CommentTag, Comments, Markdown};
+use crate::{AsDoc, CommentTag, Comments, Markdown};
 
 /// Solidity language name.
 const SOLIDITY: &str = "solidity";
@@ -152,7 +152,7 @@ impl BufWriter {
 
             let row = [
                 Markdown::Code(&param_name.unwrap_or_else(|| "<none>".to_owned())).as_doc()?,
-                Markdown::Code(&param.ty.as_string()).as_doc()?,
+                Markdown::Code(&param.ty.to_string()).as_doc()?,
                 comment.unwrap_or_default().replace('\n', " "),
             ];
             self.write_piped(&row.join("|"))?;

diff --git a/doc/src/writer/mod.rs b/doc/src/writer/mod.rs
@@ -1,11 +1,9 @@
 //! The module for writing and formatting various parse tree items.
 
 mod as_doc;
-mod as_string;
 mod buf_writer;
 mod markdown;
 
 pub use as_doc::{AsDoc, AsDocResult};
-pub use as_string::AsString;
 pub use buf_writer::BufWriter;
 pub use markdown::Markdown;