Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ likely not be implemented due to differences between piccolo and PUC-Lua.
| 🔵 | `byte(s[, i, j])` | | |
| 🔵 | `char(args...)` | | |
| ⚫️️ | `dump(function[, strip])` | | |
| ⚫️️ | `find(s, pattern[, init, plain])` | | |
| 🔵 | `find(s, pattern[, init, plain])` | | |
| ⚫️️ | `format(formatstring, args...)` | | |
| ⚫️️ | `gmatch(s, pattern[, init])` | | |
| ⚫️️ | `gsub(s, pattern, repl[, n])` | | |
| 🔵 | `gmatch(s, pattern[, init])` | | |
| 🔵 | `gsub(s, pattern, repl[, n])` | | |
| 🔵 | `len(s)` | | |
| 🔵 | `lower(s)` | | |
| ⚫️️ | `match(s, pattern[, init])` | | |
| 🔵 | `match(s, pattern[, init])` | | |
| ⚫️️ | `pack(fmt, values...)` | | |
| ⚫️️ | `packsize(fmt)` | | |
| ⚫️️ | `rep(s, n[, sep])` | | |
Expand Down
9 changes: 8 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ allocator-api2.workspace = true
anyhow.workspace = true
gc-arena.workspace = true
hashbrown.workspace = true
lsonar = "0.2.4"
rand.workspace = true
thiserror.workspace = true

Expand Down
207 changes: 206 additions & 1 deletion src/stdlib/string.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
use crate::{Callback, CallbackReturn, Context, FromValue, String, Table, Value};
use std::collections::HashMap;

use crate::{
meta_ops, BoxSequence, Callback, CallbackReturn, Context, Error, FromValue, IntoValue,
Sequence, String, Table, Value,
};

pub fn load_string<'gc>(ctx: Context<'gc>) {
let string = Table::new(&ctx);
Expand Down Expand Up @@ -97,6 +102,206 @@ pub fn load_string<'gc>(ctx: Context<'gc>) {
}),
);

string.set_field(
ctx,
"find",
Callback::from_fn(&ctx, |ctx, _, mut stack| {
let (s, pattern, init, plain) =
stack.consume::<(String, String, Option<i64>, Option<bool>)>(ctx)?;
let plain = plain.unwrap_or(false);

let pattern = pattern.to_str()?;
let s = s.to_str()?;

let Some((start, end, captures)) =
lsonar::find(s, pattern, init.map(|i| i as isize), plain).map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?
else {
stack.replace(ctx, Value::Nil);
return Ok(CallbackReturn::Return);
};

stack.clear();
stack.into_back(ctx, start as i64);
stack.into_back(ctx, end as i64);

for capture in captures {
stack.into_back(ctx, capture)
}

Ok(CallbackReturn::Return)
}),
);

string.set_field(
ctx,
"match",
Callback::from_fn(&ctx, |ctx, _, mut stack| {
let (s, pattern, init) = stack.consume::<(String, String, Option<i64>)>(ctx)?;

let pattern = pattern.to_str()?;
let s = s.to_str()?;

let Some(captures) =
lsonar::r#match(s, pattern, init.map(|i| i as isize)).map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?
else {
stack.replace(ctx, Value::Nil);
return Ok(CallbackReturn::Return);
};

stack.clear();
for capture in captures {
stack.into_back(ctx, capture)
}

Ok(CallbackReturn::Return)
}),
);

string.set_field(
ctx,
"gmatch",
Callback::from_fn(&ctx, |ctx, _, mut stack| {
use std::{rc::Rc, sync::Mutex};

#[derive(gc_arena::Collect, Clone)]
#[collect(require_static)]
struct GMatchIteratorWrapper(Rc<Mutex<lsonar::gmatch::GMatchIterator>>);

impl GMatchIteratorWrapper {
fn new(iter: lsonar::gmatch::GMatchIterator) -> Self {
Self(Rc::new(Mutex::new(iter)))
}
}

impl<'gc> Sequence<'gc> for GMatchIteratorWrapper {
fn poll(
self: std::pin::Pin<&mut Self>,
ctx: Context<'gc>,
_exec: crate::Execution<'gc, '_>,
mut stack: crate::Stack<'gc, '_>,
) -> Result<crate::SequencePoll<'gc>, Error<'gc>> {
stack.clear();
let root = Rc::clone(&self.0);
let mut root = root.lock().map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?;
match root.next() {
Some(captures) => {
let captures = captures.map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?;
for capture in captures {
stack.into_back(ctx, capture)
}
Ok(crate::SequencePoll::Return)
}
None => {
stack.into_back(ctx, Value::Nil);
Ok(crate::SequencePoll::Return)
}
}
}
}

let (s, pattern) = stack.consume::<(String, String)>(ctx)?;

let s = s.to_str()?;
let pattern = pattern.to_str()?;

let iter = lsonar::gmatch(s, pattern).map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?;

let root = GMatchIteratorWrapper::new(iter);

let gmatch = Callback::from_fn_with(&ctx, root, |root, ctx, _, _| {
Ok(CallbackReturn::Sequence(BoxSequence::new(
&ctx,
root.clone(),
)))
});

stack.replace(ctx, gmatch);
Ok(CallbackReturn::Return)
}),
);

string.set_field(
ctx,
"gsub",
Callback::from_fn(&ctx, |ctx, _, mut stack| {
let (s, pattern, repl, n) =
stack.consume::<(String, String, Value, Option<i64>)>(ctx)?;

let pattern = pattern.to_str()?;
let s = s.to_str()?;

let (value, n) = match repl {
Value::String(repl) => lsonar::gsub(
s,
pattern,
lsonar::Repl::String(repl.to_str()?),
n.map(|n| n as usize),
)
.map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?,
Value::Table(repl) => {
let mut map = HashMap::with_capacity(repl.length() as usize); // TODO: we need work with `Table` directly
for (key, value) in repl.iter() {
let key = key.into_string(ctx).ok_or_else(|| {
Error::from_value(
"key must be a `string`, `number` or `integer`".into_value(ctx),
)
})?;
let value = value.into_string(ctx).ok_or_else(|| {
Error::from_value(
"value must be a `string`, `number`, or `integer`".into_value(ctx),
)
})?;
map.insert(
key.display_lossy().to_string(),
value.display_lossy().to_string(),
);
}
lsonar::gsub(s, pattern, lsonar::Repl::Table(&map), n.map(|n| n as usize))
.map_err(|err| {
let err = err.to_string();
err.into_value(ctx)
})?
}
Value::Function(_) => {
// TODO: we need to implement this, but i don't know how to do it
let _call = meta_ops::call(ctx, repl)?;
return Err("not implemented".into_value(ctx).into());
}
_ => {
return Err(format!(
"invalid `repl` value, expected `string`, `table` or `function`"
)
.into_value(ctx)
.into())
}
};

stack.clear();
stack.into_back(ctx, value);
stack.into_back(ctx, n as i64);

Ok(CallbackReturn::Return)
}),
);

ctx.set_global("string", string);
}

Expand Down