Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-07-05 01:59:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed token and pretoken

Browse Source
This commit is contained in:
Mark
2023-06-16 12:58:06 -07:00
parent 081dc1b7ab
commit 1495dcd561
17 changed files with 280 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/context.rs
View File

@ -1,10 +1,10 @@
use crate::parser::Token;
use crate::parser::Expression;
use std::collections::HashMap;
#[derive(Debug)]
pub struct Context {
history: Vec<Token>,
variables: HashMap<String, Token>
history: Vec<Expression>,
variables: HashMap<String, Expression>
}
impl Context {
@ -12,13 +12,13 @@ impl Context {
Context{ history: Vec::new(), variables: HashMap::new() }
}
pub fn push_hist(&mut self, t: Token) { self.history.push(t); }
pub fn push_var(&mut self, s: String, t: Token) { self.variables.insert(s, t); }
pub fn push_hist(&mut self, t: Expression) { self.history.push(t); }
pub fn push_var(&mut self, s: String, t: Expression) { self.variables.insert(s, t); }
pub fn del_var(&mut self, s: &String) { self.variables.remove(s); }
pub fn get_variable(&self, s: &String) -> Option<Token> {
pub fn get_variable(&self, s: &String) -> Option<Expression> {
let v: Option<&Token>;
let v: Option<&Expression>;
if s == "ans" {
v = self.history.last();