Add simple string functions
This commit is contained in:
Ava Hahn
parent
8bf4b3c368
commit
d4121a734a
GPG key ID:
3A4645B8CF806069
4 changed files with 366 additions and 190 deletions
103
src/stl/str.rs
103
src/stl/str.rs
|
|
@ -14,73 +14,44 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
use crate::func::{Args, FTable, Function, Operation};
|
||||
use crate::segment::{ast_as_string, circuit, Ast, Ctr};
|
||||
use crate::vars::VTable;
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
|
||||
// Current primitive is to use a get_NNNNN function defined for each library function which returns a not-previously-owned
|
||||
// copy of the Function struct.
|
||||
pub fn get_echo() -> Function {
|
||||
return Function {
|
||||
name: String::from("echo"),
|
||||
loose_syms: false,
|
||||
eval_lazy: false,
|
||||
args: Args::Lazy(-1),
|
||||
function: Operation::Internal(Box::new(
|
||||
|a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
|
||||
let mut string = String::from("");
|
||||
if !circuit(a, &mut |arg: &Ctr| {
|
||||
match arg {
|
||||
// should be a thing here
|
||||
Ctr::Symbol(_) => return false,
|
||||
Ctr::String(s) => string.push_str(&s),
|
||||
Ctr::Integer(i) => string.push_str(&i.to_string()),
|
||||
Ctr::Float(f) => string.push_str(&f.to_string()),
|
||||
Ctr::Bool(b) => string.push_str(&b.to_string()),
|
||||
Ctr::Seg(c) => string.push_str(ast_as_string(c.clone(), true).as_str()),
|
||||
Ctr::None => (),
|
||||
}
|
||||
println!("{}", string);
|
||||
return true;
|
||||
}) {
|
||||
eprintln!("circuit loop in echo should not have returned false")
|
||||
}
|
||||
return Ctr::None;
|
||||
},
|
||||
)),
|
||||
};
|
||||
use crate::sym::SymTable;
|
||||
use crate::segment::{Seg, Ctr};
|
||||
|
||||
|
||||
pub const ECHO_DOCSTRING: &str =
|
||||
"traverses any number of arguments. Prints their evaluated values on a new line for each.";
|
||||
|
||||
pub fn echo_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
if ast.len() == 1 {
|
||||
println!("{}", ast.car);
|
||||
} else {
|
||||
ast.circuit(&mut |arg: &Ctr| print!("{}", arg) == ());
|
||||
}
|
||||
|
||||
Ok(Ctr::None)
|
||||
}
|
||||
|
||||
pub fn get_concat() -> Function {
|
||||
return Function {
|
||||
name: String::from("concat"),
|
||||
loose_syms: false,
|
||||
eval_lazy: false,
|
||||
args: Args::Lazy(-1),
|
||||
function: Operation::Internal(Box::new(
|
||||
|a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
|
||||
let mut string = String::from("");
|
||||
if !circuit(a, &mut |arg: &Ctr| {
|
||||
match arg {
|
||||
// should be a thing here
|
||||
Ctr::Symbol(_) => return false,
|
||||
Ctr::String(s) => string.push_str(&s),
|
||||
Ctr::Integer(i) => string.push_str(&i.to_string()),
|
||||
Ctr::Float(f) => string.push_str(&f.to_string()),
|
||||
Ctr::Bool(b) => string.push_str(&b.to_string()),
|
||||
Ctr::Seg(c) => string.push_str(ast_as_string(c.clone(), true).as_str()),
|
||||
Ctr::None => (),
|
||||
}
|
||||
return true;
|
||||
}) {
|
||||
eprintln!("circuit loop in concat should not have returned false")
|
||||
}
|
||||
return Ctr::String(string);
|
||||
},
|
||||
)),
|
||||
};
|
||||
pub const CONCAT_DOCSTRING: &str = "Iterates over N args of any type other than SYMBOL.
|
||||
converts each argument to a string. Combines all strings.
|
||||
Returns final (combined) string.";
|
||||
|
||||
pub fn concat_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
let mut string = String::from("");
|
||||
if !ast.circuit(&mut |arg: &Ctr| {
|
||||
match arg {
|
||||
// should be a thing here
|
||||
Ctr::Symbol(_) => return false,
|
||||
Ctr::String(s) => string.push_str(&s),
|
||||
Ctr::Integer(i) => string.push_str(&i.to_string()),
|
||||
Ctr::Float(f) => string.push_str(&f.to_string()),
|
||||
Ctr::Bool(b) => string.push_str(&b.to_string()),
|
||||
Ctr::Seg(c) => string.push_str(ast_as_string(c.clone(), true).as_str()),
|
||||
Ctr::None => (),
|
||||
}
|
||||
return true;
|
||||
}) {
|
||||
eprintln!("dont know what to do witha symbol here")
|
||||
}
|
||||
return Ctr::String(string);
|
||||
}
|
||||
*/
|
||||
|
|
|
|||
117
src/stl/strings.rs
Normal file
117
src/stl/strings.rs
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
/* relish: versatile lisp shell
|
||||
* Copyright (C) 2021 Aidan Hahn
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
use crate::segment::{Ctr, Seg};
|
||||
use crate::sym::SymTable;
|
||||
|
||||
pub const ECHO_DOCSTRING: &str =
|
||||
"traverses any number of arguments. Prints their evaluated values on a new line for each.";
|
||||
|
||||
pub fn echo_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
if ast.len() == 1 {
|
||||
println!("{}", ast.car);
|
||||
} else {
|
||||
ast.circuit(&mut |arg: &Ctr| print!("{}", arg) == ());
|
||||
}
|
||||
|
||||
Ok(Ctr::None)
|
||||
}
|
||||
|
||||
pub const CONCAT_DOCSTRING: &str = "Iterates over N args of any type other than SYMBOL.
|
||||
converts each argument to a string. Combines all strings.
|
||||
Returns final (combined) string.";
|
||||
|
||||
pub fn concat_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
let mut string = String::from("");
|
||||
if !ast.circuit(&mut |arg: &Ctr| {
|
||||
match arg {
|
||||
// should be a thing here
|
||||
Ctr::Symbol(_) => return false,
|
||||
Ctr::String(s) => string.push_str(&s),
|
||||
Ctr::Integer(i) => string.push_str(&i.to_string()),
|
||||
Ctr::Float(f) => string.push_str(&f.to_string()),
|
||||
Ctr::Bool(b) => string.push_str(&b.to_string()),
|
||||
Ctr::Seg(c) => string.push_str(&c.to_string()),
|
||||
Ctr::None => (),
|
||||
}
|
||||
true
|
||||
}) {
|
||||
eprintln!("dont know what to do witha symbol here")
|
||||
}
|
||||
return Ok(Ctr::String(string));
|
||||
}
|
||||
|
||||
pub const STRLEN_DOCSTRING: &str = "Takes a single arg of any type.
|
||||
Arg is converted to a string if not already a string.
|
||||
Returns string length of arg.";
|
||||
|
||||
pub fn strlen_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
match &*ast.car {
|
||||
Ctr::Symbol(s) => Ok(Ctr::Integer(s.len() as i128)),
|
||||
Ctr::String(s) => Ok(Ctr::Integer(s.len() as i128)),
|
||||
Ctr::Integer(i) => Ok(Ctr::Integer(i.to_string().len() as i128)),
|
||||
Ctr::Float(f) => Ok(Ctr::Integer(f.to_string().len() as i128)),
|
||||
Ctr::Bool(b) => Ok(Ctr::Integer(b.to_string().len() as i128)),
|
||||
Ctr::Seg(c) => Ok(Ctr::Integer(c.to_string().len() as i128)),
|
||||
// highly suspicious case below
|
||||
Ctr::None => Ok(Ctr::Integer(0)),
|
||||
}
|
||||
}
|
||||
|
||||
pub const STRCAST_DOCSTRING: &str = "Takes a single arg of any type.
|
||||
Arg is converted to a string and returned.";
|
||||
|
||||
pub fn strcast_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
match &*ast.car {
|
||||
Ctr::Symbol(s) => Ok(Ctr::String(s.clone())),
|
||||
Ctr::String(_) => Ok(*ast.car.clone()),
|
||||
Ctr::Integer(i) => Ok(Ctr::String(i.to_string())),
|
||||
Ctr::Float(f) => Ok(Ctr::String(f.to_string())),
|
||||
Ctr::Bool(b) => Ok(Ctr::String(b.to_string())),
|
||||
Ctr::Seg(c) => Ok(Ctr::String(c.to_string())),
|
||||
// highly suspicious case below
|
||||
Ctr::None => Ok(Ctr::String(String::new())),
|
||||
}
|
||||
}
|
||||
|
||||
pub const CONTAINS_DOCSTRING: &str =
|
||||
"Takes two strings. Returns true if string1 contains at least one instance of string2";
|
||||
|
||||
pub fn contains_callback(ast: &Seg, _syms: &mut SymTable) -> Result<Ctr, String> {
|
||||
let parent_str: String;
|
||||
if let Ctr::String(ref s) = *ast.car {
|
||||
parent_str = s.to_string();
|
||||
} else {
|
||||
return Err("first argument must be a string".to_string());
|
||||
}
|
||||
|
||||
let second_arg_obj: &Ctr;
|
||||
let child_str: String;
|
||||
if let Ctr::Seg(ref s) = *ast.cdr {
|
||||
second_arg_obj = &*s.car;
|
||||
} else {
|
||||
return Err("impossible error: needs two arguments".to_string());
|
||||
}
|
||||
|
||||
if let Ctr::String(ref s) = &*second_arg_obj {
|
||||
child_str = s.clone();
|
||||
} else {
|
||||
return Err("second argument must be a string".to_string());
|
||||
}
|
||||
|
||||
Ok(Ctr::Bool(parent_str.contains(&child_str)))
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue