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
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "2"
members = ["crates/mini-calc", "crates/calc-lib"]
members = ["crates/mini-calc", "crates/mini-calc-lib"]

[workspace.package]
version = "4.0.4"
Expand All @@ -17,7 +17,7 @@ exclude = [
]

[workspace.dependencies]
calc-lib = { path = "crates/calc-lib", version = "4.0.4-alpha" }
mini-calc-lib = { path = "crates/mini-calc-lib", version = "4.0.4-alpha" }

[profile.dist]
inherits = "release"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "calc-lib"
name = "mini-calc-lib"
version = { workspace = true }
license = { workspace = true }
description = { workspace = true }
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/mini-calc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ gnuplot = "0.0.39"
confy = "0.5.1"
serde = { version = "1.0.192", features = ["derive"] }
atty = "0.2"
calc-lib = {workspace = true}
mini-calc-lib = {workspace = true}
30 changes: 16 additions & 14 deletions crates/mini-calc/src/interpreting/interpreter.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
use crate::interpreting::stdlib::exec;
use calc_lib::exact_math::float_mode::FloatMode;
use calc_lib::exact_math::rationals::Rationals;
use calc_lib::functions::add::add;
use calc_lib::functions::divide::divide;
use calc_lib::functions::expo::expo;
use calc_lib::functions::function::*;
use calc_lib::functions::minus::minus;
use calc_lib::functions::mult::mult;
use calc_lib::parsing::ast::{Ast, Functions, Parameters, Ram};
use calc_lib::FLOAT_MODE;
use mini_calc_lib::exact_math::float_mode::FloatMode;
use mini_calc_lib::exact_math::rationals::Rationals;
use mini_calc_lib::functions::add::add;
use mini_calc_lib::functions::divide::divide;
use mini_calc_lib::functions::expo::expo;
use mini_calc_lib::functions::function::*;
use mini_calc_lib::functions::minus::minus;
use mini_calc_lib::functions::mult::mult;
use mini_calc_lib::parsing::ast::{Ast, Functions, Parameters, Ram};
use mini_calc_lib::FLOAT_MODE;

/// # Interpreter
/// Interprets the Ast, and gives the result
Expand Down Expand Up @@ -175,8 +175,8 @@ mod test {
use std::collections::HashMap;

use crate::interpreting::interpreter::interpret;
use calc_lib::exact_math::rationals::Rationals;
use calc_lib::parsing::ast::{Ast, Parameters};
use mini_calc_lib::exact_math::rationals::Rationals;
use mini_calc_lib::parsing::ast::{Ast, Parameters};

#[test]
fn test_interpreter_int() {
Expand Down Expand Up @@ -252,8 +252,10 @@ mod test {
fn test_interpreter_divide_operation() {
let mut ram: HashMap<String, Parameters> = HashMap::new();
let mut function: HashMap<String, (Vec<Ast>, Ast)> = HashMap::new();
let expected =
Parameters::Rational(calc_lib::exact_math::rationals::Rationals { under: 1, over: 1 });
let expected = Parameters::Rational(mini_calc_lib::exact_math::rationals::Rationals {
under: 1,
over: 1,
});
let ast = Ast::Node {
value: Parameters::DivideOperation,
left: Box::from(Ast::new(Parameters::Int(1))),
Expand Down
18 changes: 9 additions & 9 deletions crates/mini-calc/src/interpreting/stdlib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ use std::slice::from_ref;
use gnuplot::{AxesCommon, Figure};

use crate::interpreting::interpreter::interpret;
use calc_lib::configuration::loader::{load, load_config, Config};
use calc_lib::functions::divide::divide;
use calc_lib::functions::minus::minus;
use calc_lib::parsing::ast::{self};
use calc_lib::parsing::ast::{
use mini_calc_lib::configuration::loader::{load, load_config, Config};
use mini_calc_lib::functions::divide::divide;
use mini_calc_lib::functions::minus::minus;
use mini_calc_lib::parsing::ast::{self};
use mini_calc_lib::parsing::ast::{
Ast,
Parameters::{self, *},
};
use calc_lib::utils::matrix_utils::{lup_decompose, lup_determinant, lup_invert, transpose};
use calc_lib::utils::plot_utils::computes_lines;
use mini_calc_lib::utils::matrix_utils::{lup_decompose, lup_determinant, lup_invert, transpose};
use mini_calc_lib::utils::plot_utils::computes_lines;

use calc_lib::functions::add::add as other_add;
use calc_lib::functions::mult::mult;
use mini_calc_lib::functions::add::add as other_add;
use mini_calc_lib::functions::mult::mult;

type Ram<'a> = Option<&'a mut ast::Ram>;
type Functions<'a> = Option<&'a mut ast::Functions>;
Expand Down
24 changes: 12 additions & 12 deletions crates/mini-calc/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ use std::sync::Arc;

use ansi_term::Color;
use atty::Stream;
use calc_lib::configuration::loader::Config;
use calc_lib::configuration::loader::{
load, load_config, write_config, write_default_config, Greeting, Loaded, Prompt,
};
use calc_lib::exact_math::float_mode::FloatMode;
use calc_lib::lexing::lexer::lex;
use calc_lib::parsing::ast::{Ast, Parameters};
use calc_lib::parsing::parser::{init_calc_parser, CalcParser};
use calc_lib::FLOAT_MODE;
use calc_lib::VERSION;
use interpreting::interpreter::interpret;
use linefeed::{Completer, Completion, Interface, ReadResult, Terminal};
use mini_calc_lib::configuration::loader::Config;
use mini_calc_lib::configuration::loader::{
load, load_config, write_config, write_default_config, Greeting, Loaded, Prompt,
};
use mini_calc_lib::exact_math::float_mode::FloatMode;
use mini_calc_lib::lexing::lexer::lex;
use mini_calc_lib::parsing::ast::{Ast, Parameters};
use mini_calc_lib::parsing::parser::{init_calc_parser, CalcParser};
use mini_calc_lib::FLOAT_MODE;
use mini_calc_lib::VERSION;
use std::io::BufRead;
use std::{fs, io};

Expand Down Expand Up @@ -441,7 +441,7 @@ fn main() {
};
let lexed = lex(code.clone());
let parser: &mut CalcParser =
&mut calc_lib::parsing::parser::init_calc_parser(&lexed);
&mut mini_calc_lib::parsing::parser::init_calc_parser(&lexed);
let parsed = parser.parse();
if verbose {
println!("Lexing of line: {}", &code);
Expand Down Expand Up @@ -526,7 +526,7 @@ fn main() {
} else {
let lexed = lex(verb.to_string());
let parser: &mut CalcParser =
&mut calc_lib::parsing::parser::init_calc_parser(&lexed);
&mut mini_calc_lib::parsing::parser::init_calc_parser(&lexed);
let parsed = parser.parse();
if verbose {
println!("Lexing of line: {verb}");
Expand Down