unify parser code

Signed-off-by: Matthias Seitz <matthias.seitz@outlook.de>

Author: mattsse

Cargo.toml

@@ -11,11 +11,9 @@ keywords = [ "solidity", "compiler", "solana", "substrate", "ewasm" ]
 edition = "2021"
 
 [build-dependencies]
-lalrpop = "0.19"
 cc = "1.0"
 
 [dependencies]
-lalrpop-util = "0.19"
 regex = "1"
 num-bigint = "0.4"
 num-traits = "0.2"
@@ -30,8 +28,6 @@ serde = "1.0"
 serde_derive = { version = "1.0" }
 inkwell = { version = "^0.1.0-beta.3", features = ["target-webassembly", "target-bpf", "no-libffi-linking", "llvm13-0"], optional = true }
 blake2-rfc = "0.2.18"
-phf = { version = "0.10", features = ["macros"] }
-unicode-xid = "0.2.0"
 handlebars = "4.1"
 contract-metadata = "0.3.0"
 semver = { version = "^1.0.3", features = ["serde"] }
@@ -47,6 +43,7 @@ funty = "=1.1.0"
 itertools = "0.10"
 num-rational = "0.4"
 indexmap = "1.7"
+solang-parser = { path = "solang-parser", version = "0.1" }
 
 [dev-dependencies]
 parity-scale-codec-derive = "2.0.0"

build.rs

@@ -1,12 +1,6 @@
 use std::process::Command;
 
 fn main() {
-    lalrpop::Configuration::new()
-        .use_cargo_dir_conventions()
-        .emit_rerun_directives(true)
-        .process()
-        .unwrap();
-
     #[cfg(feature = "llvm")]
     {
         // compile our linker

solang-parser/build.rs

@@ -1,8 +1,7 @@
-
 fn main() {
     lalrpop::Configuration::new()
         .use_cargo_dir_conventions()
         .emit_rerun_directives(true)
         .process()
         .unwrap();
-}
+}

solang-parser/src/diagnostics.rs

@@ -161,4 +161,4 @@ impl Diagnostic {
             notes,
         }
     }
-}
+}

solang-parser/src/lib.rs

@@ -1,9 +1,9 @@
 //! Solidity file parser
 
+pub mod diagnostics;
 mod doc;
 pub mod lexer;
 pub mod pt;
-pub mod diagnostics;
 pub use diagnostics::Diagnostic;
 
 #[allow(clippy::all)]
@@ -56,7 +56,6 @@ pub fn parse(src: &str, file_no: usize) -> Result<pt::SourceUnit, Vec<Diagnostic
     }
 }
 
-
 pub fn box_option<T>(o: Option<T>) -> Option<Box<T>> {
     o.map(Box::new)
 }
@@ -171,4 +170,4 @@ mod test {
 
         assert_eq!(e, a);
     }
-}
+}

src/lib.rs

@@ -5,8 +5,7 @@ pub mod emit;
 pub mod file_resolver;
 #[cfg(feature = "llvm")]
 pub mod linker;
-pub mod parser;
-
+pub use solang_parser as parser;
 // In Sema, we use result unit for returning early
 // when code-misparses. The error will be added to the namespace diagnostics, no need to have anything but unit
 // as error.