add more updates doc
This commit is contained in:
parent
8f3cbc65d0
commit
2e95dc0083
|
@ -1 +1 @@
|
||||||
,winsdominoes,aurora,21.02.2025 23:51,file:///var/home/winsdominoes/.var/app/org.libreoffice.LibreOffice/config/libreoffice/4;
|
,winsdominoes,aurora,23.02.2025 20:41,file:///var/home/winsdominoes/.var/app/org.libreoffice.LibreOffice/config/libreoffice/4;
|
Binary file not shown.
|
@ -68,7 +68,7 @@ mod tests {
|
||||||
{
|
{
|
||||||
use crate::parsemath::parser::Parser;
|
use crate::parsemath::parser::Parser;
|
||||||
|
|
||||||
let ast = Parser::new("3+3|4").unwrap().parse().unwrap();
|
let ast = Parser::new("3+3 | 4").unwrap().parse().unwrap();
|
||||||
let value = eval(ast).unwrap();
|
let value = eval(ast).unwrap();
|
||||||
assert_eq!(value, 6.0);
|
assert_eq!(value, 6.0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -264,4 +264,12 @@ mod tests {
|
||||||
let expected = Caret(Box::new(Number(4.0)), Box::new(Number(5.0)));
|
let expected = Caret(Box::new(Number(4.0)), Box::new(Number(5.0)));
|
||||||
assert_eq!(parser.parse().unwrap(), expected);
|
assert_eq!(parser.parse().unwrap(), expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parenthesis()
|
||||||
|
{
|
||||||
|
let mut parser = Parser::new("(2 + 3").unwrap();
|
||||||
|
let expected = Caret(Box::new(Number(2.0)), Box::new(Number(3.0)));
|
||||||
|
assert_eq!(parser.parse().unwrap(), expected);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,6 +65,7 @@ impl<'a> Iterator for Tokenizer<'a>
|
||||||
Some('^') => Some(Token::Caret),
|
Some('^') => Some(Token::Caret),
|
||||||
Some('(') => Some(Token::LeftParen),
|
Some('(') => Some(Token::LeftParen),
|
||||||
Some(')') => Some(Token::RightParen),
|
Some(')') => Some(Token::RightParen),
|
||||||
|
Some(' ') => self.next(),
|
||||||
None => Some(Token::EOF),
|
None => Some(Token::EOF),
|
||||||
Some(_) => None,
|
Some(_) => None,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1 @@
|
||||||
<<<<<<< HEAD
|
{"rustc_fingerprint":14404728096486143510,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.83.0 (90b35a623 2024-11-26)\nbinary: rustc\ncommit-hash: 90b35a6239c3d8bdabc530a6a0816f7ff89a0aaf\ncommit-date: 2024-11-26\nhost: x86_64-unknown-linux-gnu\nrelease: 1.83.0\nLLVM version: 19.1.1\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/usr/local/rustup/toolchains/1.83.0-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
|
||||||
{"rustc_fingerprint":14404728096486143510,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.83.0 (90b35a623 2024-11-26)\nbinary: rustc\ncommit-hash: 90b35a6239c3d8bdabc530a6a0816f7ff89a0aaf\ncommit-date: 2024-11-26\nhost: x86_64-unknown-linux-gnu\nrelease: 1.83.0\nLLVM version: 19.1.1\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/usr/local/rustup/toolchains/1.83.0-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
|
|
||||||
=======
|
|
||||||
{"rustc_fingerprint":15625702514836887422,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/usr/local/rustup/toolchains/1.83.0-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\nfmt_debug=\"full\"\noverflow_checks\npanic=\"unwind\"\nproc_macro\nrelocation_model=\"pic\"\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nub_checks\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.83.0 (90b35a623 2024-11-26)\nbinary: rustc\ncommit-hash: 90b35a6239c3d8bdabc530a6a0816f7ff89a0aaf\ncommit-date: 2024-11-26\nhost: x86_64-unknown-linux-gnu\nrelease: 1.83.0\nLLVM version: 19.1.1\n","stderr":""},"14371922958718593042":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/usr/local/rustup/toolchains/1.83.0-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
|
|
||||||
>>>>>>> refs/remotes/origin/master
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1 +1 @@
|
||||||
/workspaces/cmkl/spring-2025/sen-109/00020/eval/target/debug/expression-eval: /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/main.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/ast.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/evaluate.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/mod.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/parser.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/token.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/tokenizer.rs
|
/workspaces/cmkl/spring-2025/sen-109/00020/eval/target/debug/expression-eval: /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/lib.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/main.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/ast.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/evaluate.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/mod.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/parser.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/token.rs /workspaces/cmkl/spring-2025/sen-109/00020/eval/src/parsemath/tokenizer.rs
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue