Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/lexical_analysis/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::iter::{FromIterator, Peekable};
use std::str::Chars;

use log::{debug, info, trace};

use crate::lexical_analysis::model::token::Token;

pub(crate) mod model;
Expand Down
23 changes: 14 additions & 9 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#[macro_use]
extern crate log;
extern crate pretty_env_logger;

use std::io::{stdin, stdout, Write};

use anyhow::{Context, Result};
use clap::Parser;
use log::{debug, error, info};

use crate::cli::Arguments;
use crate::evaluator::Evaluator;
Expand All @@ -20,12 +17,20 @@ mod syntax_analysis;
fn main() {
let arguments = Arguments::parse();

// Set up logging: if verbose is true and RUST_LOG is not set, default to info level
if arguments.verbose && std::env::var("RUST_LOG").is_err() {
std::env::set_var("RUST_LOG", "info");
// Set up logging. Log level precedence:
// - RUST_LOG, if set.
// - info, if --verbose is passed.
let mut logger = pretty_env_logger::formatted_builder();
match std::env::var("RUST_LOG") {
Ok(rust_log) => {
logger.parse_filters(&rust_log);
}
Err(_) if arguments.verbose => {
logger.filter_level(log::LevelFilter::Info);
}
Err(_) => {}
}

pretty_env_logger::init();
logger.init();

info!("Version {}.", env!("CARGO_PKG_VERSION"));
debug!("The command line arguments provided are {arguments:?}.");
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/expression/function_expression/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::Expression;
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/expression/grouped_expression/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::Expression;
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/expression/if_expression/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::Expression;
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/expression/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::{debug, trace};

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::{Expression, SyntaxTreeNode};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::Expression;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::get_infix_operator_precedence;
use crate::syntax_analysis::model::syntax_tree_node::{Expression, InfixOperator};
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/expression/utilities/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::syntax_tree_node::Block;
use crate::syntax_analysis::SyntaxAnalysis;
Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::debug;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::syntax_tree_node::SyntaxTreeNode;

Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/model/expression_precedence/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::trace;

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::syntax_tree_node::InfixOperator;

Expand Down
2 changes: 2 additions & 0 deletions src/syntax_analysis/statement/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use log::{debug, trace};

use crate::lexical_analysis::model::token::Token;
use crate::syntax_analysis::model::expression_precedence::ExpressionPrecedence;
use crate::syntax_analysis::model::syntax_tree_node::{Statement, SyntaxTreeNode};
Expand Down