Removed macro facets
Macros, placeholders, etc. will all be handled by std eventually so they shouldn't appear in the protocol or the host
This commit is contained in:
@@ -8,7 +8,6 @@ use orchid_base::location::Pos;
|
||||
use orchid_base::name::Sym;
|
||||
use orchid_base::parse::{Comment, CompName};
|
||||
use orchid_base::tree::{ttv_from_api, TokTree, Token};
|
||||
use ordered_float::NotNan;
|
||||
|
||||
use crate::api;
|
||||
use crate::expr::RtExpr;
|
||||
@@ -29,7 +28,6 @@ pub enum ItemKind {
|
||||
Raw(Vec<ParsTokTree>),
|
||||
Member(Member),
|
||||
Export(Tok<String>),
|
||||
Rule(Macro),
|
||||
Import(CompName),
|
||||
}
|
||||
|
||||
@@ -38,7 +36,6 @@ impl Item {
|
||||
let kind = match tree.kind {
|
||||
api::ItemKind::Raw(tokv) => ItemKind::Raw(ttv_from_api(tokv, &mut ())),
|
||||
api::ItemKind::Member(m) => ItemKind::Member(Member::from_api(m, sys)),
|
||||
api::ItemKind::Rule(r) => ItemKind::Rule(Macro::from_api(r)),
|
||||
api::ItemKind::Import(i) => ItemKind::Import(CompName::from_api(i)),
|
||||
api::ItemKind::Export(e) => ItemKind::Export(deintern(e)),
|
||||
};
|
||||
@@ -95,22 +92,6 @@ impl Module {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Macro {
|
||||
pub priority: NotNan<f64>,
|
||||
pub pattern: Vec<ParsTokTree>,
|
||||
pub template: Vec<ParsTokTree>,
|
||||
}
|
||||
impl Macro {
|
||||
pub fn from_api(m: api::Macro) -> Self {
|
||||
Self {
|
||||
priority: m.priority,
|
||||
pattern: ttv_from_api(m.pattern, &mut ()),
|
||||
template: ttv_from_api(m.template, &mut ()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct LazyMemberHandle(api::TreeId, System);
|
||||
impl LazyMemberHandle {
|
||||
|
||||
Reference in New Issue
Block a user