phundrak/lang-evolve-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimized rule rewriting

Browse Source
This commit is contained in:
Lucien Cartier-Tilet 2020-04-04 18:54:46 +02:00
parent 23e3acb182
commit dbbb1616dd
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/settings/mod.rs
View File

@ -284,32 +284,36 @@ impl Settings {
RULESET_CURRENT_VERSION.to_string()
}
// TODO make the return type a Result
fn update_rules(&self) -> Vec<(Regex, String)> {
fn update_rules(&self) -> std::result::Result<Vec<(Regex, String)>, String> {
let mut rules = self.rules.clone();
// TODO Optimize that shit
// TODO break categories in different rules
for (category, content) in &self.categories {
let mut temp_rules: Vec<(Regex, String)> = Vec::new();
for (from, to) in &rules {
let from = Regex::new(
from.to_string()
.replace(
for (from, to) in rules.iter_mut() {
let re = Regex::new("%\\D");
let from_match = re.is_match(from.as_str());
let to_match = re.is_match(to);
if from_match || to_match {
for (category, content) in &self.categories {
if from_match {
*from = Regex::new(
from.to_string()
.replace(
format!("%{}", category).as_str(),
format!("[{}]", content).as_str(),
)
.as_str()
);
}
if to_match {
*to = to.to_string().replace(
format!("%{}", category).as_str(),
format!("[{}]", content).as_str(),
)
.as_str(),
);
let to = to.to_string().replace(
format!("%{}", category).as_str(),
format!("[{}]", content).as_str(),
);
temp_rules.push((from, to));
format!("[{}]", content).as_str()
);
}
}
}
rules = temp_rules.clone();
}
rules
Ok(rules)
}
/// Apply list of rules to input
@ -337,7 +341,8 @@ impl Settings {
/// let _output = settings.apply(input);
/// ```
pub fn apply(&self, s: String) -> std::result::Result<String, String> {
let rules = self.update_rules();
// TODO Add Error handling
let rules = self.update_rules().unwrap();
let mut s = s.clone();
debug!("===============================================");
for (from, to) in rules {