TudbuT/spl
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

add escape fn to string, add some ways to write callables

Browse source
This commit is contained in:
Daniella 2024-10-23 11:28:16 +02:00
parent 35639cb2c8
commit 2bbeaebd7c
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
4 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spl/repl.spl
View file

@ -7,7 +7,7 @@ func main { mega | with args ;
while { 1 } {
catch {
def line "" =line
while { line is-complete not } {
while { line repl-is-complete not } {
def s
line " > " print readln =s
s "\n" concat concat =line
@ -44,7 +44,7 @@ func main { mega | with args ;
}
}
func is-complete { bool | with line ;
func repl-is-complete { bool | with line ;
"!!-end" line:contains
0 line _array :foreach<{ | with char ;
char "{" :_char eq

5
spl/std.spl
View file

@ -42,7 +42,7 @@ construct _str_ext {
replacee:to-bytes replacement:to-bytes this:to-bytes:replace:to-str
}
find { idx | with search this ;
search _array this _array :find
search _barray this _barray :find
}
contains { bool | with search this ;
search this:find null eq not
@ -53,6 +53,9 @@ construct _str_ext {
ends-with { bool | with ending this ;
ending:to-bytes this:to-bytes:ends-with
}
escape { formatted | with this ;
"\"" this:replace<"\\" "\\\\">:replace<"\"" "\\\"">:replace<"\n" "\\n">:replace<"\r" "\\r"> concat "\"" concat
}
_char { int | with this ;
0 (this _array):get
}

28
src/lexer.rs
View file

@ -121,6 +121,31 @@ fn read_block_dyn(
run_as_base: false,
}))))
}
// ., lambda
"|" => {
let block = read_block_dyn(&str_words[i + 1..], false, ">".to_owned(), compat)?;
i += block.2;
words.push(Word::Const(Value::Func(AFunc::new(Func {
ret_count: 0,
to_call: FuncImpl::SPL(block.1),
origin: Arc::new(Frame::dummy()),
fname: None,
name: "dyn-arg".to_owned(),
run_as_base: false,
}))))
}
"/" => {
let block = read_block_dyn(&str_words[i + 1..], false, "\\".to_owned(), compat)?;
i += block.2 + 1;
words.push(Word::Const(Value::Func(AFunc::new(Func {
ret_count: 0,
to_call: FuncImpl::SPL(block.1),
origin: Arc::new(Frame::dummy()),
fname: None,
name: "dyn-direct".to_owned(),
run_as_base: false,
}))))
}
x if x.len() >= 2 && &x[0..2] == "!{" => {
words.push(Word::Const(Value::Str(x[2..].to_owned())));
}
@ -255,6 +280,9 @@ fn read_block_dyn(
x if x.starts_with('\"') => {
words.push(Word::Const(Value::Str(x[1..].to_owned())));
}
x if x.starts_with('^') => {
words.push(Word::Const(Value::Str(x[1..].to_owned())));
}
x if x.chars().all(|c| c.is_numeric() || c == '_' || c == '-')
&& !x.starts_with('_')
&& x.contains(char::is_numeric) =>

11
src/std_fns.rs
View file

@ -1,6 +1,6 @@
use std::{
collections::{HashMap, VecDeque},
env::{args, vars},
env::{self, args, vars},
fs,
io::{stdin, stdout, Write},
ops::{Add, Div, Mul, Rem, Sub},
@ -1128,9 +1128,15 @@ pub fn delete_dir(stack: &mut Stack) -> OError {
Ok(())
}
pub fn chdir(stack: &mut Stack) -> OError {
require_on_stack!(dir, Str, stack, "chdir");
env::set_current_dir(dir).map_err(|e| stack.error(ErrorKind::IO(e.to_string())))?;
Ok(())
}
pub fn register(r: &mut Stack, o: Arc<Frame>) {
type Fn = fn(&mut Stack) -> OError;
let fns: [(&str, Fn, u32); 68] = [
let fns: [(&str, Fn, u32); 69] = [
("pop", pop, 0),
("dup", dup, 2),
("dup2", dup2, 3),
@ -1199,6 +1205,7 @@ pub fn register(r: &mut Stack, o: Arc<Frame>) {
("list-files", list_files, 1),
("delete-file", delete_file, 1),
("delete-dir", delete_dir, 1),
("chdir", chdir, 0),
];
for f in fns {
r.define_func(