Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow with modifier for builtin and user functions #42

Merged
merged 1 commit into from
Nov 13, 2023
Merged

Allow with modifier for builtin and user functions #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/builtins/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub mod numbers;
mod objects;
pub mod sets;
mod strings;
mod time;
mod tracing;
pub mod types;
mod utils;
Expand Down Expand Up @@ -51,7 +52,7 @@ lazy_static! {
encoding::register(&mut m);
//token_signing::register(&mut m);
//token_verification::register(&mut m);
//time::register(&mut m);
time::register(&mut m);
//cryptography::register(&mut m);
//graphs::register(&mut m);
//graphql::register(&mut m);
Expand Down
30 changes: 30 additions & 0 deletions src/builtins/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

use crate::ast::Expr;
use crate::builtins;
use crate::builtins::utils::ensure_args_count;
use crate::lexer::Span;
use crate::value::Value;

use std::collections::HashMap;
use std::time::SystemTime;

use anyhow::{bail, Result};

pub fn register(m: &mut HashMap<&'static str, builtins::BuiltinFcn>) {
m.insert("time.now_ns", (now_ns, 0));
}

fn now_ns(span: &Span, params: &[Expr], args: &[Value]) -> Result<Value> {
let name = "time.now_ns";
ensure_args_count(span, name, params, args, 0)?;

let now = SystemTime::now();
let elapsed = match now.duration_since(SystemTime::UNIX_EPOCH) {
Ok(e) => e,
Err(e) => bail!(span.error(format!("could not fetch elapsed time. {e}").as_str())),
};
let nanos = elapsed.as_nanos();
Ok(Value::from_u128(nanos))
}
126 changes: 95 additions & 31 deletions src/interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

use crate::ast::*;
use crate::builtins;
use crate::builtins::{self, BuiltinFcn};
use crate::lexer::Span;
use crate::parser::Parser;
use crate::scheduler::*;
Expand All @@ -27,6 +27,7 @@ pub struct Interpreter<'source> {
data: Value,
init_data: Value,
with_document: Value,
with_functions: BTreeMap<String, String>,
scopes: Vec<Scope>,
// TODO: handle recursive calls where same expr could have different values.
loop_var_values: BTreeMap<Ref<'source, Expr>, Value>,
Expand Down Expand Up @@ -96,6 +97,7 @@ impl<'source> Interpreter<'source> {
data: Value::new_object(),
init_data: Value::new_object(),
with_document,
with_functions: BTreeMap::new(),
scopes: vec![Scope::new()],
contexts: vec![],
loop_var_values: BTreeMap::new(),
Expand Down Expand Up @@ -842,7 +844,11 @@ impl<'source> Interpreter<'source> {
span,
fcn,
params,
get_extra_arg(expr, &self.functions),
get_extra_arg(
expr,
Some(self.current_module_path.as_str()),
&self.functions,
),
true,
)?,
_ => self.eval_expr(expr)?,
Expand Down Expand Up @@ -872,7 +878,11 @@ impl<'source> Interpreter<'source> {
span,
fcn,
params,
get_extra_arg(expr, &self.functions),
get_extra_arg(
expr,
Some(self.current_module_path.as_str()),
&self.functions,
),
false,
)?,
_ => self.eval_expr(expr)?,
Expand Down Expand Up @@ -947,19 +957,43 @@ impl<'source> Interpreter<'source> {
stmt: &'source LiteralStmt,
stmts: &[&'source LiteralStmt],
) -> Result<bool> {
let mut skip_exec = false;
let saved_state = if !stmt.with_mods.is_empty() {
// Save state;
let with_document = self.with_document.clone();
let input = self.input.clone();
let data = self.data.clone();
let processed = self.processed.clone();
let with_functions = self.with_functions.clone();

// Apply with modifiers.
for wm in &stmt.with_mods {
// Evaluate value and ref
let value = self.eval_expr(&wm.r#as)?;
let path = Parser::get_path_ref_components(&wm.refr)?;
let path: Vec<&str> = path.iter().map(|s| *s.text()).collect();
let target = path.join(".");

let value = match self.eval_expr(&wm.r#as) {
Ok(Value::Undefined) => {
if let Ok(fcn_path) = get_path_string(&wm.r#as, None) {
let span = wm.r#as.span();
if self.lookup_function_by_name(&fcn_path).is_some() {
let mut fcn_path = get_path_string(&wm.r#as, None)?;
if !fcn_path.starts_with("data.") {
fcn_path = self.current_module_path.clone() + "." + &fcn_path;
}
self.with_functions.insert(target, fcn_path);
continue;
} else if self.lookup_builtin(span, &fcn_path).is_ok() {
self.with_functions.insert(target, fcn_path);
continue;
}
}
skip_exec = true;
continue;
}
Ok(v) => v,
Err(e) => return Err(e),
};

if path[0] == "input" || path[0] == "data" {
*Self::make_or_get_value_mut(&mut self.with_document, &path[..])? = value;
Expand All @@ -968,28 +1002,38 @@ impl<'source> Interpreter<'source> {
} else {
// TODO: error about input, data
} */
// TODO: functions
}

self.data = self.with_document["data"].clone();
self.input = self.with_document["input"].clone();
self.processed.clear();

(with_document, input, data, processed)
(with_document, input, data, processed, with_functions)
} else {
(
Value::Undefined,
Value::Undefined,
Value::Undefined,
BTreeSet::new(),
BTreeMap::new(),
)
};

let r = self.eval_stmt_impl(stmt, stmts);
let r = if !skip_exec {
self.eval_stmt_impl(stmt, stmts)
} else {
Ok(false)
};

// Restore state.
if saved_state.0 != Value::Undefined {
(self.with_document, self.input, self.data, self.processed) = saved_state;
(
self.with_document,
self.input,
self.data,
self.processed,
self.with_functions,
) = saved_state;
}

r
Expand Down Expand Up @@ -1443,24 +1487,22 @@ impl<'source> Interpreter<'source> {
}
}

fn lookup_function(&self, fcn: &'source Expr) -> Result<&Vec<&'source Rule>> {
let mut path = Self::get_path_string(fcn, None)?;
fn lookup_function_by_name(&self, path: &str) -> Option<&Vec<&'source Rule>> {
let mut path = path.to_owned();
if !path.starts_with("data.") {
path = self.current_module_path.clone() + "." + &path;
}

match self.functions.get(&path) {
Some((r, _)) => Ok(r),
_ => {
bail!(fcn.span().error("function not found"))
}
Some((f, _)) => Some(f),
_ => None,
}
}

fn eval_builtin_call(
&mut self,
span: &'source Span,
name: String,
name: &str,
builtin: builtins::BuiltinFcn,
params: &'source [Expr],
) -> Result<Value> {
Expand All @@ -1474,7 +1516,7 @@ impl<'source> Interpreter<'source> {
}
}

let cache = builtins::must_cache(name.as_str());
let cache = builtins::must_cache(name);
if let Some(name) = &cache {
if let Some(v) = self.builtins_cache.get(&(name, args.clone())) {
return Ok(v.clone());
Expand All @@ -1496,30 +1538,47 @@ impl<'source> Interpreter<'source> {
Ok(v)
}

fn lookup_builtin(&self, span: &'source Span, path: &str) -> Result<Option<&BuiltinFcn>> {
Ok(if let Some(builtin) = builtins::BUILTINS.get(path) {
Some(builtin)
} else if let Some(builtin) = builtins::DEPRECATED.get(path) {
if !self.allow_deprecated {
bail!(span.error(format!("{path} is deprecated").as_str()))
}
Some(builtin)
} else {
None
})
}

fn eval_call_impl(
&mut self,
span: &'source Span,
fcn: &'source Expr,
params: &'source [Expr],
) -> Result<Value> {
let fcns_rules = match self.lookup_function(fcn) {
Ok(r) => r,
let fcn_path = match get_path_string(fcn, None) {
Ok(p) => p,
_ => bail!(span.error("invalid function expression")),
};

let orig_fcn_path = fcn_path;
let fcn_path = match self.with_functions.remove(&orig_fcn_path) {
Some(p) => p,
_ => orig_fcn_path.clone(),
};

let fcns_rules = match self.lookup_function_by_name(&fcn_path) {
Some(r) => r,
_ => {
// Look up builtin function.
// TODO: handle with modifier
if let Ok(path) = Self::get_path_string(fcn, None) {
if let Some(builtin) = builtins::BUILTINS.get(path.as_str()) {
return self.eval_builtin_call(span, path, *builtin, params);
}
if let Some(builtin) = builtins::DEPRECATED.get(path.as_str()) {
if self.allow_deprecated {
return self.eval_builtin_call(span, path, *builtin, params);
} else {
bail!(span.error(format!("{path} is deprecated").as_str()))
}
if let Ok(Some(builtin)) = self.lookup_builtin(span, &fcn_path) {
let r = self.eval_builtin_call(span, &fcn_path.clone(), *builtin, params);
if orig_fcn_path != fcn_path {
self.with_functions.insert(orig_fcn_path, fcn_path);
}
return r;
}

return Err(span
.source
.error(span.line, span.col, "could not find function"));
Expand Down Expand Up @@ -1629,6 +1688,11 @@ impl<'source> Interpreter<'source> {
"functions must not produce multiple outputs for same inputs",
));
}

if orig_fcn_path != fcn_path {
self.with_functions.insert(orig_fcn_path, fcn_path);
}

Ok(results[0].clone())
}

Expand Down
48 changes: 24 additions & 24 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,19 +522,16 @@ impl<'source> Parser<'source> {
}
"(" if possible_fcn => {
self.next_token()?;
if *self.tok.1.text() == ")" {
return Err(self
.tok
.1
.error("at least one argument required for function calls"));
}
let mut args = vec![self.parse_in_expr()?];
while *self.tok.1.text() == "," {
self.next_token()?;
match *self.tok.1.text() {
")" => break,
"" if self.tok.0 == TokenKind::Eof => break,
_ => args.push(self.parse_in_expr()?),
let mut args = vec![];
if *self.tok.1.text() != ")" {
args.push(self.parse_in_expr()?);
while *self.tok.1.text() == "," {
self.next_token()?;
match *self.tok.1.text() {
")" => break,
"" if self.tok.0 == TokenKind::Eof => break,
_ => args.push(self.parse_in_expr()?),
}
}
}
self.expect(")", "while parsing call expr")?;
Expand Down Expand Up @@ -925,19 +922,19 @@ impl<'source> Parser<'source> {

pub fn parse_query(&mut self, mut span: Span, end_delim: &str) -> Result<Query> {
let state = self.clone();
let _is_definite_query = matches!(*self.tok.1.text(), "some" | "every");
let is_definite_query = matches!(*self.tok.1.text(), "some" | "every");

// TODO: empty query?
let mut literals = vec![];

let stmt = match self.parse_literal_stmt() {
Ok(stmt) => stmt,
Err(e) if _is_definite_query => return Err(e),
_ => {
Err(e) if is_definite_query => return Err(e),
Err(_) => {
// There was error parsing the first literal
// Restore the state and return.
*self = state;
return Err(anyhow!("encountered , when expecting {}", end_delim));
bail!(span.error(format!("expecting {end_delim}").as_str()));
}
};

Expand Down Expand Up @@ -1170,13 +1167,16 @@ impl<'source> Parser<'source> {
"(" => {
self.check_rule_ref(&rule_ref)?;
self.next_token()?;
let mut args = vec![self.parse_term()?];
while *self.tok.1.text() == "," {
self.next_token()?;
match *self.tok.1.text() {
")" => break,
"" if self.tok.0 == TokenKind::Eof => break,
_ => args.push(self.parse_term()?),
let mut args = vec![];
if *self.tok.1.text() != ")" {
args.push(self.parse_term()?);
while *self.tok.1.text() == "," {
self.next_token()?;
match *self.tok.1.text() {
")" => break,
"" if self.tok.0 == TokenKind::Eof => break,
_ => args.push(self.parse_term()?),
}
}
}
self.expect(")", "while parsing function rule args")?;
Expand Down
Loading