refactor: replace sq_err with throw_sq_err

Author: denisandroid

src/exprs/literal.rs

@@ -1,4 +1,4 @@
-use crate::sg_err;
+use crate::throw_sg_err;
 use alloc::{borrow::ToOwned, string::String};
 use core::{
 	borrow::Borrow,
@@ -43,10 +43,10 @@ impl ExprLitTryNewErr {
 	#[inline]
 	pub fn into_tt_err(self, span: Span) -> TokenStream2 {
 		match self {
-			Self::ExpLen { current, exp } => sg_err! {
+			Self::ExpLen { current, exp } => throw_sg_err! {
 				[span]: "More char expected, current: ", #current, "exp: {}", #exp, "."
 			},
-			Self::ExpQuotes => sg_err! {
+			Self::ExpQuotes => throw_sg_err! {
 				[span]: "Double quotes were expected."
 			},
 		}

src/lib.rs

@@ -110,7 +110,7 @@ use alloc::string::ToString;
 use core::slice::IterMut;
 use proc_macro::TokenStream;
 use proc_macro2::{Group, TokenStream as TokenStream2, TokenTree as TokenTree2};
-use trees::sg_err;
+use crate::trees::throw_sg_err;
 
 /// Components, templates, code for the search
 /// and final construction of trees.
@@ -128,7 +128,7 @@ pub(crate) mod trees {
 	#[macro_use]
 	pub mod sq_err;
 	#[allow(clippy::single_component_path_imports)]
-	pub(crate) use sg_err;
+	pub(crate) use throw_sg_err;
 	pub mod loader;
 }
 
@@ -203,12 +203,12 @@ fn search_include_and_replacegroup(iter: &mut IterMut<'_, TokenTree2>) -> Search
 											}
 										}
 
-										sg_err! {
+										throw_sg_err! {
 											return [ident.span()]: "`;` was expected."
 										}
 									}
 
-									_ => sg_err! {
+									_ => throw_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`, `include_and_break`, `include_tt_and_break`, `include_and_fix_unknown_start_token_and_break`, `include_tt_and_fix_unknown_start_token_and_break`, `include_str_and_break`, `include_arr_and_break`."
 									},
 								}

src/macros/include.rs

@@ -4,7 +4,7 @@ use crate::{
 		group::g_stringify,
 		loader::{LoadFileAndAutoMakeTreeErr, load_file_and_automake_tree_with_fns},
 		result::TreeResult,
-		sg_err, ttry,
+		throw_sg_err, ttry,
 	},
 };
 use alloc::string::String;
@@ -338,7 +338,7 @@ where
 
 		let stream0 = iter.next();
 		if let Some(unk) = iter.next() {
-			sg_err! {
+			throw_sg_err! {
 				return [unk.span()]: "Specify a valid path to the file written with `\"/Test.tt\"`, or `'T'`, or use a group of different trees `[/, \"Test\", '/']`."
 			}
 		}
@@ -373,7 +373,7 @@ where
 				literal.span(),
 			)
 		}
-		Some(g_stream) => sg_err! {
+		Some(g_stream) => throw_sg_err! {
 			return [g_stream.span()]: "The path was expected as a single string (example: \"../test.tt\") or a path formatted as separate TokenTrees (example: ['.' '.' test \".tt\"])."
 		},
 	}

src/trees/group.rs

@@ -1,4 +1,4 @@
-use crate::{TreeResult, exprs::literal::ExprLit, trees::sg_err, trees::ttry};
+use crate::{exprs::literal::ExprLit, throw_sg_err, trees::ttry, TreeResult};
 use alloc::{
 	fmt::Write,
 	format,
@@ -57,7 +57,7 @@ pub fn check_correct_endgroup<'i>(
 						};
 						if !is_valid {
 							let e_group_str = make_endroup_str(endgroup);
-							sg_err! {
+							throw_sg_err! {
 								return [punct.span()]: "", #e_group_str, " was expected."
 							}
 						}
@@ -67,21 +67,21 @@ pub fn check_correct_endgroup<'i>(
 
 					_ => {
 						let e_group_str = make_endroup_str(endgroup);
-						sg_err! {
+						throw_sg_err! {
 							return [m_punct.span()]: "", #e_group_str, " was expected."
 						}
 					}
 				}
 			} else {
 				let e_group_str = make_endroup_str(endgroup);
-				sg_err! {
+				throw_sg_err! {
 					return [group.span()]: "", #e_group_str, " was expected."
 				}
 			}
 		}
 		Delimiter::Brace => return TreeResult::Ok(None), // `{ ... }`, ok
 		Delimiter::Bracket | Delimiter::None => {
-			sg_err! {
+			throw_sg_err! {
 				return [group.span()]: "Unsupported group type."
 			}
 		}
@@ -118,15 +118,15 @@ fn __g_stringify(tt: TokenTree2, w: &mut impl Write) -> TreeResult<()> {
 		TokenTree2::Ident(i) => {
 			if let Err(e) = w.write_str(&i.to_string()) {
 				let debug = format!("{e:?}");
-				sg_err! {
+				throw_sg_err! {
 					return [i.span()]: "Ident, ", #debug
 				}
 			}
 		}
 		TokenTree2::Punct(p) => {
 			if let Err(e) = w.write_char(p.as_char()) {
 				let debug = format!("{e:?}");
-				sg_err! {
+				throw_sg_err! {
 					return [p.span()]: "Punct, ", #debug
 				}
 			}
@@ -138,7 +138,7 @@ fn __g_stringify(tt: TokenTree2, w: &mut impl Write) -> TreeResult<()> {
 					Ok(..) => TreeResult::Ok(()),
 					Err(e) => {
 						let debug = format!("{e:?}");
-						sg_err! {
+						throw_sg_err! {
 							return [l.span()]: "Literal, ", #debug
 						}
 					}
@@ -147,7 +147,7 @@ fn __g_stringify(tt: TokenTree2, w: &mut impl Write) -> TreeResult<()> {
 					let span = l.span();
 					let debug = e.into_tt_err(span);
 
-					sg_err! {
+					throw_sg_err! {
 						return [span]: "Literal, ", #debug
 					}
 				},

src/trees/loader.rs

@@ -28,13 +28,13 @@ impl<'a> LoadFileAndAutoMakeTreeErr<'a> {
 			Self::ReadToString { err, path } => {
 				let spath = format!("{path:?}"); // TODO REFACTORME
 				let se = format!("{err:?}");
-				sg_err! {
+				throw_sg_err! {
 					[span]: "Error loading file, err: '", #se, "', path: ", #spath, "."
 				}
 			}
 			Self::ParseStr(e) => {
 				let se = format!("{e:?}");
-				sg_err! {
+				throw_sg_err! {
 					[span]: "Failed to convert to tree `tt`: '", #se, "'."
 				}
 			}

src/trees/sq_err.rs

@@ -1,16 +1,16 @@
 /// A small macro that allows you to prepare
 /// an error tree and throw it to the user.
-macro_rules! sg_err {
+macro_rules! throw_sg_err {
 	// return macro `compile_error!`.
 	[ return $($tt:tt)* ] => {
-		return sg_err! {
+		return throw_sg_err! {
 			$($tt)*
 		}
 	};
 
 	// break macro `compile_error!` with a concatenator.
 	[ break $($tt:tt)* ] => {
-		break sg_err! {
+		break throw_sg_err! {
 			$($tt)*
 		}
 	};