1. Final refactoring.

Author: denisandroid

src/lib.rs

@@ -115,14 +115,16 @@ pub (crate) mod macros {
 fn search_include_and_replacegroup(
 	iter: &mut IterMut<'_, TokenTree2>,
 ) -> SearchGroup {
-	while let Some(m_punct) = iter.next() {
+	'sbegin: while let Some(m_punct) = iter.next() {
 		match m_punct {
 			TokenTree2::Punct(punct) => {
 				if punct.as_char() == '#' {
 					if let Some(m_ident) = iter.next() {
 						if let TokenTree2::Ident(ident) = m_ident {
 							let macro_fn = {
-								match ident.to_string().as_str() {
+								let str_ident = ident.to_string();
+								
+								match str_ident.as_str() {
 									"include" | "include_tt" => macro_rule_include::<IncludeTt>,
 									"include_and_fix_unknown_start_token" | "include_tt_and_fix_unknown_start_token" => macro_rule_include::<IncludeTtAndFixUnkStartToken>,
 
@@ -148,12 +150,18 @@ fn search_include_and_replacegroup(
 												*m_punct = nulltt.clone();
 												*m_punct2 = nulltt.clone();
 												*m_group = result;
+												
+												continue 'sbegin;
 											}
 										}
 									}
 									// autoskip
 								}
 							}
+							
+							sg_err! {
+								return [ident.span()]: "Unknown macro, expected `include(...)`, `include_tt(...)`, `include_and_fix_unknown_start_token(...)`, `include_tt_and_fix_unknown_start_token(...)`, `include_str(...)`, `include_arr(...)`"
+							}
 						}
 					}
 				}
@@ -164,7 +172,7 @@ fn search_include_and_replacegroup(
 				group,
 				|mut iter| search_include_and_replacegroup(&mut iter),
 			) {
-				SearchGroup::Break => continue,
+				SearchGroup::Break => continue 'sbegin,
 				result @ SearchGroup::Error(..) => return result,
 			},
 			_ => {},

src/macros/include.rs

@@ -65,7 +65,7 @@ impl BehMacroArg0 {
 
 /// Easily include trees from a file in your 
 /// final custom macro code.
-pub (crate) enum IncludeTt {}
+pub enum IncludeTt {}
 
 impl BehMacroInclude for IncludeTt {
 	type Result = TokenTree2;
@@ -90,7 +90,7 @@ impl BehMacroInclude for IncludeTt {
 			|sspath| load_file_and_automake_tree_fn(
 				sspath,
 
-				|_| {},
+				|_| {}, /* skip_prepare */
 				|fs_tt| {
 					let ett = match fs_tt {
 						Some(a) => TokenStream2::from_iter(a.into_iter()),
@@ -118,7 +118,7 @@ impl BehMacroInclude for IncludeTt {
 /// invalid tokens breaking the parser.
 ///
 /// (Implemented specifically for C-like languages using `\` as a line code string)
-pub (crate) enum IncludeTtAndFixUnkStartToken {}
+pub enum IncludeTtAndFixUnkStartToken {}
 
 impl BehMacroInclude for IncludeTtAndFixUnkStartToken {
 	type Result = TokenTree2;
@@ -219,7 +219,7 @@ impl BehMacroInclude for IncludeTtAndFixUnkStartToken {
 
 /// Includes the entire file as a single line, 
 /// similar to 'include_str'.
-pub (crate) enum IncludeStr {}
+pub enum IncludeStr {}
 
 impl BehMacroInclude for IncludeStr {
 	type Result = TokenTree2;
@@ -260,7 +260,7 @@ impl BehMacroInclude for IncludeStr {
 
 /// Includes the entire file as a binary array, 
 /// similar to 'include_str'.
-pub (crate) enum IncludeArr {}
+pub enum IncludeArr {}
 
 impl BehMacroInclude for IncludeArr {
 	type Result = TokenTree2;