From 9666eea62b8cf763027d1f01acbb403c1c6097e0 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Wed, 31 Mar 2021 13:23:32 -0600 Subject: issuing correction on a previous post of mine, regarding pub(crate) --- src/makefile/command_line.rs | 6 +++--- src/makefile/conditional.rs | 14 +++++++------- src/makefile/functions.rs | 24 ++++++++++-------------- src/makefile/inference_rules.rs | 8 ++++---- src/makefile/macro.rs | 29 +++++++++++++---------------- src/makefile/mod.rs | 14 +++++++------- src/makefile/pattern.rs | 2 +- src/makefile/target.rs | 14 +++++++------- src/makefile/token.rs | 30 +++++++++++++++--------------- 9 files changed, 67 insertions(+), 74 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile/command_line.rs b/src/makefile/command_line.rs index fd1ef97..050488c 100644 --- a/src/makefile/command_line.rs +++ b/src/makefile/command_line.rs @@ -26,7 +26,7 @@ fn execute_command_line(command_line: &str, ignore_errors: bool) -> Result, or the -i option is present, or /// the special target .IGNORE has either the current target as a prerequisite or has /// no prerequisites, any error found while executing the command shall be ignored. @@ -43,7 +43,7 @@ pub(crate) struct CommandLine { } impl CommandLine { - pub(crate) fn from(mut line: TokenString) -> Self { + pub fn from(mut line: TokenString) -> Self { let mut ignore_errors = false; let mut silent = false; let mut always_execute = false; @@ -69,7 +69,7 @@ impl CommandLine { } } - pub(crate) fn execute(&self, file: &Makefile, target: &Target) -> anyhow::Result<()> { + pub fn execute(&self, file: &Makefile, target: &Target) -> anyhow::Result<()> { let ignore_error = self.ignore_errors || file.args.ignore_errors || file.special_target_has_prereq(".IGNORE", &target.name); diff --git a/src/makefile/conditional.rs b/src/makefile/conditional.rs index bf373bd..a3c3e0d 100644 --- a/src/makefile/conditional.rs +++ b/src/makefile/conditional.rs @@ -1,6 +1,6 @@ use super::token::TokenString; -pub(crate) enum ConditionalLine { +pub enum ConditionalLine { /// spelled "ifeq" IfEqual(TokenString, TokenString), /// spelled "ifneq" @@ -17,7 +17,7 @@ pub(crate) enum ConditionalLine { EndIf, } -pub(crate) enum ConditionalState { +pub enum ConditionalState { /// we saw a conditional, the condition was true, we're executing now /// and if we hit an else we will start SkippingUntilEndIf Executing, @@ -32,7 +32,7 @@ pub(crate) enum ConditionalState { } impl ConditionalState { - pub(crate) const fn skipping(&self) -> bool { + pub const fn skipping(&self) -> bool { match self { Self::Executing => false, Self::SkippingUntilElseOrEndIf | Self::SkippingUntilEndIf => true, @@ -40,14 +40,14 @@ impl ConditionalState { } } -pub(crate) enum ConditionalStateAction { +pub enum ConditionalStateAction { Push(ConditionalState), Replace(ConditionalState), Pop, } impl ConditionalStateAction { - pub(crate) fn apply_to(self, stack: &mut Vec) { + pub fn apply_to(self, stack: &mut Vec) { match self { Self::Push(state) => stack.push(state), Self::Replace(state) => match stack.last_mut() { @@ -78,7 +78,7 @@ fn decode_condition_args(line_body: &str) -> Option<(TokenString, TokenString)> } impl ConditionalLine { - pub(crate) fn from( + pub fn from( line: &str, expand_macro: impl Fn(&TokenString) -> anyhow::Result, ) -> anyhow::Result> { @@ -110,7 +110,7 @@ impl ConditionalLine { })) } - pub(crate) fn action( + pub fn action( &self, current_state: Option<&ConditionalState>, is_macro_defined: impl Fn(&str) -> bool, diff --git a/src/makefile/functions.rs b/src/makefile/functions.rs index 880ee7f..c73d7e7 100644 --- a/src/makefile/functions.rs +++ b/src/makefile/functions.rs @@ -2,11 +2,7 @@ use super::pattern::r#match; use super::r#macro::{MacroSet, MacroSource}; use super::token::TokenString; -pub(crate) fn expand_call( - name: &str, - args: &[TokenString], - macros: &MacroSet, -) -> anyhow::Result { +pub fn expand_call(name: &str, args: &[TokenString], macros: &MacroSet) -> anyhow::Result { match name { "filter" => { assert_eq!(args.len(), 2); @@ -67,7 +63,7 @@ mod text { use super::MacroSet; use super::TokenString; - pub(crate) fn filter( + pub fn filter( macros: &MacroSet, patterns: &TokenString, text: &TokenString, @@ -88,7 +84,7 @@ mod text { Ok(result_pieces.join(" ")) } - pub(crate) fn filter_out( + pub fn filter_out( macros: &MacroSet, patterns: &TokenString, text: &TokenString, @@ -109,7 +105,7 @@ mod text { Ok(result_pieces.join(" ")) } - pub(crate) fn sort(macros: &MacroSet, words: &TokenString) -> anyhow::Result { + pub fn sort(macros: &MacroSet, words: &TokenString) -> anyhow::Result { let words = macros.expand(words)?; let mut words = words.split_whitespace().collect::>(); words.sort_unstable(); @@ -129,7 +125,7 @@ mod file_name { use super::MacroSet; use super::TokenString; - pub(crate) fn notdir(macros: &MacroSet, words: &TokenString) -> anyhow::Result { + pub fn notdir(macros: &MacroSet, words: &TokenString) -> anyhow::Result { let words = macros.expand(words)?; let words = words .split_whitespace() @@ -143,7 +139,7 @@ mod file_name { Ok(words.join(" ")) } - pub(crate) fn basename(macros: &MacroSet, words: &TokenString) -> anyhow::Result { + pub fn basename(macros: &MacroSet, words: &TokenString) -> anyhow::Result { let words = macros.expand(words)?; let words = words .split_whitespace() @@ -157,7 +153,7 @@ mod file_name { Ok(words.join(" ")) } - pub(crate) fn addprefix( + pub fn addprefix( macros: &MacroSet, prefix: &TokenString, targets: &TokenString, @@ -171,7 +167,7 @@ mod file_name { Ok(results.join(" ")) } - pub(crate) fn wildcard(macros: &MacroSet, pattern: &TokenString) -> anyhow::Result { + pub fn wildcard(macros: &MacroSet, pattern: &TokenString) -> anyhow::Result { let pattern = macros.expand(pattern)?; let home_dir = env::var("HOME") .ok() @@ -198,7 +194,7 @@ mod foreach { use super::MacroSource; use super::TokenString; - pub(crate) fn foreach( + pub fn foreach( macros: &MacroSet, var: &TokenString, list: &TokenString, @@ -225,7 +221,7 @@ mod call { use super::MacroSource; use super::TokenString; - pub(crate) fn call<'a>( + pub fn call<'a>( macros: &MacroSet, args: impl Iterator, ) -> anyhow::Result { diff --git a/src/makefile/inference_rules.rs b/src/makefile/inference_rules.rs index 397008b..3d18730 100644 --- a/src/makefile/inference_rules.rs +++ b/src/makefile/inference_rules.rs @@ -3,12 +3,12 @@ use std::fmt; use crate::makefile::command_line::CommandLine; #[derive(PartialEq, Eq, Clone, Debug)] -pub(crate) struct InferenceRule { +pub struct InferenceRule { /// POSIX calls this ".s1" but that's not useful. - pub(crate) product: String, + pub product: String, /// POSIX calls this ".s2" but that's not useful. - pub(crate) prereq: String, - pub(crate) commands: Vec, + pub prereq: String, + pub commands: Vec, } impl fmt::Display for InferenceRule { diff --git a/src/makefile/macro.rs b/src/makefile/macro.rs index 88397c5..0b7a27d 100644 --- a/src/makefile/macro.rs +++ b/src/makefile/macro.rs @@ -9,26 +9,26 @@ use super::functions; use super::token::{Token, TokenString}; #[derive(Debug, Clone)] -pub(crate) enum MacroSource { +pub enum MacroSource { File, CommandLineOrMakeflags, Environment, Builtin, } -pub(crate) trait LookupInternal: for<'a> Fn(&'a str) -> anyhow::Result {} +pub trait LookupInternal: for<'a> Fn(&'a str) -> anyhow::Result {} impl Fn(&'a str) -> anyhow::Result> LookupInternal for F {} #[derive(Clone)] -pub(crate) struct MacroSet<'parent, 'lookup> { +pub struct MacroSet<'parent, 'lookup> { parent: Option<&'parent MacroSet<'parent, 'lookup>>, data: HashMap, lookup_internal: Option<&'lookup dyn LookupInternal>, } impl<'parent, 'lookup> MacroSet<'parent, 'lookup> { - pub(crate) fn new() -> Self { + pub fn new() -> Self { Self { parent: None, data: HashMap::new(), @@ -36,13 +36,13 @@ impl<'parent, 'lookup> MacroSet<'parent, 'lookup> { } } - pub(crate) fn add_builtins(&mut self) { + pub fn add_builtins(&mut self) { for (k, v) in builtins() { self.data.insert(k.into(), (MacroSource::Builtin, v)); } } - pub(crate) fn add_env(&mut self) { + pub fn add_env(&mut self) { for (k, v) in env::vars() { if k != "MAKEFLAGS" && k != "SHELL" { self.data @@ -61,26 +61,26 @@ impl<'parent, 'lookup> MacroSet<'parent, 'lookup> { } } - pub(crate) fn get(&self, name: &str) -> Option<&(MacroSource, TokenString)> { + pub fn get(&self, name: &str) -> Option<&(MacroSource, TokenString)> { self.data .get(name) .or_else(|| self.parent.and_then(|parent| parent.get(name))) } - pub(crate) fn set(&mut self, name: String, source: MacroSource, text: TokenString) { + pub fn set(&mut self, name: String, source: MacroSource, text: TokenString) { self.data.insert(name, (source, text)); } - pub(crate) fn is_defined(&self, name: &str) -> bool { + pub fn is_defined(&self, name: &str) -> bool { self.data.contains_key(name) } // `remove` is fine, but I think for "remove-and-return" `pop` is better - pub(crate) fn pop(&mut self, name: &str) -> Option<(MacroSource, TokenString)> { + pub fn pop(&mut self, name: &str) -> Option<(MacroSource, TokenString)> { self.data.remove(name) } - pub(crate) fn expand(&self, text: &TokenString) -> anyhow::Result { + pub fn expand(&self, text: &TokenString) -> anyhow::Result { let mut result = String::new(); for token in text.tokens() { match token { @@ -121,10 +121,7 @@ impl<'parent, 'lookup> MacroSet<'parent, 'lookup> { Ok(result) } - pub(crate) fn with_lookup<'l, 's: 'l>( - &'s self, - lookup: &'l dyn LookupInternal, - ) -> MacroSet<'s, 'l> { + pub fn with_lookup<'l, 's: 'l>(&'s self, lookup: &'l dyn LookupInternal) -> MacroSet<'s, 'l> { MacroSet { parent: Some(self), data: HashMap::new(), @@ -132,7 +129,7 @@ impl<'parent, 'lookup> MacroSet<'parent, 'lookup> { } } - pub(crate) fn with_overlay<'s>(&'s self) -> MacroSet<'s, 'lookup> { + pub fn with_overlay<'s>(&'s self) -> MacroSet<'s, 'lookup> { MacroSet { parent: Some(self), data: HashMap::new(), diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs index 270dd46..d9c9b46 100644 --- a/src/makefile/mod.rs +++ b/src/makefile/mod.rs @@ -85,17 +85,17 @@ fn inference_match<'a>( } } -pub(crate) struct Makefile<'a> { +pub struct Makefile<'a> { inference_rules: Vec, macros: MacroSet<'static, 'static>, targets: RefCell>>>, - pub(crate) first_non_special_target: Option, + pub first_non_special_target: Option, args: &'a Args, // TODO borrow warnings from Python version } impl<'a> Makefile<'a> { - pub(crate) fn new(args: &'a Args) -> Self { + pub fn new(args: &'a Args) -> Self { let mut inference_rules = vec![]; let mut macros = MacroSet::new(); let mut targets = HashMap::new(); @@ -132,7 +132,7 @@ impl<'a> Makefile<'a> { } } - pub(crate) fn and_read_file(&mut self, path: impl AsRef) -> anyhow::Result<()> { + pub fn and_read_file(&mut self, path: impl AsRef) -> anyhow::Result<()> { let file = File::open(path); // TODO handle errors let file = file.context("couldn't open makefile!")?; @@ -140,7 +140,7 @@ impl<'a> Makefile<'a> { self.and_read(file_reader) } - pub(crate) fn and_read(&mut self, source: impl BufRead) -> anyhow::Result<()> { + pub fn and_read(&mut self, source: impl BufRead) -> anyhow::Result<()> { let mut lines_iter = source .lines() .enumerate() @@ -416,7 +416,7 @@ impl<'a> Makefile<'a> { } } - pub(crate) fn get_target(&self, name: &str) -> anyhow::Result>> { + pub fn get_target(&self, name: &str) -> anyhow::Result>> { // TODO implement .POSIX let follow_gnu = true; @@ -514,7 +514,7 @@ impl<'a> Makefile<'a> { Ok(targets.get(name).context("Target not found!")?.clone()) } - pub(crate) fn update_target(&self, name: &str) -> anyhow::Result<()> { + pub fn update_target(&self, name: &str) -> anyhow::Result<()> { self.get_target(name)?.borrow().update(self) } diff --git a/src/makefile/pattern.rs b/src/makefile/pattern.rs index e4077cd..6648851 100644 --- a/src/makefile/pattern.rs +++ b/src/makefile/pattern.rs @@ -24,7 +24,7 @@ fn compile_pattern(pattern: &str) -> anyhow::Result { Ok(Regex::new(&result)?) } -pub(crate) fn r#match<'a>(pattern: &str, text: &'a str) -> anyhow::Result>> { +pub fn r#match<'a>(pattern: &str, text: &'a str) -> anyhow::Result>> { Ok(compile_pattern(pattern)?.captures(text)) } diff --git a/src/makefile/target.rs b/src/makefile/target.rs index 04603c9..64fdb7d 100644 --- a/src/makefile/target.rs +++ b/src/makefile/target.rs @@ -8,11 +8,11 @@ use crate::makefile::command_line::CommandLine; use super::Makefile; #[derive(PartialEq, Eq, Clone, Debug)] -pub(crate) struct Target { - pub(crate) name: String, - pub(crate) prerequisites: Vec, - pub(crate) commands: Vec, - pub(crate) already_updated: Cell, +pub struct Target { + pub name: String, + pub prerequisites: Vec, + pub commands: Vec, + pub already_updated: Cell, } impl Target { @@ -22,7 +22,7 @@ impl Target { .ok() } - pub(crate) fn newer_than(&self, other: &Self) -> Option { + pub fn newer_than(&self, other: &Self) -> Option { let self_updated = self.already_updated.get(); let other_updated = other.already_updated.get(); Some(match (self.modified_time(), other.modified_time()) { @@ -50,7 +50,7 @@ impl Target { exists && newer_than_all_dependencies } - pub(crate) fn update(&self, file: &Makefile) -> anyhow::Result<()> { + pub fn update(&self, file: &Makefile) -> anyhow::Result<()> { for prereq in &self.prerequisites { file.update_target(prereq)?; } diff --git a/src/makefile/token.rs b/src/makefile/token.rs index 508a779..dee290e 100644 --- a/src/makefile/token.rs +++ b/src/makefile/token.rs @@ -13,29 +13,29 @@ use nom::{ }; #[derive(PartialEq, Eq, Clone, Debug)] -pub(crate) struct TokenString(Vec); +pub struct TokenString(Vec); impl TokenString { - pub(crate) fn text(text: impl Into) -> Self { + pub fn text(text: impl Into) -> Self { Self(vec![Token::Text(text.into())]) } - pub(crate) fn r#macro(name: impl Into) -> Self { + pub fn r#macro(name: impl Into) -> Self { Self(vec![Token::MacroExpansion { name: name.into(), replacement: None, }]) } - pub(crate) fn tokens(&self) -> impl Iterator { + pub fn tokens(&self) -> impl Iterator { self.0.iter() } - pub(crate) fn first_token_mut(&mut self) -> &mut Token { + pub fn first_token_mut(&mut self) -> &mut Token { &mut self.0[0] } - pub(crate) fn split_once(&self, delimiter: char) -> Option<(Self, Self)> { + pub fn split_once(&self, delimiter: char) -> Option<(Self, Self)> { let mut result0 = vec![]; let mut iter = self.0.iter(); while let Some(t) = iter.next() { @@ -55,21 +55,21 @@ impl TokenString { None } - pub(crate) fn starts_with(&self, pattern: &str) -> bool { + pub fn starts_with(&self, pattern: &str) -> bool { match self.0.first() { Some(Token::Text(t)) => t.starts_with(pattern), _ => false, } } - pub(crate) fn ends_with(&self, pattern: &str) -> bool { + pub fn ends_with(&self, pattern: &str) -> bool { match self.0.last() { Some(Token::Text(t)) => t.ends_with(pattern), _ => false, } } - pub(crate) fn strip_prefix(&mut self, suffix: &str) { + pub fn strip_prefix(&mut self, suffix: &str) { if let Some(Token::Text(t)) = self.0.first_mut() { if let Some(x) = t.strip_prefix(suffix) { *t = x.into() @@ -77,7 +77,7 @@ impl TokenString { } } - pub(crate) fn strip_suffix(&mut self, suffix: &str) { + pub fn strip_suffix(&mut self, suffix: &str) { if let Some(Token::Text(t)) = self.0.last_mut() { if let Some(x) = t.strip_suffix(suffix) { *t = x.into() @@ -85,17 +85,17 @@ impl TokenString { } } - pub(crate) fn extend(&mut self, other: Self) { + pub fn extend(&mut self, other: Self) { self.0.extend(other.0); } - pub(crate) fn trim_start(&mut self) { + pub fn trim_start(&mut self) { if let Some(Token::Text(t)) = self.0.first_mut() { *t = t.trim_start().into(); } } - pub(crate) fn trim_end(&mut self) { + pub fn trim_end(&mut self) { if let Some(Token::Text(t)) = self.0.last_mut() { *t = t.trim_end().into(); } @@ -112,7 +112,7 @@ impl fmt::Display for TokenString { } #[derive(PartialEq, Eq, Clone, Debug)] -pub(crate) enum Token { +pub enum Token { Text(String), MacroExpansion { name: String, @@ -251,7 +251,7 @@ fn full_text_tokens(input: &str) -> IResult<&str, TokenString> { all_consuming(tokens_but_not(vec![]))(input) } -pub(crate) fn tokenize(input: &str) -> anyhow::Result { +pub fn tokenize(input: &str) -> anyhow::Result { let (_, result) = full_text_tokens(input) .finish() .map_err(|err| anyhow::anyhow!(err.to_string())) -- cgit v1.2.3