Restructure where the libraries live to prep for adding new language features

src/common/instr.rs

@@ -8,11 +8,11 @@ use crate::generator::rewriting::init_generator::InitGenerator;
 use crate::generator::rewriting::instr_generator::InstrGenerator;
 use crate::generator::rewriting::simple_ast::{build_simple_ast, SimpleAST};
 use crate::generator::wizard::metadata_collector::WizardProbeMetadataCollector;
-use crate::libraries::core::io::io_adapter::IOAdapter;
-use crate::libraries::core::io::IOPackage;
-use crate::libraries::core::maps::map_adapter::MapLibAdapter;
-use crate::libraries::core::maps::MapLibPackage;
-use crate::libraries::core::LibPackage;
+use crate::lang_features::libraries::core::io::io_adapter::IOAdapter;
+use crate::lang_features::libraries::core::io::IOPackage;
+use crate::lang_features::libraries::core::maps::map_adapter::MapLibAdapter;
+use crate::lang_features::libraries::core::maps::MapLibPackage;
+use crate::lang_features::libraries::core::LibPackage;
 use crate::parser::types::{Whamm, WhammVisitor};
 use crate::parser::whamm_parser::parse_script;
 use crate::verifier::types::SymbolTable;
@@ -165,7 +165,7 @@ pub fn run(
     let mut map_package = MapLibPackage::default();
     let mut io_package = IOPackage::default();
     let mut core_packages: Vec<&mut dyn LibPackage> = vec![&mut map_package, &mut io_package];
-    crate::libraries::actions::link_core_lib(
+    crate::lang_features::libraries::actions::link_core_lib(
         &config.library_strategy,
         &whamm,
         target_wasm,

src/emitter/module_emitter.rs

@@ -3,8 +3,8 @@ use crate::emitter::report_var_metadata::{Metadata, ReportVarMetadata};
 use crate::emitter::rewriting::rules::Arg;
 use crate::emitter::utils::{emit_body, emit_expr, emit_stmt, whamm_type_to_wasm_global};
 use crate::emitter::Emitter;
-use crate::libraries::core::io::io_adapter::IOAdapter;
-use crate::libraries::core::maps::map_adapter::MapLibAdapter;
+use crate::lang_features::libraries::core::io::io_adapter::IOAdapter;
+use crate::lang_features::libraries::core::maps::map_adapter::MapLibAdapter;
 use crate::parser::types::{Block, DataType, Definition, Expr, Fn, FnId, Statement, Value};
 use crate::verifier::types::{Record, SymbolTable, VarAddr};
 use log::debug;

src/emitter/rewriting/visiting_emitter.rs

@@ -3,15 +3,15 @@ use crate::emitter::module_emitter::MemoryTracker;
 use crate::emitter::report_var_metadata::ReportVarMetadata;
 use crate::emitter::rewriting::rules::wasm::OpcodeEvent;
 use crate::emitter::rewriting::rules::{Arg, LocInfo, ProbeRule, Provider, WhammProvider};
-use crate::libraries::core::maps::map_adapter::MapLibAdapter;
+use crate::lang_features::libraries::core::maps::map_adapter::MapLibAdapter;
 use std::collections::HashMap;
 
 use crate::emitter::utils::{
     block_type_to_wasm, emit_expr, emit_stmt, print_report_all, whamm_type_to_wasm_global,
 };
 use crate::emitter::Emitter;
 use crate::generator::folding::ExprFolder;
-use crate::libraries::core::io::io_adapter::IOAdapter;
+use crate::lang_features::libraries::core::io::io_adapter::IOAdapter;
 use crate::parser;
 use crate::parser::rules::UNKNOWN_IMMS;
 use crate::parser::types::{Block, DataType, Definition, Expr, RulePart, Statement, Value};

src/emitter/utils.rs

@@ -3,7 +3,7 @@ use crate::common::error::ErrorGen;
 use crate::emitter::module_emitter::MemoryTracker;
 use crate::emitter::report_var_metadata::ReportVarMetadata;
 use crate::generator::folding::ExprFolder;
-use crate::libraries::core::maps::map_adapter::MapLibAdapter;
+use crate::lang_features::libraries::core::maps::map_adapter::MapLibAdapter;
 use crate::parser::types::{
     BinOp, Block, DataType, Definition, Expr, Location, Statement, UnOp, Value,
 };

src/generator/wizard/mod.rs

@@ -8,7 +8,7 @@ use crate::emitter::report_var_metadata::{BytecodeLoc, LocationData};
 use crate::emitter::utils::{whamm_type_to_wasm_global, whamm_type_to_wasm_type};
 use crate::generator::wizard::ast::{WizardProbe, WizardScript};
 use crate::generator::GeneratingVisitor;
-use crate::libraries::core::io::io_adapter::IOAdapter;
+use crate::lang_features::libraries::core::io::io_adapter::IOAdapter;
 use crate::parser::types::{Block, DataType, Definition, FnId, Statement, Value, WhammVisitorMut};
 use crate::verifier::types::{Record, VarAddr};
 use log::trace;

src/libraries/actions.rs → src/lang_features/libraries/actions.rs

@@ -1,6 +1,6 @@
 use crate::common::error::ErrorGen;
 use crate::common::instr::LibraryLinkStrategy;
-use crate::libraries::core::LibPackage;
+use crate::lang_features::libraries::core::LibPackage;
 use crate::parser::types::Whamm;
 use orca_wasm::Module;
 
@@ -14,7 +14,7 @@ pub fn link_core_lib(
 ) {
     match method {
         LibraryLinkStrategy::Imported => {
-            crate::libraries::linking::import_lib::link_core_lib(
+            crate::lang_features::libraries::linking::import_lib::link_core_lib(
                 ast,
                 app_wasm,
                 core_wasm_path,
@@ -37,7 +37,9 @@ pub fn link_user_lib(
 ) {
     match method {
         LibraryLinkStrategy::Imported => {
-            crate::libraries::linking::import_lib::link_user_lib(ast, app_wasm, lib_wasm, err);
+            crate::lang_features::libraries::linking::import_lib::link_user_lib(
+                ast, app_wasm, lib_wasm, err,
+            );
         }
         LibraryLinkStrategy::Merged => {
             unimplemented!("Have not implemented support for merging user library code.");

src/libraries/core/io/io_adapter.rs → src/lang_features/libraries/core/io/io_adapter.rs

@@ -1,5 +1,5 @@
 use crate::common::error::ErrorGen;
-use crate::libraries::core::LibAdapter;
+use crate::lang_features::libraries::core::LibAdapter;
 use orca_wasm::ir::id::FunctionID;
 use orca_wasm::module_builder::AddLocal;
 use orca_wasm::opcode::MacroOpcode;

src/libraries/core/io/mod.rs → src/lang_features/libraries/core/io/mod.rs

@@ -1,7 +1,7 @@
 pub mod io_adapter;
 
-use crate::libraries::core::io::io_adapter::IOAdapter;
-use crate::libraries::core::{LibAdapter, LibPackage};
+use crate::lang_features::libraries::core::io::io_adapter::IOAdapter;
+use crate::lang_features::libraries::core::{LibAdapter, LibPackage};
 use crate::parser::rules::{Event, Package, Probe, Provider};
 use crate::parser::types::{
     BinOp, Block, DataType, Expr, Script, Statement, UnOp, Value, Whamm, WhammVisitor,

src/libraries/core/maps/map_adapter.rs → src/lang_features/libraries/core/maps/map_adapter.rs

@@ -1,6 +1,6 @@
 use crate::common::error::ErrorGen;
 use crate::emitter::report_var_metadata::{LocationData, Metadata, ReportVarMetadata};
-use crate::libraries::core::LibAdapter;
+use crate::lang_features::libraries::core::LibAdapter;
 use crate::parser::types::DataType;
 use orca_wasm::ir::id::{FunctionID, GlobalID};
 use orca_wasm::ir::types::BlockType as OrcaBlockType;

src/libraries/core/maps/mod.rs → src/lang_features/libraries/core/maps/mod.rs

@@ -1,7 +1,7 @@
 pub mod map_adapter;
 
-use crate::libraries::core::maps::map_adapter::MapLibAdapter;
-use crate::libraries::core::{LibAdapter, LibPackage};
+use crate::lang_features::libraries::core::maps::map_adapter::MapLibAdapter;
+use crate::lang_features::libraries::core::{LibAdapter, LibPackage};
 use crate::parser::rules::{Event, Package, Probe, Provider};
 use crate::parser::types::{
     BinOp, Block, DataType, Expr, Script, Statement, UnOp, Value, Whamm, WhammVisitor,

src/libraries/linking/import_lib.rs → src/lang_features/libraries/linking/import_lib.rs

@@ -1,5 +1,5 @@
 use crate::common::error::ErrorGen;
-use crate::libraries::core::{LibPackage, WHAMM_CORE_LIB_NAME};
+use crate::lang_features::libraries::core::{LibPackage, WHAMM_CORE_LIB_NAME};
 use crate::parser::types::Whamm;
 use log::trace;
 use orca_wasm::ir::id::FunctionID;

src/lang_features/mod.rs

@@ -0,0 +1 @@
+pub mod libraries;

src/lib.rs

@@ -1,7 +1,7 @@
 pub mod common;
 pub mod emitter;
 pub mod generator;
-pub mod libraries;
+pub mod lang_features;
 pub mod parser;
 pub mod verifier;
 pub mod wast;

src/main.rs

@@ -9,7 +9,7 @@ mod cli;
 pub mod common;
 pub mod emitter;
 pub mod generator;
-pub mod libraries;
+pub mod lang_features;
 pub mod parser;
 pub mod verifier;
 mod wast;

src/verifier/types.rs

@@ -1,5 +1,5 @@
 use crate::common::error::ErrorGen;
-use crate::libraries::core::WHAMM_CORE_LIB_NAME;
+use crate::lang_features::libraries::core::WHAMM_CORE_LIB_NAME;
 use crate::parser::types::{DataType, Definition, FnId, Location, ProbeRule, Value};
 use pest::error::LineColLocation;
 use std::collections::HashMap;