12bitfloat_rust/risspam/Cargo.toml

@@ -5,7 +5,3 @@ edition = "2021"
 
 [dependencies]
 rayon = "1.10.0"
-
-[profile.release]
-lto = "thin"
-panic = "abort"

12bitfloat_rust/risspam/src/main.rs

@@ -14,36 +14,21 @@ fn clean_content(content: &str) -> String {
 	clean_content
 }
 
-fn get_sentences(content: &str) -> usize {
-	let sentences = content.split('.')
+fn get_sentences(content: &str) -> Vec<&str> {
+	let mut sentences = content.split('.')
 		.map(|s| s.trim_start()) // Remove leading whitespace
-		.count();
+		.collect::<Vec<_>>();
 	
-//	// Remove last "sentence" if didn't end with a dot
-//	if let Some(last) = sentences.last() && !last.ends_with('.') {
-//		sentences.pop();
-//	}
+	// Remove last "sentence" if didn't end with a dot
+	if let Some(last) = sentences.last() && !last.ends_with('.') {
+		sentences.pop();
+	}
 	
 	sentences
 }
 
-fn get_words(content: &str, words: &mut usize, caps: &mut usize, fw: &mut usize) {
-	fn check_forbidden(w: &str) -> bool {
-		FORBIDDEN_WORDS.iter()
-			.find(|fw| str::eq_ignore_ascii_case(w, fw))
-			.is_some()
-	}
-	
-	for word in content.split_whitespace() {
-		*words += 1;
-		
-		if is_fully_capitalized_word(word) {
-			*caps += 1;
-		}
-		if check_forbidden(word) {
-			*fw += 1;
-		}
-	}
+fn get_words(sentences: &str) -> impl Iterator<Item = &str> + Clone {
+	sentences.split_whitespace()
 }
 
 fn is_fully_capitalized_word(word: &str) -> bool {
@@ -51,68 +36,65 @@ fn is_fully_capitalized_word(word: &str) -> bool {
 		.all(|c| !c.is_ascii_alphanumeric() || c.is_ascii_uppercase())
 }
 
-//fn get_capitalized_words(content: &str) -> usize {
-//	let sentences = get_sentences(content);
-////	let mut cap_words = vec![];
-//	let mut count = 0;
-//	
-//	for sentence in sentences {
-//		// Always skip the first word since sentences start with
-//		for word in get_words(sentence).skip(1) {
-//			if is_fully_capitalized_word(word) {
-//				count += 1;
-//			}
-//		}
-//	}
-//	
-//	count
-//}
-
-fn get_numbers(clean_content: &str) -> usize {
-	clean_content.split(|c: char| !c.is_ascii_digit())
-		.count()
+fn get_capitalized_words(content: &str) -> Vec<&str> {
+	let sentences = get_sentences(content);
+	let mut cap_words = vec![];
+	
+	for sentence in sentences {
+		// Always skip the first word since sentences start with
+		for word in get_words(sentence).skip(1) {
+			if is_fully_capitalized_word(word) {
+				cap_words.push(word);
+			}
+		}
+	}
+	
+	cap_words
 }
 
-//fn get_forbidden_words(content: &str) -> usize {
-//	fn check_forbidden(w: &str) -> bool {
-//		FORBIDDEN_WORDS.iter()
-//			.find(|fw| str::eq_ignore_ascii_case(w, fw))
-//			.is_some()
-//	}
-//	
-//	get_words(content)
-//		.filter(|w| check_forbidden(w))
-//		.collect()
-//}
+fn get_numbers(clean_content: &str) -> Vec<&str> {
+	clean_content.split(|c: char| c.is_ascii_digit())
+		.collect()
+}
+
+fn get_forbidden_words(content: &str) -> Vec<&str> {
+	fn check_forbidden(w: &str) -> bool {
+		FORBIDDEN_WORDS.iter()
+			.find(|fw| str::eq_ignore_ascii_case(w, fw))
+			.is_some()
+	}
+	
+	get_words(content)
+		.filter(|w| check_forbidden(w))
+		.collect()
+}
 
 fn analyze(data: &str) {
 	let clean_data = clean_content(data);
 //	drop(clean_data); // You aren't actually using clean_data :O
 	
 	// All capitalized words
-	let mut words = 0;
-	let mut fw = 0;
-	let mut cap_words = 0;
-	get_words(&clean_data, &mut words, &mut fw, &mut cap_words);
-	
-	println!("All capitalized words: {}", cap_words);
+	let cap_words = get_capitalized_words(data);
+	println!("All capitalized words: {}", cap_words.len());
 	
 	// All sentences
 	let sentences = get_sentences(data);
-	println!("Sentences: {}", sentences);
+	println!("Sentences: {}", sentences.len());
 	
 	// All words
-	println!("Words: {}", words);
+	let words = get_words(data);
+	println!("Words: {}", words.clone().count());
 	
 	// Numbers
 	let numbers = get_numbers(&clean_data);
-	println!("Numbers: {}", numbers);
+	println!("Numbers: {}", numbers.len());
 	
 	// Forbidden words
-	println!("Forbidden words: {}", fw);
+	let fw = get_forbidden_words(data);
+	println!("Forbidden words: {}", fw.len());
 	
-	if sentences > 0 {
-		let word_count_per_sentence = words / sentences;
+	if sentences.len() > 0 {
+		let word_count_per_sentence = words.count() / sentences.len();
 		println!("Word count per sentence: {}", word_count_per_sentence);
 	}
 }
@@ -154,4 +136,3 @@ static FORBIDDEN_WORDS: &'static [&'static str] = &[
     "transaction", "essential", "managing", "contact", "contacting", "understanding", "assets",   "funds"
 ];
 
-