From cc1f85be5b6780a0bee9f6620946c4bd057b1b8b Mon Sep 17 00:00:00 2001 From: bnewbold Date: Sat, 29 Oct 2016 17:15:24 -0700 Subject: make library routines public --- src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 392f373..a76fc2d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,7 +11,7 @@ use std::io::Read; use std::fs::File; #[derive(Debug, PartialEq)] -struct ModelMetadata { +pub struct ModelMetadata { slug: String, name_en: String, description_en: Option, @@ -19,14 +19,14 @@ struct ModelMetadata { } #[derive(Debug, PartialEq)] -enum ModelVarType { +pub enum ModelVarType { Independent, Dependent, Constant, } #[derive(Debug, PartialEq)] -struct ModelVar { +pub struct ModelVar { slug: String, name_en: String, vtype: Option, @@ -35,14 +35,14 @@ struct ModelVar { } #[derive(Debug, PartialEq)] -struct ModelEntry { +pub struct ModelEntry { ast: modelica_ast::ModelicaModel, metadata: ModelMetadata, markdown: String, } // TODO: this -fn parse_metadata(s: String) -> Result { +pub fn parse_metadata(s: String) -> Result { Ok(ModelMetadata { slug: "dummy".to_string(), name_en: "Bogus Dummy Model".to_string(), @@ -51,7 +51,7 @@ fn parse_metadata(s: String) -> Result { }) } -fn load_model_entry(p: &Path) -> Result { +pub fn load_model_entry(p: &Path) -> Result { debug!("Attempting to load model from: {:?}", p); let ast = { @@ -80,7 +80,7 @@ fn load_model_entry(p: &Path) -> Result { } // TODO: have this check for model.modelica etc -fn search_models(p: &Path) -> Vec { +pub fn search_models(p: &Path) -> Vec { if fs::metadata(p).unwrap().is_dir() { fs::read_dir(p).unwrap() .map(|x| x.unwrap()) -- cgit v1.2.3