Rename ast_reducing -> reduced_ast

This commit is contained in:
greg 2018-06-04 19:12:48 -07:00
parent 5aa0e10e7a
commit d0a0cc8209
3 changed files with 4 additions and 4 deletions

View File

@ -6,7 +6,7 @@ use std::io;
use itertools::Itertools; use itertools::Itertools;
use util::StateStack; use util::StateStack;
use ast_reducing::{ReducedAST, Stmt, Expr, Lit, Func}; use reduced_ast::{ReducedAST, Stmt, Expr, Lit, Func};
use symbol_table::{SymbolSpec, Symbol, SymbolTable}; use symbol_table::{SymbolSpec, Symbol, SymbolTable};
pub struct State<'a> { pub struct State<'a> {

View File

@ -26,7 +26,7 @@ mod tokenizing;
mod parsing; mod parsing;
mod symbol_table; mod symbol_table;
mod typechecking; mod typechecking;
mod ast_reducing; mod reduced_ast;
mod eval; mod eval;
#[derive(ProgrammingLanguageInterface)] #[derive(ProgrammingLanguageInterface)]
@ -116,13 +116,13 @@ fn typechecking(handle: &mut Schala, input: parsing::AST, comp: Option<&mut Unfi
} }
} }
fn ast_reducing(_handle: &mut Schala, input: parsing::AST, comp: Option<&mut UnfinishedComputation>) -> Result<ast_reducing::ReducedAST, String> { fn ast_reducing(_handle: &mut Schala, input: parsing::AST, comp: Option<&mut UnfinishedComputation>) -> Result<reduced_ast::ReducedAST, String> {
let output = input.reduce(); let output = input.reduce();
comp.map(|comp| comp.add_artifact(TraceArtifact::new("ast_reducing", format!("{:?}", output)))); comp.map(|comp| comp.add_artifact(TraceArtifact::new("ast_reducing", format!("{:?}", output))));
Ok(output) Ok(output)
} }
fn eval(handle: &mut Schala, input: ast_reducing::ReducedAST, comp: Option<&mut UnfinishedComputation>) -> Result<String, String> { fn eval(handle: &mut Schala, input: reduced_ast::ReducedAST, comp: Option<&mut UnfinishedComputation>) -> Result<String, String> {
comp.map(|comp| comp.add_artifact(TraceArtifact::new("value_state", handle.state.debug_print()))); comp.map(|comp| comp.add_artifact(TraceArtifact::new("value_state", handle.state.debug_print())));
let evaluation_outputs = handle.state.evaluate(input, true); let evaluation_outputs = handle.state.evaluate(input, true);
let text_output: Result<Vec<String>, String> = evaluation_outputs let text_output: Result<Vec<String>, String> = evaluation_outputs