all, any deprecated functions (#35)

Signed-off-by: Anand Krishnamoorthi <anakrish@microsoft.com>
This commit is contained in:
Anand Krishnamoorthi
2023-11-04 13:22:40 -07:00
committed by GitHub
parent 9ca55bcdf8
commit d3fd0a3a78
6 changed files with 106 additions and 44 deletions

View File

@@ -240,11 +240,12 @@ pub fn eval_file_first_rule(
};
let mut parser = regorus::Parser::new(&query_source)?;
let query_node = parser.parse_query(query_span, "")?;
let query_schedule = regorus::Analyzer::new().analyze_query_snippet(&modules, &query_node)?;
let query_schedule =
regorus::Analyzer::new().analyze_query_snippet(&modules_ref, &query_node)?;
let analyzer = Analyzer::new();
let schedule = analyzer.analyze(&modules)?;
let schedule = analyzer.analyze(&modules_ref)?;
let mut interpreter = interpreter::Interpreter::new(modules_ref)?;
let mut interpreter = interpreter::Interpreter::new(&modules_ref)?;
if let Some(input) = input_opt {
// if inputs are defined then first the evaluation if prepared
interpreter.prepare_for_eval(Some(schedule), &data_opt)?;
@@ -332,12 +333,13 @@ pub fn eval_file(
};
let mut parser = regorus::Parser::new(&query_source)?;
let query_node = parser.parse_query(query_span, "")?;
let query_schedule = regorus::Analyzer::new().analyze_query_snippet(&modules, &query_node)?;
let query_schedule =
regorus::Analyzer::new().analyze_query_snippet(&modules_ref, &query_node)?;
let analyzer = Analyzer::new();
let schedule = analyzer.analyze(&modules)?;
let schedule = analyzer.analyze(&modules_ref)?;
let mut interpreter = interpreter::Interpreter::new(modules_ref)?;
let mut interpreter = interpreter::Interpreter::new(&modules_ref)?;
if let Some(input) = input_opt {
// if inputs are defined then first the evaluation if prepared
interpreter.prepare_for_eval(Some(schedule), &data_opt)?;

View File

@@ -52,9 +52,10 @@ fn analyze_file(regos: &[String], expected_scopes: &[Scope]) -> Result<()> {
let mut parser = Parser::new(source)?;
modules.push(parser.parse()?);
}
let modules_ref: Vec<&Module> = modules.iter().collect();
let analyzer = Analyzer::new();
let schedule = analyzer.analyze(&modules)?;
let schedule = analyzer.analyze(&modules_ref)?;
for (idx, (_, scope)) in schedule.scopes.iter().enumerate() {
if idx > expected_scopes.len() {
bail!("extra scope generated.")