titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
Simon Gardling
2023-12-08 10:12:27 -05:00
parent 8902c986f8
commit 625bfae3be
10 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Cargo.lock generated
View File

@@ -660,7 +660,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -669,7 +669,7 @@ dependencies = [
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cocoa", "cocoa",
@@ -698,7 +698,7 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"ahash", "ahash",
@@ -711,7 +711,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"arboard", "arboard",
"egui", "egui",
@@ -726,7 +726,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@@ -740,7 +740,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_plot" name = "egui_plot"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"egui", "egui",
] ]
@@ -754,7 +754,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -774,7 +774,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.24.1" version = "0.24.1"
source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@@ -1429,9 +1429,9 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.9" version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@@ -3133,9 +3133,9 @@ dependencies = [
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.5.19" version = "0.5.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@@ -3224,18 +3224,18 @@ dependencies = [
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.7.28" version = "0.7.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.7.28" version = "0.7.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

0
build.sh Executable file → Normal file
View File

8
parsing/src/autocomplete.rs
View File

@@ -1,4 +1,4 @@
use std::{hint::unreachable_unchecked, intrinsics::assume}; use std::hint::unreachable_unchecked;
use crate::{generate_hint, Hint, HINT_EMPTY}; use crate::{generate_hint, Hint, HINT_EMPTY};
@@ -70,12 +70,6 @@ impl<'a> AutoComplete<'a> {
// Impossible for plural hints to be singular or non-existant // Impossible for plural hints to be singular or non-existant
debug_assert!(hints.len() > 1); // check on debug debug_assert!(hints.len() > 1); // check on debug
// Hint to the compiler
unsafe {
assume(hints.len() > 1);
assume(!hints.is_empty());
}
match movement { match movement {
Movement::Up => { Movement::Up => {
// Wrap self.i to maximum `i` value if needed // Wrap self.i to maximum `i` value if needed

1
parsing/src/lib.rs
View File

@@ -1,5 +1,4 @@
#![feature(const_trait_impl)] #![feature(const_trait_impl)]
#![feature(core_intrinsics)]
#![feature(const_mut_refs)] #![feature(const_mut_refs)]
#![feature(const_for)] #![feature(const_for)]
mod autocomplete; mod autocomplete;

1
parsing/src/splitting.rs
View File

@@ -127,6 +127,7 @@ pub fn split_function_chars(chars: &[char], split: SplitType) -> Vec<String> {
// Append split // Append split
if curr_c.splitable(c, &prev_char, &split) { if curr_c.splitable(c, &prev_char, &split) {
// create new buffer
data.push(String::new()); data.push(String::new());
last = unsafe { data.last_mut().unwrap_unchecked() }; last = unsafe { data.last_mut().unwrap_unchecked() };
} }

5
parsing/src/suggestions.rs
View File

@@ -1,5 +1,4 @@
use crate::{split_function_chars, SplitType}; use crate::{split_function_chars, SplitType};
use std::intrinsics::assume;
pub const HINT_EMPTY: Hint = Hint::Single("x^2"); pub const HINT_EMPTY: Hint = Hint::Single("x^2");
const HINT_CLOSED_PARENS: Hint = Hint::Single(")"); const HINT_CLOSED_PARENS: Hint = Hint::Single(")");
@@ -20,10 +19,6 @@ pub fn generate_hint<'a>(input: &str) -> &'a Hint<'a> {
} else { } else {
let chars: Vec<char> = input.chars().collect::<Vec<char>>(); let chars: Vec<char> = input.chars().collect::<Vec<char>>();
unsafe {
assume(!chars.is_empty());
}
let key = get_last_term(&chars); let key = get_last_term(&chars);
match key { match key {
Some(key) => { Some(key) => {

0
push.sh Executable file → Normal file
View File

3
src/function_entry.rs
View File

@@ -10,7 +10,6 @@ use serde::{ser::SerializeStruct, Deserialize, Deserializer, Serialize, Serializ
use std::{ use std::{
fmt::{self, Debug}, fmt::{self, Debug},
hash::{Hash, Hasher}, hash::{Hash, Hasher},
intrinsics::assume,
}; };
/// Represents the possible variations of Riemann Sums /// Represents the possible variations of Riemann Sums
@@ -277,8 +276,6 @@ impl FunctionEntry {
debug_assert!(resolution > 0.0); debug_assert!(resolution > 0.0);
let resolution_iter = step_helper(settings.plot_width + 1, settings.min_x, resolution); let resolution_iter = step_helper(settings.plot_width + 1, settings.min_x, resolution);
unsafe { assume(!resolution_iter.is_empty()) }
// Makes sure proper arguments are passed when integral is enabled // Makes sure proper arguments are passed when integral is enabled
if self.integral && settings.integral_changed { if self.integral && settings.integral_changed {
self.clear_integral(); self.clear_integral();

1
src/lib.rs
View File

@@ -1,7 +1,6 @@
#![feature(const_mut_refs)] #![feature(const_mut_refs)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(const_trait_impl)] #![feature(const_trait_impl)]
#![feature(core_intrinsics)]
#![feature(const_fn_floating_point_arithmetic)] #![feature(const_fn_floating_point_arithmetic)]
#![feature(const_assume)] #![feature(const_assume)]
#![feature(const_option_ext)] #![feature(const_option_ext)]

0
start-server.sh Executable file → Normal file
View File