Skip to content

Commit 1a6ea03

Browse files
authored
Merge pull request #3 from BearToCode/working
Repository Rename
2 parents 5ecfbc4 + eaab42b commit 1a6ea03

File tree

32 files changed

+70
-69
lines changed

32 files changed

+70
-69
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Numerus
1+
# Fermi
22

3-
Numerus is currently work-in-progress.
3+
Fermi is currently work-in-progress.
44

5-
If you looking for `numcore` click [here](https://github.com/BearToCode/Numerus/tree/master/src-tauri/numcore).
5+
If you looking for `fm_mat` click [here](https://github.com/BearToCode/Fermi/tree/master/src-tauri/fm_mat).

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "numerus-app",
2+
"name": "fermi-app",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",

src-tauri/Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ serde = { version = "1.0", features = ["derive"] }
2020
tauri = { version = "1.0.0", features = ["api-all"] }
2121
window-shadows = "0.1.3"
2222

23-
[dependencies.numcore]
24-
path = "numcore"
23+
[dependencies.fm_mat]
24+
path = "fm_mat"
2525
features = ["serde_support"]
2626

2727
[features]
File renamed without changes.

src-tauri/numcore/Cargo.toml renamed to src-tauri/fm_mat/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[package]
2-
name = "numcore"
3-
version = "0.1.0"
2+
name = "fm_mat"
3+
version = "0.0.1"
44
description = "A math interpreter and evaluator"
55
keywords = ["math", "parser", "evaluator", "complex", "analysis"]
66
categories = ["mathematics", "parsing"]
77
edition = "2021"
8-
repository = "https://github.com/BearToCode/Numerus.git"
9-
homepage = "https://github.com/BearToCode/Numerus/tree/master/src-tauri/numcore"
10-
documentation = "https://docs.rs/numcore"
8+
repository = "https://github.com/BearToCode/Fermi.git"
9+
homepage = "https://github.com/BearToCode/Fermi/tree/master/src-tauri/fm_mat"
10+
documentation = "https://docs.rs/fm_mat"
1111
readme = "README.md"
1212
license = "MIT"
1313
authors = ["BearToCode"]
1414

1515
[lib]
16-
name = "numcore"
16+
name = "fm_mat"
1717
"path" = "src/lib.rs"
1818

1919
[features]
File renamed without changes.

src-tauri/numcore/README.md renamed to src-tauri/fm_mat/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

2-
# Numcore: a math interpreter and evaluator
2+
# fm_mat: a math interpreter and evaluator
33

4-
[![crate](https://img.shields.io/crates/v/numcore)](https://crates.io/crates/numcore)
5-
[![license](https://img.shields.io/github/license/BearToCode/Numerus)](https://github.com/BearToCode/Numerus/blob/master/src-tauri/numcore/LICENSE)
6-
[![docs](https://img.shields.io/docsrs/numcore)](https://docs.rs/numcore/1.0.0/numcore/)
4+
[![crate](https://img.shields.io/crates/v/fm_mat)](https://crates.io/crates/fm_mat)
5+
[![license](https://img.shields.io/github/license/BearToCode/Fermi)](https://github.com/BearToCode/Fermi/blob/master/src-tauri/fm_mat/LICENSE)
6+
[![docs](https://img.shields.io/docsrs/fm_mat)](https://docs.rs/fm_mat/1.0.0/fm_mat/)
77

8-
**Numcore** allows you to easily **parse** strings into math expressions
8+
**fm_mat** allows you to easily **parse** strings into math expressions
99
and **evaluate** them.
1010

11-
Numcore is part of [Numerus](https://github.com/BearToCode/Numerus).
11+
fm_mat is part of [Fermi](https://github.com/BearToCode/Fermi).
1212

1313
## Features
1414
* Binary and unary operators
@@ -34,7 +34,7 @@ Much more will be implemented in future releases!
3434

3535
Evaluating **simple static expressions**:
3636
```rust
37-
use numcore::*;
37+
use fm_mat::*;
3838

3939
assert_eq!(eval("2+2").unwrap(), Value::from(4));
4040
assert_eq!(eval("sin(pi)").unwrap(), Value::from(0));
@@ -44,7 +44,7 @@ assert_eq!(eval("re(10+3i)").unwrap(), Value::from(10));
4444
Using **contexts**:
4545

4646
```rust
47-
use numcore::*;
47+
use fm_mat::*;
4848

4949
let mut context = Context::default();
5050
// Declaring a function
@@ -66,7 +66,7 @@ assert_eq!(res, Some(Value::from(55)));
6666
to access the contained data:
6767

6868
```rust
69-
use numcore::Value;
69+
use fm_mat::Value;
7070

7171
let value = Value::Float(1.0);
7272

@@ -153,7 +153,7 @@ met, the cast would have failed.
153153
as settings. They can be created as follows:
154154

155155
```rust
156-
use numcore::*;
156+
use fm_mat::*;
157157

158158
let mut my_context = Context::new(settings::Rounding::Round(8));
159159
```
@@ -170,9 +170,9 @@ num = { version = "<version>", features = [ "serde_support" ] }
170170
```
171171

172172
## License and contribution
173-
Differently from Numerus, Numcore is licensed under a **MIT License**.
173+
Differently from Fermi, fm_mat is licensed under a **MIT License**.
174174

175-
Numcore is currently under heavy development, but feel free to open issues and
175+
fm_mat is currently under heavy development, but feel free to open issues and
176176
pull requests for any problems or ideas you come up with.
177177

178178
**IMPORTANT**: after staging files use the `npm run commit` command to commit and then

src-tauri/numcore/src/api/mod.rs renamed to src-tauri/fm_mat/src/api/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{context::Context, interpreter, out::*, token, tree, value::Value};
99
/// ## Examples
1010
/// This works:
1111
/// ```
12-
/// use numcore::*;
12+
/// use fm_mat::*;
1313
///
1414
/// let result = eval("2 + 2").unwrap();
1515
///
@@ -19,7 +19,7 @@ use crate::{context::Context, interpreter, out::*, token, tree, value::Value};
1919
///
2020
/// This panics:
2121
/// ```should_panic
22-
/// use numcore::*;
22+
/// use fm_mat::*;
2323
///
2424
/// // Unwraps an error.
2525
/// let result = eval("f(x) = 2x").unwrap();
@@ -37,7 +37,7 @@ pub fn eval(input: &str) -> EvalResult<Value> {
3737
///
3838
/// ## Examples
3939
/// ```
40-
/// use numcore::*;
40+
/// use fm_mat::*;
4141
///
4242
/// // Create context with custom settings
4343
/// let context = Context::new(
@@ -78,7 +78,7 @@ pub fn eval_with_static_context(input: &str, context: &Context) -> EvalResult<Va
7878
///
7979
/// ## Examples
8080
/// ```
81-
/// use numcore::*;
81+
/// use fm_mat::*;
8282
///
8383
/// let mut context = Context::default();
8484
///
@@ -100,5 +100,6 @@ pub fn eval_with_mutable_context(input: &str, context: &mut Context) -> EvalResu
100100
let tree = tree::build_tree(stream)?;
101101
let request = interpreter::interpret_tree(&tree)?;
102102

103+
println!("REQUEST: {:?}", request);
103104
request.execute(context)
104105
}

0 commit comments

Comments
 (0)