Renamed the semantics lib to analyzer.

semantics/Cargo.toml → analyzer/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "fe-semantics"
+name = "fe-analyzer"
 version = "0.1.0-alpha"
 authors = ["Ethereum Foundation <snakecharmers@ethereum.org>"]
 edition = "2018"

semantics/src/lib.rs → analyzer/src/lib.rs

@@ -310,7 +310,7 @@ impl Context {
 
 /// Performs semantic analysis of the source program and returns a `Context`
 /// instance.
-pub fn analysis(module: &fe::Module) -> Result<Context, SemanticError> {
+pub fn analyze(module: &fe::Module) -> Result<Context, SemanticError> {
     let context = Context::new_shared();
     traversal::module::module(Rc::clone(&context), module)?;
     Ok(Rc::try_unwrap(context)

semantics/tests/analysis.rs → analyzer/tests/analysis.rs

@@ -1,19 +1,19 @@
-use fe_parser::ast as fe;
-use fe_parser::span::{
-    Span,
-    Spanned,
-};
-use fe_semantics;
-use fe_semantics::namespace::types::{
+use fe_analyzer;
+use fe_analyzer::namespace::types::{
     Array,
     Base,
     Map,
     Type,
 };
-use fe_semantics::{
+use fe_analyzer::{
     ExpressionAttributes,
     Location,
 };
+use fe_parser::ast as fe;
+use fe_parser::span::{
+    Span,
+    Spanned,
+};
 
 const GUEST_BOOK: &str = include_str!("fixtures/guest_book.fe");
 
@@ -91,7 +91,7 @@ fn guest_book_analysis() {
         .1
         .node;
 
-    let context = fe_semantics::analysis(&fe_module).expect("failed to perform semantic analysis");
+    let context = fe_analyzer::analyze(&fe_module).expect("failed to perform semantic analysis");
 
     for (start, end, expected) in &[
         (196, 206, &addr_val()),

compiler/Cargo.toml

@@ -14,7 +14,7 @@ solc-backend = ["solc"]
 [dependencies]
 fe-common = {path = "../common", version = "^0.1.0-alpha"}
 fe-parser = {path = "../parser", version = "^0.1.0-alpha"}
-fe-semantics = {path = "../semantics", version = "^0.1.0-alpha"}
+fe-analyzer = {path = "../analyzer", version = "^0.1.0-alpha"}
 serde_json = "1.0"
 serde = "1.0"
 hex = "0.4"

compiler/src/lib.rs

@@ -33,7 +33,7 @@ pub fn compile(src: FeSrc, with_bytecode: bool) -> Result<CompiledModule, Compil
     let json_abis = abi::build(&fe_module)?;
 
     // analyze source code
-    let context = fe_semantics::analysis(&fe_module)
+    let context = fe_analyzer::analyze(&fe_module)
         .map_err(|error| CompileError::str(error.format_user(src)))?;
 
     // compile to yul

compiler/src/yul/constructor.rs

@@ -1,5 +1,5 @@
 use crate::yul::operations::abi as abi_operations;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     AbiDecodeLocation,
     FixedSize,
 };

compiler/src/yul/mappers/assignments.rs

@@ -1,13 +1,13 @@
 use crate::errors::CompileError;
 use crate::yul::mappers::expressions;
 use crate::yul::operations::data as data_operations;
-use fe_parser::ast as fe;
-use fe_parser::span::Spanned;
-use fe_semantics::namespace::types::FixedSize;
-use fe_semantics::{
+use fe_analyzer::namespace::types::FixedSize;
+use fe_analyzer::{
     Context,
     Location,
 };
+use fe_parser::ast as fe;
+use fe_parser::span::Spanned;
 use std::convert::TryFrom;
 use yultsur::*;
 
@@ -90,18 +90,18 @@ fn expr_as_ident(expr: yul::Expression) -> Result<yul::Identifier, CompileError>
 #[cfg(test)]
 mod tests {
     use crate::yul::mappers::assignments::assign;
-    use fe_parser as parser;
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         Array,
         Type,
         U256,
     };
-    use fe_semantics::test_utils::ContextHarness;
-    use fe_semantics::{
+    use fe_analyzer::test_utils::ContextHarness;
+    use fe_analyzer::{
         Context,
         ExpressionAttributes,
         Location,
     };
+    use fe_parser as parser;
     use rstest::rstest;
 
     fn map(context: &Context, src: &str) -> String {

compiler/src/yul/mappers/contracts.rs

@@ -2,10 +2,10 @@ use crate::errors::CompileError;
 use crate::yul::constructor;
 use crate::yul::mappers::functions;
 use crate::yul::runtime;
+use fe_analyzer::Context;
 use fe_common::utils::keccak::get_full_signature;
 use fe_parser::ast as fe;
 use fe_parser::span::Spanned;
-use fe_semantics::Context;
 use yultsur::*;
 
 /// Builds a Yul object from a Fe contract.

compiler/src/yul/mappers/declarations.rs

@@ -1,14 +1,14 @@
 use crate::errors::CompileError;
 use crate::yul::mappers::expressions;
 use crate::yul::names;
-use fe_parser::ast as fe;
-use fe_parser::span::Spanned;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     Array,
     FeSized,
     FixedSize,
 };
-use fe_semantics::Context;
+use fe_analyzer::Context;
+use fe_parser::ast as fe;
+use fe_parser::span::Spanned;
 use yultsur::*;
 
 /// Builds a Yul statement from a Fe variable declaration
@@ -80,20 +80,20 @@ fn var_decl_array(
 #[cfg(test)]
 mod tests {
     use crate::yul::mappers::declarations::var_decl;
-    use fe_parser as parser;
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         Array,
         Base,
         FixedSize,
         Type,
         U256,
     };
-    use fe_semantics::test_utils::ContextHarness;
-    use fe_semantics::{
+    use fe_analyzer::test_utils::ContextHarness;
+    use fe_analyzer::{
         Context,
         ExpressionAttributes,
         Location,
     };
+    use fe_parser as parser;
 
     fn map(context: &Context, src: &str) -> String {
         let tokens = parser::get_parse_tokens(src).expect("Couldn't parse declaration");

compiler/src/yul/mappers/expressions.rs

@@ -2,19 +2,19 @@ use crate::errors::CompileError;
 use crate::yul::names;
 use crate::yul::operations::data as data_operations;
 use crate::yul::utils;
-use fe_common::utils::keccak::get_full_signature;
-use fe_parser::ast as fe;
-use fe_parser::span::Spanned;
-use fe_semantics::builtins;
-use fe_semantics::namespace::types::{
+use fe_analyzer::builtins;
+use fe_analyzer::namespace::types::{
     FixedSize,
     Type,
 };
-use fe_semantics::{
+use fe_analyzer::{
     CallType,
     Context,
     Location,
 };
+use fe_common::utils::keccak::get_full_signature;
+use fe_parser::ast as fe;
+use fe_parser::span::Spanned;
 use std::convert::TryFrom;
 use yultsur::*;
 
@@ -378,19 +378,19 @@ mod tests {
         expr,
         Location,
     };
-    use fe_parser as parser;
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         Array,
         Base,
         Map,
         Type,
         U256,
     };
-    use fe_semantics::test_utils::ContextHarness;
-    use fe_semantics::{
+    use fe_analyzer::test_utils::ContextHarness;
+    use fe_analyzer::{
         Context,
         ExpressionAttributes,
     };
+    use fe_parser as parser;
     use rstest::rstest;
 
     fn map(context: &Context, src: &str) -> String {

compiler/src/yul/mappers/functions.rs

@@ -7,16 +7,16 @@ use crate::yul::mappers::{
 use crate::yul::names;
 use crate::yul::operations::data as data_operations;
 use crate::yul::utils;
-use fe_parser::ast as fe;
-use fe_parser::span::Spanned;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     FeSized,
     Type,
 };
-use fe_semantics::{
+use fe_analyzer::{
     Context,
     ExpressionAttributes,
 };
+use fe_parser::ast as fe;
+use fe_parser::span::Spanned;
 use yultsur::*;
 
 pub fn multiple_func_stmt(

compiler/src/yul/mappers/module.rs

@@ -1,7 +1,7 @@
 use crate::errors::CompileError;
 use crate::yul::mappers::contracts;
+use fe_analyzer::Context;
 use fe_parser::ast as fe;
-use fe_semantics::Context;
 use std::collections::HashMap;
 use yultsur::yul;
 

compiler/src/yul/mod.rs

@@ -5,7 +5,7 @@ use crate::types::{
     FeModuleAst,
     NamedYulContracts,
 };
-use fe_semantics::Context;
+use fe_analyzer::Context;
 
 mod constructor;
 mod mappers;

compiler/src/yul/names.rs

@@ -1,4 +1,4 @@
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     AbiDecodeLocation,
     AbiEncoding,
 };
@@ -45,7 +45,7 @@ mod tests {
         decode_name,
         encode_name,
     };
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         AbiDecodeLocation,
         Array,
         Base,

compiler/src/yul/operations/abi.rs

@@ -1,7 +1,7 @@
 use crate::yul::names;
 use crate::yul::operations::data as data_operations;
 use crate::yul::utils;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     AbiArraySize,
     AbiDecodeLocation,
     AbiEncoding,
@@ -82,7 +82,7 @@ mod tests {
         encode,
         encode_size,
     };
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         AbiDecodeLocation,
         FeString,
         U256,

compiler/src/yul/operations/data.rs

@@ -1,6 +1,6 @@
 use crate::yul::operations::abi as abi_operations;
-use fe_semantics::namespace::events::Event;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::events::Event;
+use fe_analyzer::namespace::types::{
     Array,
     FeSized,
     FixedSize,
@@ -128,8 +128,8 @@ mod tests {
         emit_event,
         sum,
     };
-    use fe_semantics::namespace::events::Event;
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::events::Event;
+    use fe_analyzer::namespace::types::{
         Base,
         FixedSize,
         U256,

compiler/src/yul/runtime/abi_dispatcher.rs

@@ -1,12 +1,12 @@
 use crate::abi::utils as abi_utils;
 use crate::yul::names;
 use crate::yul::operations::abi as abi_operations;
-use fe_semantics::namespace::types::{
+use fe_analyzer::namespace::types::{
     AbiDecodeLocation,
     AbiEncoding,
     FixedSize,
 };
-use fe_semantics::FunctionAttributes;
+use fe_analyzer::FunctionAttributes;
 use yultsur::*;
 
 /// Builds a switch statement that dispatches calls to the contract.
@@ -80,7 +80,7 @@ fn selection_as_statement(name: String, params: &[FixedSize]) -> yul::Statement
 #[cfg(test)]
 mod tests {
     use crate::yul::runtime::abi_dispatcher::selector;
-    use fe_semantics::namespace::types::{
+    use fe_analyzer::namespace::types::{
         FixedSize,
         U256,
     };