Merge pull request #46 from AleoHQ/refactor/syntax-errors

Refactors SyntaxError to leo-ast

Cargo.lock

@@ -503,9 +503,11 @@ version = "0.1.0"
 dependencies = [
  "from-pest",
  "lazy_static",
+ "log",
  "pest",
  "pest-ast",
  "pest_derive",
+ "thiserror",
 ]
 
 [[package]]

ast/Cargo.toml

@@ -1,12 +1,14 @@
 [package]
 name = "leo-ast"
 version = "0.1.0"
-authors = ["howardwu <howardwu@berkeley.edu>"]
+authors = ["The Aleo Team <hello@aleo.org>"]
 edition = "2018"
 
 [dependencies]
 from-pest = { version = "0.3.1" }
 lazy_static = { version = "1.3.0" }
+log = { version = "0.4" }
 pest = { version = "2.0" }
 pest-ast = { version = "0.3.3" }
 pest_derive = { version = "2.0" }
+thiserror = { version = "1.0" }

ast/src/errors/mod.rs

@@ -0,0 +1,2 @@
+pub mod syntax;
+pub use syntax::*;

ast/src/errors/syntax.rs

@@ -1,4 +1,4 @@
-use leo_ast::ast::Rule;
+use crate::ast::Rule;
 
 use pest::error::Error;
 

ast/src/lib.rs

@@ -2,10 +2,11 @@
 extern crate lazy_static;
 #[macro_use]
 extern crate pest_derive;
-
+#[macro_use]
-extern crate from_pest;
+extern crate thiserror;
-extern crate pest;
-extern crate pest_ast;
 
 pub mod ast;
 pub use ast::*;
+
+pub mod errors;
+pub use errors::*;

compiler/src/errors/compiler.rs

@@ -1,5 +1,5 @@
-use crate::errors::{FunctionError, ImportError, IntegerError, SyntaxError};
+use crate::errors::{FunctionError, ImportError, IntegerError, };
-use leo_ast::ast::Rule;
+use leo_ast::{ast::Rule, SyntaxError};
 
 use pest::error::Error;
 use std::{io, path::PathBuf};

compiler/src/errors/mod.rs

@@ -1,6 +1,3 @@
-pub mod ast;
-pub use self::ast::*;
-
 pub mod compiler;
 pub use self::compiler::*;