temp commit

orchid-std/src/macros/rule/build.rs

@@ -1,11 +1,10 @@
 use itertools::Itertools;
-use orchid_api::PhKind;
 use orchid_base::interner::Tok;
 use orchid_base::side::Side;
-use orchid_base::tree::Ph;
 
 use super::shared::{AnyMatcher, ScalMatcher, VecMatcher};
 use super::vec_attrs::vec_attrs;
+use crate::macros::mactree::{Ph, PhKind};
 use crate::macros::{MacTok, MacTree};
 
 pub type MaxVecSplit<'a> = (&'a [MacTree], (Tok<String>, u8, bool), &'a [MacTree]);
@@ -108,24 +107,22 @@ fn mk_scalar(pattern: &MacTree) -> ScalMatcher {
 mod test {
 	use std::rc::Rc;
 
-	use orchid_api::PhKind;
 	use orchid_base::interner::Interner;
 	use orchid_base::location::SrcRange;
 	use orchid_base::sym;
 	use orchid_base::tokens::Paren;
-	use orchid_base::tree::Ph;
 	use test_executors::spin_on;
 
 	use super::mk_any;
+	use crate::macros::mactree::{Ph, PhKind};
 	use crate::macros::{MacTok, MacTree};
 
 	#[test]
 	fn test_scan() {
 		spin_on(async {
 			let i = Interner::new_master();
-			let ex = |tok: MacTok| async {
-				MacTree { tok: Rc::new(tok), pos: SrcRange::mock(&i).await.pos() }
-			};
+			let ex =
+				|tok: MacTok| async { MacTree { tok: Rc::new(tok), pos: SrcRange::mock(&i).await.pos() } };
 			let pattern = vec![
 				ex(MacTok::Ph(Ph {
 					kind: PhKind::Vector { priority: 0, at_least_one: false },

orchid-std/src/macros/rule/matcher.rs

@@ -2,11 +2,9 @@ use std::fmt;
 use std::rc::Rc;
 
 use itertools::Itertools;
-use orchid_api::PhKind;
 use orchid_base::interner::Interner;
 use orchid_base::location::Pos;
 use orchid_base::name::Sym;
-use orchid_base::tree::Ph;
 
 use super::any_match::any_match;
 use super::build::{mk_any, mk_vec};
@@ -14,6 +12,7 @@ use super::shared::{AnyMatcher, VecMatcher};
 use super::state::{MatchState, StateEntry};
 use super::vec_attrs::vec_attrs;
 use super::vec_match::vec_match;
+use crate::macros::mactree::{Ph, PhKind};
 use crate::macros::{MacTok, MacTree};
 
 pub fn first_is_vec(pattern: &[MacTree]) -> bool { vec_attrs(pattern.first().unwrap()).is_some() }

orchid-std/src/macros/rule/vec_attrs.rs

@@ -1,7 +1,6 @@
-use orchid_api::PhKind;
 use orchid_base::interner::Tok;
-use orchid_base::tree::Ph;
 
+use crate::macros::mactree::{Ph, PhKind};
 use crate::macros::{MacTok, MacTree};
 
 /// Returns the name, priority and at_least_one of the expression if it is