Added user function parsing

pull/2/head
Mark 2023-08-04 21:33:42 -07:00
parent b40af1af53
commit eadd6780ce
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
9 changed files with 79 additions and 55 deletions

View File

@ -231,7 +231,7 @@ pub fn do_command(
} }
let v = args[1].to_string(); let v = args[1].to_string();
let v = substitute(&v); let v = substitute(&v, context);
let r = context.delete(&v); let r = context.delete(&v);
return match r { return match r {

View File

@ -4,7 +4,7 @@ use termion::raw::RawTerminal;
use termion::color; use termion::color;
use termion::style; use termion::style;
use crate::parser::substitute_cursor; use crate::parser::substitute_cursor;
use crate::context::Context;
#[derive(Debug)] #[derive(Debug)]
pub struct PromptBuffer { pub struct PromptBuffer {
@ -37,9 +37,9 @@ impl PromptBuffer {
} }
// Same as write_primpt, but pretends there is no cursor // Same as write_primpt, but pretends there is no cursor
pub fn write_prompt_nocursor(&mut self, stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> { pub fn write_prompt_nocursor(&mut self, stdout: &mut RawTerminal<std::io::Stdout>, context: &Context) -> Result<(), std::io::Error> {
// Draw prettyprinted expression // Draw prettyprinted expression
let (_, s) = substitute_cursor(&self.get_contents(), self.buffer.chars().count()); let (_, s) = substitute_cursor(&self.get_contents(), self.buffer.chars().count(), context);
write!( write!(
stdout, "\r{}{}==>{}{} {}", stdout, "\r{}{}==>{}{} {}",
@ -64,12 +64,12 @@ impl PromptBuffer {
return Ok(()); return Ok(());
} }
pub fn write_prompt(&mut self, stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> { pub fn write_prompt(&mut self, stdout: &mut RawTerminal<std::io::Stdout>, context: &Context) -> Result<(), std::io::Error> {
let l = self.buffer.chars().count(); let l = self.buffer.chars().count();
let i = if l == 0 {0} else {l - self.cursor}; let i = if l == 0 {0} else {l - self.cursor};
// Draw prettyprinted expression // Draw prettyprinted expression
let (display_cursor, s) = substitute_cursor(&self.get_contents(), i); let (display_cursor, s) = substitute_cursor(&self.get_contents(), i, context);
write!( write!(
stdout, "\r{}{}==>{}{} {}", stdout, "\r{}{}==>{}{} {}",

View File

@ -101,8 +101,8 @@ fn do_assignment(
let left = parts[0].trim().to_string(); let left = parts[0].trim().to_string();
let right = parts[1].trim().to_string(); let right = parts[1].trim().to_string();
let right = substitute(&right); let right = substitute(&right, &context);
let left = substitute(&left); let left = substitute(&left, &context);
let is_function = left.contains("("); let is_function = left.contains("(");
@ -305,7 +305,7 @@ pub fn main() -> Result<(), std::io::Error> {
'outer: loop { 'outer: loop {
pb.write_prompt(&mut stdout)?; pb.write_prompt(&mut stdout, &context)?;
let stdin = stdin(); let stdin = stdin();
for c in stdin.keys() { for c in stdin.keys() {
@ -314,7 +314,7 @@ pub fn main() -> Result<(), std::io::Error> {
'\n' => { '\n' => {
// Print again without cursor, in case we pressed enter // Print again without cursor, in case we pressed enter
// while inside a substitution // while inside a substitution
pb.write_prompt_nocursor(&mut stdout)?; pb.write_prompt_nocursor(&mut stdout, &context)?;
let in_str = pb.enter(); let in_str = pb.enter();
write!(stdout, "\r\n")?; write!(stdout, "\r\n")?;
if in_str == "" { break; } if in_str == "" { break; }
@ -384,7 +384,7 @@ pub fn main() -> Result<(), std::io::Error> {
}; };
}; };
pb.write_prompt(&mut stdout)?; pb.write_prompt(&mut stdout, &context)?;
} }
} }

View File

@ -13,6 +13,8 @@ pub fn eval_operator(g: &Expression, _context: &mut Context) -> Result<Option<Ex
match op { match op {
Operator::Function(_) => unreachable!("Functions are handled seperately."), Operator::Function(_) => unreachable!("Functions are handled seperately."),
Operator::UserFunction(_) => unimplemented!(),
Operator::Tuple => { Operator::Tuple => {
if args.len() != 2 { panic!() }; if args.len() != 2 { panic!() };
let a = &args[0]; let a = &args[0];

View File

@ -1,6 +1,8 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::VecDeque; use std::collections::VecDeque;
use crate::context::Context;
use super::Expression; use super::Expression;
use super::Function; use super::Function;
@ -8,7 +10,7 @@ use super::Function;
/// Operator types, in order of increasing priority. /// Operator types, in order of increasing priority.
#[derive(Debug)] #[derive(Debug)]
#[derive(Clone)] #[derive(Clone)]
#[derive(Copy)] //#[derive(Copy)]
#[repr(usize)] #[repr(usize)]
pub enum Operator { pub enum Operator {
// When adding operators, don't forget to update help command text. // When adding operators, don't forget to update help command text.
@ -32,6 +34,7 @@ pub enum Operator {
Factorial, Factorial,
Function(Function), Function(Function),
UserFunction(String)
} }
impl PartialEq for Operator { impl PartialEq for Operator {
@ -61,13 +64,17 @@ impl Operator {
} }
#[inline(always)] #[inline(always)]
pub fn from_string(s: &str) -> Option<Operator> { pub fn from_string(s: &str, context: &Context) -> Option<Operator> {
let f = Function::from_string(s); let f = Function::from_string(s);
if let Some(f) = f { if let Some(f) = f {
return Some(Operator::Function(f)); return Some(Operator::Function(f));
} }
if context.is_function(s) {
return Some(Operator::UserFunction(s.to_string()));
}
return match s { return match s {
"," => {Some( Operator::Tuple )}, "," => {Some( Operator::Tuple )},
"+" => {Some( Operator::Add )}, "+" => {Some( Operator::Add )},
@ -117,7 +124,7 @@ impl Operator {
fn print_map(&self) -> Operator { fn print_map(&self) -> Operator {
match self { match self {
Operator::ImplicitMultiply => Operator::Multiply, Operator::ImplicitMultiply => Operator::Multiply,
_ => *self _ => self.clone()
} }
} }
@ -326,6 +333,10 @@ impl Operator {
Operator::Function(s) => { Operator::Function(s) => {
return format!("{}({})", s.to_string(), args[0].to_string()); return format!("{}({})", s.to_string(), args[0].to_string());
},
Operator::UserFunction(s) => {
return format!("{}({})", s.to_string(), args[0].to_string());
} }
}; };
} }

View File

@ -21,9 +21,9 @@ pub fn parse(
s: &String, context: &Context s: &String, context: &Context
) -> Result<Expression, (LineLocation, DaisyError)> { ) -> Result<Expression, (LineLocation, DaisyError)> {
let expressions = stage::tokenize(s); let expressions = stage::tokenize(s, context);
let (_, expressions) = stage::find_subs(expressions); let (_, expressions) = stage::find_subs(expressions);
let g = stage::groupify(expressions)?; let g = stage::groupify(expressions, context)?;
let g = stage::treeify(g, context)?; let g = stage::treeify(g, context)?;
return Ok(g); return Ok(g);
@ -33,14 +33,15 @@ pub fn parse_no_context(s: &String) -> Result<Expression, (LineLocation, DaisyEr
parse(s, &Context::new()) parse(s, &Context::new())
} }
pub fn substitute(s: &String) -> String { pub fn substitute(s: &String, context: &Context) -> String {
let (_, s) = substitute_cursor(s, s.chars().count()); let (_, s) = substitute_cursor(s, s.chars().count(), context);
return s; return s;
} }
pub fn substitute_cursor( pub fn substitute_cursor(
s: &String, // The string to substitute s: &String, // The string to substitute
c: usize // Location of the cursor right now c: usize, // Location of the cursor right now
context: &Context
) -> ( ) -> (
usize, // Location of cursor in substituted string usize, // Location of cursor in substituted string
String // String with substitutions String // String with substitutions
@ -49,7 +50,7 @@ pub fn substitute_cursor(
let mut new_s = s.clone(); let mut new_s = s.clone();
let l = s.chars().count(); let l = s.chars().count();
let expressions = stage::tokenize(s); let expressions = stage::tokenize(s, context);
let (mut subs, _) = stage::find_subs(expressions); let (mut subs, _) = stage::find_subs(expressions);
let mut new_c = l - c; let mut new_c = l - c;

View File

@ -7,10 +7,12 @@ use super::super::{
}; };
use crate::errors::DaisyError; use crate::errors::DaisyError;
use crate::context::Context;
fn lookback_signs( fn lookback_signs(
g: &mut VecDeque<Token> g: &mut VecDeque<Token>,
context: &Context
) -> Result<(), (LineLocation, DaisyError)> { ) -> Result<(), (LineLocation, DaisyError)> {
// Convert `-` operators to `neg` operators // Convert `-` operators to `neg` operators
@ -42,7 +44,7 @@ fn lookback_signs(
(Token::Operator(_, sa), Token::Operator(l,sb)) (Token::Operator(_, sa), Token::Operator(l,sb))
=> { => {
if { if {
let o = Operator::from_string(sa); let o = Operator::from_string(sa, context);
o.is_some() && o.is_some() &&
( (
@ -99,10 +101,11 @@ fn lookback_signs(
// Inserts implicit operators // Inserts implicit operators
fn lookback( fn lookback(
g: &mut VecDeque<Token> g: &mut VecDeque<Token>,
context: &Context
) -> Result<(), (LineLocation, DaisyError)> { ) -> Result<(), (LineLocation, DaisyError)> {
lookback_signs(g)?; lookback_signs(g, context)?;
let mut i: usize = 0; let mut i: usize = 0;
while i < g.len() { while i < g.len() {
@ -139,7 +142,7 @@ fn lookback(
=> { => {
let la = la.clone(); let la = la.clone();
let lb = lb.clone(); let lb = lb.clone();
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
g.insert(i-1, b); g.insert(i-1, b);
if o.is_some() { if o.is_some() {
@ -161,7 +164,7 @@ fn lookback(
=> { => {
let la = la.clone(); let la = la.clone();
let lb = lb.clone(); let lb = lb.clone();
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
g.insert(i-1, b); g.insert(i-1, b);
if o.is_some() { if o.is_some() {
@ -193,7 +196,8 @@ fn lookback(
pub fn groupify( pub fn groupify(
mut g: VecDeque<Token> mut g: VecDeque<Token>,
context: &Context
) -> Result< ) -> Result<
Token, Token,
(LineLocation, DaisyError) (LineLocation, DaisyError)
@ -228,7 +232,7 @@ pub fn groupify(
let (_, mut v) = levels.pop().unwrap(); let (_, mut v) = levels.pop().unwrap();
let (_, v_now) = levels.last_mut().unwrap(); let (_, v_now) = levels.last_mut().unwrap();
lookback(&mut v)?; lookback(&mut v, context)?;
v_now.push_back(Token::Group(l, v)); v_now.push_back(Token::Group(l, v));
}, },
@ -254,14 +258,14 @@ pub fn groupify(
let (_, v_now) = levels.last_mut().unwrap(); let (_, v_now) = levels.last_mut().unwrap();
if v.len() == 0 { return Err((l, DaisyError::EmptyGroup)) } if v.len() == 0 { return Err((l, DaisyError::EmptyGroup)) }
lookback(&mut v)?; lookback(&mut v, context)?;
v_now.push_back(Token::Group(l, v)); v_now.push_back(Token::Group(l, v));
} }
let (_, mut v) = levels.pop().unwrap(); let (_, mut v) = levels.pop().unwrap();
lookback(&mut v)?; lookback(&mut v, context)?;
return Ok(Token::Group(LineLocation{pos:0, len:last_linelocation.pos + last_linelocation.len}, v)); return Ok(Token::Group(LineLocation{pos:0, len:last_linelocation.pos + last_linelocation.len}, v));
} }

View File

@ -1,4 +1,5 @@
use std::collections::VecDeque; use std::collections::VecDeque;
use crate::context::Context;
use super::super::{ use super::super::{
Token, Token,
@ -8,7 +9,12 @@ use super::super::{
// Called whenever a token is finished. // Called whenever a token is finished.
#[inline(always)] #[inline(always)]
fn push_token(g: &mut VecDeque<Token>, t: Option<Token>, stop_i: usize) { fn push_token(
g: &mut VecDeque<Token>,
t: Option<Token>,
stop_i: usize,
context: &Context
) {
if t.is_none() { return } if t.is_none() { return }
let mut t = t.unwrap(); let mut t = t.unwrap();
@ -52,7 +58,7 @@ fn push_token(g: &mut VecDeque<Token>, t: Option<Token>, stop_i: usize) {
// Some operators are written as words. // Some operators are written as words.
if let Token::Word(l, s) = &t { if let Token::Word(l, s) = &t {
if Operator::from_string(s).is_some() { if Operator::from_string(s, context).is_some() {
t = Token::Operator(*l, s.clone()); t = Token::Operator(*l, s.clone());
} }
} }
@ -61,7 +67,7 @@ fn push_token(g: &mut VecDeque<Token>, t: Option<Token>, stop_i: usize) {
} }
/// Turns a string into Tokens. First stage of parsing. /// Turns a string into Tokens. First stage of parsing.
pub fn tokenize(input: &String) -> VecDeque<Token> { pub fn tokenize(input: &String, context: &Context) -> VecDeque<Token> {
let mut t: Option<Token> = None; // The current token we're reading let mut t: Option<Token> = None; // The current token we're reading
let mut g: VecDeque<Token> = VecDeque::with_capacity(32); let mut g: VecDeque<Token> = VecDeque::with_capacity(32);
@ -80,7 +86,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
// If we're not building a number, finalize // If we're not building a number, finalize
// previous token and start one. // previous token and start one.
_ => { _ => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Quantity(LineLocation{pos: i, len: 0}, String::from(c))); t = Some(Token::Quantity(LineLocation{pos: i, len: 0}, String::from(c)));
} }
}; };
@ -94,7 +100,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
Some(Token::Quantity(_, val)) => { val.push(c); }, Some(Token::Quantity(_, val)) => { val.push(c); },
_ => { _ => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Word(LineLocation{pos: i, len: 0}, String::from(c))); t = Some(Token::Word(LineLocation{pos: i, len: 0}, String::from(c)));
} }
}; };
@ -114,7 +120,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
} else { } else {
// Otherwise, end the number. // Otherwise, end the number.
// We probably have a subtraction. // We probably have a subtraction.
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Operator( t = Some(Token::Operator(
LineLocation{pos: i, len: 1}, LineLocation{pos: i, len: 1},
String::from(c) String::from(c)
@ -126,7 +132,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
// Multi-character operators with - and + are NOT supported! // Multi-character operators with - and + are NOT supported!
// (for example, we can't use -> for unit conversion) // (for example, we can't use -> for unit conversion)
_ => { _ => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Operator( t = Some(Token::Operator(
LineLocation{pos: i, len: 1}, LineLocation{pos: i, len: 1},
String::from(c) String::from(c)
@ -136,7 +142,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
}, },
',' => { ',' => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Operator( t = Some(Token::Operator(
LineLocation{pos: i, len: 1}, LineLocation{pos: i, len: 1},
String::from(c) String::from(c)
@ -152,7 +158,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
match &mut t { match &mut t {
Some(Token::Operator(_, val)) => { val.push(c); }, Some(Token::Operator(_, val)) => { val.push(c); },
_ => { _ => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Operator(LineLocation{pos: i, len: 0}, String::from(c))); t = Some(Token::Operator(LineLocation{pos: i, len: 0}, String::from(c)));
} }
}; };
@ -160,17 +166,17 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
// Group // Group
'(' => { '(' => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::GroupStart(LineLocation{pos: i, len: 0})); t = Some(Token::GroupStart(LineLocation{pos: i, len: 0}));
}, },
')' => { ')' => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::GroupEnd(LineLocation{pos: i, len: 0})); t = Some(Token::GroupEnd(LineLocation{pos: i, len: 0}));
}, },
// Space. Basic seperator. // Space. Basic seperator.
' ' => { ' ' => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = None; t = None;
} }
@ -180,7 +186,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
Some(Token::Word(_, val)) => { val.push(c); }, Some(Token::Word(_, val)) => { val.push(c); },
_ => { _ => {
push_token(&mut g, t, i); push_token(&mut g, t, i, context);
t = Some(Token::Word(LineLocation{pos: i, len: 0}, String::from(c))); t = Some(Token::Word(LineLocation{pos: i, len: 0}, String::from(c)));
} }
}; };
@ -188,7 +194,7 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
}; };
} }
push_token(&mut g, t, input.chars().count()); push_token(&mut g, t, input.chars().count(), context);
return g; return g;
} }

View File

@ -56,7 +56,7 @@ fn treeify_binary(
if let Token::Operator(l, s) = left { if let Token::Operator(l, s) = left {
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string
let o = o.unwrap(); let o = o.unwrap();
@ -72,7 +72,7 @@ fn treeify_binary(
} }
if let Token::Operator(l, s) = right { if let Token::Operator(l, s) = right {
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string
let o = o.unwrap(); let o = o.unwrap();
@ -91,7 +91,7 @@ fn treeify_binary(
// This operator // This operator
let this_op = { let this_op = {
let Token::Operator(l, s) = this else {panic!()}; let Token::Operator(l, s) = this else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // bad operator string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // bad operator string
o.unwrap() o.unwrap()
}; };
@ -99,14 +99,14 @@ fn treeify_binary(
// The operators contesting our arguments // The operators contesting our arguments
let left_op = if i > 1 { let left_op = if i > 1 {
let Token::Operator(l, s) = &g_inner[i-2] else {panic!()}; let Token::Operator(l, s) = &g_inner[i-2] else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad operator string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad operator string
Some(o.unwrap()) Some(o.unwrap())
} else { None }; } else { None };
let right_op = if i < g_inner.len()-2 { let right_op = if i < g_inner.len()-2 {
let Token::Operator(l, s) = &g_inner[i+2] else {panic!()}; let Token::Operator(l, s) = &g_inner[i+2] else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad operator string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad operator string
Some(o.unwrap()) Some(o.unwrap())
} else { None }; } else { None };
@ -137,7 +137,7 @@ fn treeify_binary(
let (l, o) = { let (l, o) = {
let Token::Operator(l, s) = this_pre else {panic!()}; let Token::Operator(l, s) = this_pre else {panic!()};
let o = Operator::from_string(&s); let o = Operator::from_string(&s, context);
if o.is_none() { panic!() } if o.is_none() { panic!() }
(l, o.unwrap()) (l, o.unwrap())
}; };
@ -218,7 +218,7 @@ fn treeify_unary(
// This operator // This operator
let this_op = { let this_op = {
let Token::Operator(l, s) = this else {panic!()}; let Token::Operator(l, s) = this else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string
o.unwrap() o.unwrap()
}; };
@ -227,14 +227,14 @@ fn treeify_unary(
let next_op = if left_associative { let next_op = if left_associative {
if i > 1 { if i > 1 {
let Token::Operator(l, s) = &g_inner[i-2] else {panic!()}; let Token::Operator(l, s) = &g_inner[i-2] else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string
Some(o.unwrap()) Some(o.unwrap())
} else { None } } else { None }
} else { } else {
if i < g_inner.len()-2 { if i < g_inner.len()-2 {
let Token::Operator(l, s) = &g_inner[i+2] else {panic!()}; let Token::Operator(l, s) = &g_inner[i+2] else {panic!()};
let o = Operator::from_string(s); let o = Operator::from_string(s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string if o.is_none() { return Err((*l, DaisyError::Syntax)); } // Bad string
Some(o.unwrap()) Some(o.unwrap())
} else { None } } else { None }
@ -258,7 +258,7 @@ fn treeify_unary(
let (l, o) = { let (l, o) = {
let Token::Operator(l, s) = this_pre else {panic!()}; let Token::Operator(l, s) = this_pre else {panic!()};
let o = Operator::from_string(&s); let o = Operator::from_string(&s, context);
if o.is_none() { panic!() } if o.is_none() { panic!() }
(l, o.unwrap()) (l, o.unwrap())
}; };
@ -314,7 +314,7 @@ pub fn treeify(
// If not an operator, move on. // If not an operator, move on.
let this_op = match &g_inner[i] { let this_op = match &g_inner[i] {
Token::Operator(l, s) => { Token::Operator(l, s) => {
let o = Operator::from_string(&s); let o = Operator::from_string(&s, context);
if o.is_none() { return Err((*l, DaisyError::Syntax)); } if o.is_none() { return Err((*l, DaisyError::Syntax)); }
o.unwrap() o.unwrap()
}, },