Merge pull request #2 from clucompany/1.0.7

1.0.7

Author: denisandroid

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "include_tt"
-version = "1.0.6"
+version = "1.0.7"
 edition = "2024"
 authors = ["Denis Kotlyarov (Денис Котляров) <denis2005991@gmail.com>"]
 repository = "https://github.com/clucompany/include_tt.git"

README.md

@@ -37,7 +37,7 @@ Add this to your Cargo.toml:
 
 ```toml
 [dependencies]
-include_tt = "1.0.5"
+include_tt = "1.0.7"
 ```
 
 and this to your source code:

examples/constmodule.rs

@@ -1,13 +1,14 @@
 #[macro_export]
 macro_rules! __test_custom_path {
-	[ @$n: ident($const_t: ident) : [$t1:tt $t2:tt $t3:tt $t4:tt $t5:tt $t6:tt]; ] => {
+	[ @($const_t: ident) : [$t1:tt $t2:tt $t3:tt $t4:tt $t5:tt $t6:tt]; ] => {
 		include_tt::include_tt! {
 			#[allow(dead_code)]
 			#[allow(non_upper_case_globals)]
 			pub mod ttest {
 				pub const a: usize = 0;
 				pub const b: usize = 10;
 
+				#POINT_TRACKER_FILES;
 				pub const $const_t: (usize, usize) = (#include!([$t1 $t2 $t3 $t4 $t5 $t6]));
 			}
 		}
@@ -20,7 +21,7 @@ fn main() {
 	// if you need to change, for example, to (b,a) or substitute constant values,
 	// we will only change the contents of the file "for_examples/full.tt"!
 	__test_custom_path! {
-		@ttest(T): [examples / "full" . t 't']; // this file contains "a, b", see "for_examples/full.tt"
+		@(T): [examples / "full" . t 't']; // this file contains "a, b", see "for_examples/full.tt"
 	}
 	assert_eq!(ttest::T, (0, 10));
 }

examples/full.rs

@@ -34,7 +34,9 @@ macro_rules! test2_rules {
 		}
 	};
 
-	[$($tt:tt)+] => {
+	[
+		$($tt:tt)+
+	] => {
 		compile_error!(stringify!( $($tt)* ))
 	};
 	[] => []
@@ -43,9 +45,10 @@ macro_rules! test2_rules {
 fn main() {
 	// Loading trees from a file and substituting them into a custom macro.
 	include_tt! {
+		#POINT_TRACKER_FILES;
 		test2_rules! {
-			[#include!("./examples/full.tt")] // this file contains `a, b`.
-			[#include! { "./examples/full.tt"}] // this file contains `a, b`.
+			[ #include!("./examples/full.tt") ] // this file contains `a, b`.
+			[ #include! { "./examples/full.tt" } ] // this file contains `a, b`.
 		}
 		test2_rules! {
 			#include!("./examples/full.tt") // this file contains `a, b`.

examples/mrules.rs

@@ -40,6 +40,7 @@ fn main() {
 		// a + b = n
 		// or
 		// a - b = n
+		#POINT_TRACKER_FILES;
 		test_rules! {
 			#include!("./examples/mrules.tt") // this file contains "a + b = n", see "./for_examples/mrules.tt"
 		}

src/exprs/literal.rs

@@ -1,17 +1,14 @@
 use crate::throw_sg_err;
-use alloc::{borrow::ToOwned, string::String};
 use core::{
-	borrow::Borrow,
 	fmt::{Debug, Display},
 	ops::Deref,
 };
 use proc_macro2::{Span, TokenStream as TokenStream2};
+use std::ffi::OsStr;
 
 /// The actual literal expression, written as "./test".
 #[repr(transparent)]
-pub struct ExprLit {
-	data: str,
-}
+pub struct ExprLit(str);
 
 impl PartialEq<ExprLit> for ExprLit {
 	#[inline]
@@ -27,6 +24,13 @@ impl PartialEq<str> for ExprLit {
 	}
 }
 
+impl AsRef<OsStr> for ExprLit {
+	#[inline]
+	fn as_ref(&self) -> &OsStr {
+		AsRef::as_ref(self.as_str())
+	}
+}
+
 /// Errors received in case of a
 /// literal expression parsing error.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@@ -39,6 +43,11 @@ pub enum ExprLitTryNewErr {
 }
 
 impl ExprLitTryNewErr {
+	#[inline]
+	pub const fn expr_len(current: usize, exp: usize) -> Self {
+		Self::ExpLen { current, exp }
+	}
+
 	/// Convert an error to a syntax tree.
 	#[inline]
 	pub fn into_tt_err(self, span: Span) -> TokenStream2 {
@@ -76,22 +85,6 @@ impl Display for ExprLit {
 	}
 }
 
-impl ToOwned for ExprLit {
-	type Owned = String;
-
-	#[inline]
-	fn to_owned(&self) -> Self::Owned {
-		self.as_str().to_owned()
-	}
-}
-
-impl Borrow<ExprLit> for String {
-	#[inline]
-	fn borrow(&self) -> &ExprLit {
-		unsafe { ExprLit::unchecked(self.as_str()) } // TODO
-	}
-}
-
 impl ExprLit {
 	/// Creating `ExprLit` without clipping.
 	#[inline]
@@ -103,7 +96,7 @@ impl ExprLit {
 
 	/// Creating `ExprLit` without clipping.
 	#[inline]
-	pub const unsafe fn unchecked(a: &str) -> &Self {
+	pub const unsafe fn new_unchecked(a: &str) -> &Self {
 		Self::__new(a)
 	}
 
@@ -124,10 +117,7 @@ impl ExprLit {
 
 		let len = a_array.len();
 		if len < 2 {
-			return err(ExprLitTryNewErr::ExpLen {
-				current: len,
-				exp: 2,
-			});
+			return err(ExprLitTryNewErr::expr_len(len, 2));
 		}
 		debug_assert!({
 			#[allow(clippy::get_first)]
@@ -142,6 +132,7 @@ impl ExprLit {
 		/*
 			This is safe, the extra necessary checks are done in a separate `if` above.
 		*/
+
 		match unsafe { (a_array.get_unchecked(0), a_array.get_unchecked(len - 1)) } {
 			(b'"', b'"') =>
 				/* line */
@@ -152,10 +143,7 @@ impl ExprLit {
 					We exclude the possibility of using `'` as more
 					than one character.
 				*/
-				return err(ExprLitTryNewErr::ExpLen {
-					current: len,
-					exp: 3,
-				});
+				return err(ExprLitTryNewErr::expr_len(len, 3));
 			}
 			(b'\'', b'\'') =>
 				/* line */
@@ -172,16 +160,17 @@ impl ExprLit {
 		})
 	}
 
+	#[allow(dead_code)]
 	#[inline]
 	/// Returns `true` if self has a length of zero bytes.
 	pub const fn is_empty(&self) -> bool {
-		self.data.is_empty()
+		self.0.is_empty()
 	}
 
 	/// Getting a string of actual data.
 	#[inline]
 	pub const fn as_str(&self) -> &str {
-		&self.data
+		&self.0
 	}
 }
 
@@ -191,13 +180,10 @@ fn test_literal() {
 	/*
 		Checking the correct operation of ExprLit.
 	*/
-	assert_eq!(
-		ExprLit::try_new(""),
-		Err(ExprLitTryNewErr::ExpLen { current: 0, exp: 2 })
-	);
+	assert_eq!(ExprLit::try_new(""), Err(ExprLitTryNewErr::expr_len(0, 2)));
 	assert_eq!(
 		ExprLit::try_new("\""),
-		Err(ExprLitTryNewErr::ExpLen { current: 1, exp: 2 })
+		Err(ExprLitTryNewErr::expr_len(1, 2))
 	);
 	assert_eq!(ExprLit::try_new("\"\""), Ok(ExprLit::__new("")),);
 	assert_eq!(ExprLit::try_new("'\\'"), Ok(ExprLit::__new("\\")),);