Add versioned C ABI for optional native plugins.
Load .dll/.so/.dylib at runtime via libloading, register JSON-wired functions, and ship a Rust cdylib demo with lib/plugin wrappers and gold coverage. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
b00b018056
commit
b0c777c480
26 files changed
+903
-26
No files matched your search
+67
-21
@@ -512,8 +512,54 @@ impl<'a> FnCompiler<'a> {
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let fid = self.resolve_call(&call.callee)?;
|
||||
let params = self.flat[fid].params.clone();
|
||||
match self.resolve_call(&call.callee) {
|
||||
Ok(fid) => {
|
||||
let params = self.flat[fid].params.clone();
|
||||
let mut named: HashMap<String, &Expr> = HashMap::new();
|
||||
let mut positionals = Vec::new();
|
||||
for a in &call.args {
|
||||
match a {
|
||||
Arg::Positional(e) => positionals.push(e),
|
||||
Arg::Named { name, value } => {
|
||||
named.insert(name.clone(), value);
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut pos_i = 0;
|
||||
for p in ¶ms {
|
||||
if let Some(e) = named.get(p) {
|
||||
self.compile_expr(e)?;
|
||||
} else if pos_i < positionals.len() {
|
||||
self.compile_expr(positionals[pos_i])?;
|
||||
pos_i += 1;
|
||||
} else {
|
||||
return Err(self.err(format!("missing argument for parameter `{p}`")));
|
||||
}
|
||||
}
|
||||
if pos_i < positionals.len() {
|
||||
return Err(self.err(format!(
|
||||
"too many positional arguments ({} extra)",
|
||||
positionals.len() - pos_i
|
||||
)));
|
||||
}
|
||||
self.emit(Op::Call(fid as u16, params.len() as u8));
|
||||
if self.flat[fid].parent.is_none() && self.flat[fid].level == 1 {
|
||||
let ti = self.add_const(Value::Text(self.flat[fid].name.clone()));
|
||||
self.emit(Op::TagInstance(ti));
|
||||
}
|
||||
if as_stmt {
|
||||
self.emit(Op::Pop);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
Err(_) => self.compile_plugin_call(&call, as_stmt),
|
||||
}
|
||||
}
|
||||
|
||||
/// Unresolved callee → runtime plugin registry (or unknown-fn error).
|
||||
/// Named args: stack pairs (name, value)×N, argc = 2N, name const prefixed with `@`.
|
||||
/// Positional: stack values, argc = N, name const as-is.
|
||||
fn compile_plugin_call(&mut self, call: &CallExpr, as_stmt: bool) -> Result<()> {
|
||||
let mut named: HashMap<String, &Expr> = HashMap::new();
|
||||
let mut positionals = Vec::new();
|
||||
for a in &call.args {
|
||||
@@ -524,27 +570,27 @@ impl<'a> FnCompiler<'a> {
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut pos_i = 0;
|
||||
for p in ¶ms {
|
||||
if let Some(e) = named.get(p) {
|
||||
if !named.is_empty() && !positionals.is_empty() {
|
||||
return Err(self.err(
|
||||
"plugin/unknown calls cannot mix positional and named args in bytecode",
|
||||
));
|
||||
}
|
||||
if !named.is_empty() {
|
||||
let mut pairs: Vec<_> = named.into_iter().collect();
|
||||
pairs.sort_by(|a, b| a.0.cmp(&b.0));
|
||||
for (k, e) in &pairs {
|
||||
let ki = self.add_const(Value::Text(k.clone()));
|
||||
self.emit(Op::Constant(ki));
|
||||
self.compile_expr(e)?;
|
||||
} else if pos_i < positionals.len() {
|
||||
self.compile_expr(positionals[pos_i])?;
|
||||
pos_i += 1;
|
||||
} else {
|
||||
return Err(self.err(format!("missing argument for parameter `{p}`")));
|
||||
}
|
||||
}
|
||||
if pos_i < positionals.len() {
|
||||
return Err(self.err(format!(
|
||||
"too many positional arguments ({} extra)",
|
||||
positionals.len() - pos_i
|
||||
)));
|
||||
}
|
||||
self.emit(Op::Call(fid as u16, params.len() as u8));
|
||||
if self.flat[fid].parent.is_none() && self.flat[fid].level == 1 {
|
||||
let ti = self.add_const(Value::Text(self.flat[fid].name.clone()));
|
||||
self.emit(Op::TagInstance(ti));
|
||||
let ni = self.add_const(Value::Text(format!("@{}", call.callee)));
|
||||
self.emit(Op::PluginCall(ni, (pairs.len() * 2) as u8));
|
||||
} else {
|
||||
for e in &positionals {
|
||||
self.compile_expr(e)?;
|
||||
}
|
||||
let ni = self.add_const(Value::Text(call.callee.clone()));
|
||||
self.emit(Op::PluginCall(ni, positionals.len() as u8));
|
||||
}
|
||||
if as_stmt {
|
||||
self.emit(Op::Pop);
|
||||
|
||||
@@ -59,6 +59,8 @@ pub enum Op {
|
||||
/// Method call: stack has argc args (param order) then receiver on top.
|
||||
/// constants[name_idx] is method name text; resolve via receiver `_type`.
|
||||
MethodCall(u16, u8),
|
||||
/// Plugin call: stack has argc args in registered param order; name in constants.
|
||||
PluginCall(u16, u8),
|
||||
/// Host primitive: pop `argc` args (param order), push result.
|
||||
HostCall(u16, u8),
|
||||
Return,
|
||||
|
||||
@@ -399,6 +399,68 @@ impl Vm {
|
||||
slots,
|
||||
});
|
||||
}
|
||||
Op::PluginCall(name_idx, argc) => {
|
||||
let argc = argc as usize;
|
||||
let raw_name = match fun.constants.get(name_idx as usize) {
|
||||
Some(Value::Text(s)) => s.clone(),
|
||||
_ => {
|
||||
return Err(self.err_at(span, "PluginCall needs name constant"));
|
||||
}
|
||||
};
|
||||
let mut bound = HashMap::new();
|
||||
if let Some(name) = raw_name.strip_prefix('@') {
|
||||
// named pairs: (name, value) × N, argc = 2N
|
||||
if argc % 2 != 0 {
|
||||
return Err(self.err_at(span, "PluginCall named argc must be even"));
|
||||
}
|
||||
let pairs = argc / 2;
|
||||
for _ in 0..pairs {
|
||||
let v = pop(&mut stack).map_err(|m| self.err_at(span, m))?;
|
||||
let k = pop(&mut stack).map_err(|m| self.err_at(span, m))?;
|
||||
let ks = match k {
|
||||
Value::Text(s) => s,
|
||||
_ => {
|
||||
return Err(self.err_at(span, "plugin arg name must be text"));
|
||||
}
|
||||
};
|
||||
bound.insert(ks, v);
|
||||
}
|
||||
let result = crate::host::plugin::call_registered(&self.host, name, &bound)
|
||||
.map_err(|m| self.err_at(span, m))?;
|
||||
stack.push(result);
|
||||
} else {
|
||||
let mut vals = Vec::with_capacity(argc);
|
||||
for _ in 0..argc {
|
||||
vals.push(pop(&mut stack).map_err(|m| self.err_at(span, m))?);
|
||||
}
|
||||
vals.reverse();
|
||||
let reg = self
|
||||
.host
|
||||
.plugins
|
||||
.get(&raw_name)
|
||||
.cloned()
|
||||
.ok_or_else(|| {
|
||||
self.err_at(span, format!("unknown function `{raw_name}`"))
|
||||
})?;
|
||||
if reg.params.len() != vals.len() {
|
||||
return Err(self.err_at(
|
||||
span,
|
||||
format!(
|
||||
"plugin `{raw_name}` expects {} args, got {}",
|
||||
reg.params.len(),
|
||||
vals.len()
|
||||
),
|
||||
));
|
||||
}
|
||||
for (p, v) in reg.params.iter().zip(vals.into_iter()) {
|
||||
bound.insert(p.clone(), v);
|
||||
}
|
||||
let result =
|
||||
crate::host::plugin::call_registered(&self.host, &raw_name, &bound)
|
||||
.map_err(|m| self.err_at(span, m))?;
|
||||
stack.push(result);
|
||||
}
|
||||
}
|
||||
Op::Return => {
|
||||
let ret = pop(&mut stack).unwrap_or(Value::None);
|
||||
frames.pop();
|
||||
|
||||
Reference in new issue
Block a user