From 5b4bb6606e79c7d5ce8c89521d561ca795b407f6 Mon Sep 17 00:00:00 2001 From: Greg Shuflin Date: Sun, 24 Oct 2021 22:16:12 -0700 Subject: [PATCH] Comment out the old evaluator and reduced_ast --- schala-lang/language/src/lib.rs | 4 ++-- schala-lang/language/src/schala.rs | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/schala-lang/language/src/lib.rs b/schala-lang/language/src/lib.rs index bfce505..1d0e21b 100644 --- a/schala-lang/language/src/lib.rs +++ b/schala-lang/language/src/lib.rs @@ -23,8 +23,8 @@ mod tokenizing; mod symbol_table; mod builtin; mod error; -mod eval; -mod reduced_ast; +//mod eval; +//mod reduced_ast; mod reduced_ir; mod tree_walk_eval; diff --git a/schala-lang/language/src/schala.rs b/schala-lang/language/src/schala.rs index d55f5a2..81bf2ba 100644 --- a/schala-lang/language/src/schala.rs +++ b/schala-lang/language/src/schala.rs @@ -1,7 +1,7 @@ use stopwatch::Stopwatch; use crate::error::SchalaError; -use crate::{eval, parsing, reduced_ir, tree_walk_eval, symbol_table, tokenizing, typechecking}; +use crate::{/*eval, */parsing, reduced_ir, tree_walk_eval, symbol_table, tokenizing, typechecking}; use schala_repl::{ ComputationRequest, ComputationResponse, GlobalOutputStats, LangMetaRequest, LangMetaResponse, ProgrammingLanguageInterface, @@ -11,8 +11,8 @@ use schala_repl::{ pub struct Schala<'a> { /// Holds a reference to the original source code, parsed into line and character source_reference: SourceReference, - /// Execution state for AST-walking interpreter - state: eval::State<'static>, + + //state: eval::State<'static>, /// Keeps track of symbols and scopes symbol_table: symbol_table::SymbolTable, /// Contains information for type-checking @@ -20,6 +20,7 @@ pub struct Schala<'a> { /// Schala Parser active_parser: parsing::Parser, + /// Execution state for AST-walking interpreter eval_state: tree_walk_eval::State<'a>, } @@ -43,7 +44,7 @@ impl<'a> Schala<'a> { Schala { source_reference: SourceReference::new(), symbol_table: symbol_table::SymbolTable::new(), - state: eval::State::new(), + //state: eval::State::new(), type_context: typechecking::TypeContext::new(), active_parser: parsing::Parser::new(), eval_state: tree_walk_eval::State::new(),