Browse Source

Move are parser related parts into parser module

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 6 years ago
parent
commit
9b37bcad82
9 changed files with 13 additions and 14 deletions
  1. 1 1
      src/emit/mod.rs
  2. 0 2
      src/main.rs
  3. 1 1
      src/output.rs
  4. 1 1
      src/parser/ast.rs
  5. 3 2
      src/parser/mod.rs
  6. 1 1
      src/parser/solidity.lalrpop
  7. 4 4
      src/parser/solidity.rs
  8. 1 1
      src/resolver/cfg.rs
  9. 1 1
      src/resolver/mod.rs

+ 1 - 1
src/emit/mod.rs

@@ -1,5 +1,5 @@
 
-use ast;
+use parser::ast;
 use resolver;
 use resolver::cfg;
 use std::str;

+ 0 - 2
src/main.rs

@@ -14,13 +14,11 @@ extern crate wasmi;
 extern crate inkwell;
 
 use clap::{App, Arg};
-mod ast;
 mod emit;
 mod link;
 mod output;
 mod parser;
 mod resolver;
-mod solidity;
 mod test;
 
 use serde::Serialize;

+ 1 - 1
src/output.rs

@@ -1,4 +1,4 @@
-use ast;
+use parser::ast;
 use serde::Serialize;
 
 #[derive(Debug, PartialEq)]

+ 1 - 1
src/ast.rs → src/parser/ast.rs

@@ -378,7 +378,7 @@ impl Statement {
 #[cfg(test)]
 mod test {
     use super::*;
-    use solidity;
+    use parser::solidity;
 
     #[test]
     fn parse_test() {

+ 3 - 2
src/parser.rs → src/parser/mod.rs

@@ -1,7 +1,8 @@
-use ast;
+pub mod ast;
+pub mod solidity;
+
 use lalrpop_util::ParseError;
 use output::Output;
-use solidity;
 
 pub fn parse(src: &str) -> Result<ast::SourceUnit, Vec<Output>> {
     // parse phase

+ 1 - 1
src/solidity.lalrpop → src/parser/solidity.lalrpop

@@ -1,7 +1,7 @@
 
 use std::str::FromStr;
 use num_bigint::BigInt;
-use ast::*;
+use parser::ast::*;
 use parser::box_option;
 
 grammar;

+ 4 - 4
src/solidity.rs → src/parser/solidity.rs

@@ -1,8 +1,8 @@
 // auto-generated: "lalrpop 0.17.2"
-// sha256: 6a92124102d652ea5457ffc7778167a483e5faf6f31173b86d87c672a8e5d52
+// sha256: 3256a684bd7eca0e6bbe52cc37391c66fda8cdcf19a55c4b75d50c43e1d17f6
 use std::str::FromStr;
 use num_bigint::BigInt;
-use ast::*;
+use parser::ast::*;
 use parser::box_option;
 #[allow(unused_extern_crates)]
 extern crate lalrpop_util as __lalrpop_util;
@@ -15,7 +15,7 @@ mod __parse__SourceUnit {
 
     use std::str::FromStr;
     use num_bigint::BigInt;
-    use ast::*;
+    use parser::ast::*;
     use parser::box_option;
     #[allow(unused_extern_crates)]
     extern crate lalrpop_util as __lalrpop_util;
@@ -15237,7 +15237,7 @@ mod __intern_token {
     #![allow(unused_imports)]
     use std::str::FromStr;
     use num_bigint::BigInt;
-    use ast::*;
+    use parser::ast::*;
     use parser::box_option;
     #[allow(unused_extern_crates)]
     extern crate lalrpop_util as __lalrpop_util;

+ 1 - 1
src/resolver/cfg.rs

@@ -7,7 +7,7 @@ use std::collections::HashSet;
 use std::collections::LinkedList;
 use unescape::unescape;
 
-use ast;
+use parser::ast;
 use hex;
 use output;
 use output::Output;

+ 1 - 1
src/resolver/mod.rs

@@ -1,5 +1,5 @@
 
-use ast;
+use parser::ast;
 use output::{Note, Output};
 use serde::Serialize;
 use std::collections::HashMap;