use hir_expand::name::Name;
use la_arena::{Idx, RawIdx};
-use syntax::ast::RangeOp;
use crate::{
- builtin_type::{BuiltinFloat, BuiltinInt},
+ builtin_type::{BuiltinFloat, BuiltinInt, BuiltinUint},
+ intern::Interned,
path::{GenericArgs, Path},
type_ref::{Mutability, Rawness, TypeRef},
+ BlockId,
};
+pub use syntax::ast::{ArithOp, BinaryOp, CmpOp, LogicOp, Ordering, RangeOp, UnaryOp};
+
pub type ExprId = Idx<Expr>;
pub(crate) fn dummy_expr_id() -> ExprId {
ExprId::from_raw(RawIdx::from(!0))
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum Literal {
- String(String),
- ByteString(Vec<u8>),
+ String(Box<str>),
+ ByteString(Box<[u8]>),
Char(char),
Bool(bool),
- Int(u64, Option<BuiltinInt>),
+ Int(i128, Option<BuiltinInt>),
+ Uint(u128, Option<BuiltinUint>),
Float(u64, Option<BuiltinFloat>), // FIXME: f64 is not Eq
}
then_branch: ExprId,
else_branch: Option<ExprId>,
},
+ Let {
+ pat: PatId,
+ expr: ExprId,
+ },
Block {
- statements: Vec<Statement>,
+ id: BlockId,
+ statements: Box<[Statement]>,
tail: Option<ExprId>,
label: Option<LabelId>,
},
},
Call {
callee: ExprId,
- args: Vec<ExprId>,
+ args: Box<[ExprId]>,
},
MethodCall {
receiver: ExprId,
method_name: Name,
- args: Vec<ExprId>,
- generic_args: Option<GenericArgs>,
+ args: Box<[ExprId]>,
+ generic_args: Option<Box<GenericArgs>>,
},
Match {
expr: ExprId,
- arms: Vec<MatchArm>,
+ arms: Box<[MatchArm]>,
},
Continue {
label: Option<Name>,
expr: Option<ExprId>,
},
RecordLit {
- path: Option<Path>,
- fields: Vec<RecordLitField>,
+ path: Option<Box<Path>>,
+ fields: Box<[RecordLitField]>,
spread: Option<ExprId>,
},
Field {
},
Cast {
expr: ExprId,
- type_ref: TypeRef,
+ type_ref: Interned<TypeRef>,
},
Ref {
expr: ExprId,
index: ExprId,
},
Lambda {
- args: Vec<PatId>,
- arg_types: Vec<Option<TypeRef>>,
- ret_type: Option<TypeRef>,
+ args: Box<[PatId]>,
+ arg_types: Box<[Option<Interned<TypeRef>>]>,
+ ret_type: Option<Interned<TypeRef>>,
body: ExprId,
},
Tuple {
- exprs: Vec<ExprId>,
+ exprs: Box<[ExprId]>,
},
Unsafe {
body: ExprId,
},
+ MacroStmts {
+ tail: ExprId,
+ },
Array(Array),
Literal(Literal),
}
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum BinaryOp {
- LogicOp(LogicOp),
- ArithOp(ArithOp),
- CmpOp(CmpOp),
- Assignment { op: Option<ArithOp> },
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum LogicOp {
- And,
- Or,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum CmpOp {
- Eq { negated: bool },
- Ord { ordering: Ordering, strict: bool },
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum Ordering {
- Less,
- Greater,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum ArithOp {
- Add,
- Mul,
- Sub,
- Div,
- Rem,
- Shl,
- Shr,
- BitXor,
- BitOr,
- BitAnd,
-}
-
-pub use syntax::ast::PrefixOp as UnaryOp;
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum Array {
- ElementList(Vec<ExprId>),
+ ElementList(Box<[ExprId]>),
Repeat { initializer: ExprId, repeat: ExprId },
}
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum Statement {
- Let { pat: PatId, type_ref: Option<TypeRef>, initializer: Option<ExprId> },
- Expr(ExprId),
+ Let {
+ pat: PatId,
+ type_ref: Option<Interned<TypeRef>>,
+ initializer: Option<ExprId>,
+ else_branch: Option<ExprId>,
+ },
+ Expr {
+ expr: ExprId,
+ has_semi: bool,
+ },
}
impl Expr {
Expr::If { condition, then_branch, else_branch } => {
f(*condition);
f(*then_branch);
- if let Some(else_branch) = else_branch {
- f(*else_branch);
+ if let &Some(else_branch) = else_branch {
+ f(else_branch);
}
}
+ Expr::Let { expr, .. } => {
+ f(*expr);
+ }
Expr::Block { statements, tail, .. } => {
- for stmt in statements {
+ for stmt in statements.iter() {
match stmt {
Statement::Let { initializer, .. } => {
- if let Some(expr) = initializer {
- f(*expr);
+ if let &Some(expr) = initializer {
+ f(expr);
}
}
- Statement::Expr(e) => f(*e),
+ Statement::Expr { expr: expression, .. } => f(*expression),
}
}
- if let Some(expr) = tail {
- f(*expr);
+ if let &Some(expr) = tail {
+ f(expr);
}
}
Expr::TryBlock { body }
}
Expr::Call { callee, args } => {
f(*callee);
- for arg in args {
- f(*arg);
- }
+ args.iter().copied().for_each(f);
}
Expr::MethodCall { receiver, args, .. } => {
f(*receiver);
- for arg in args {
- f(*arg);
- }
+ args.iter().copied().for_each(f);
}
Expr::Match { expr, arms } => {
f(*expr);
- for arm in arms {
- f(arm.expr);
- }
+ arms.iter().map(|arm| arm.expr).for_each(f);
}
Expr::Continue { .. } => {}
Expr::Break { expr, .. } | Expr::Return { expr } | Expr::Yield { expr } => {
- if let Some(expr) = expr {
- f(*expr);
+ if let &Some(expr) = expr {
+ f(expr);
}
}
Expr::RecordLit { fields, spread, .. } => {
- for field in fields {
+ for field in fields.iter() {
f(field.expr);
}
- if let Some(expr) = spread {
- f(*expr);
+ if let &Some(expr) = spread {
+ f(expr);
}
}
Expr::Lambda { body, .. } => {
f(*rhs);
}
Expr::Range { lhs, rhs, .. } => {
- if let Some(lhs) = rhs {
- f(*lhs);
+ if let &Some(lhs) = rhs {
+ f(lhs);
}
- if let Some(rhs) = lhs {
- f(*rhs);
+ if let &Some(rhs) = lhs {
+ f(rhs);
}
}
Expr::Index { base, index } => {
| Expr::Box { expr } => {
f(*expr);
}
- Expr::Tuple { exprs } => {
- for expr in exprs {
- f(*expr);
- }
- }
+ Expr::Tuple { exprs } => exprs.iter().copied().for_each(f),
Expr::Array(a) => match a {
- Array::ElementList(exprs) => {
- for expr in exprs {
- f(*expr);
- }
- }
+ Array::ElementList(exprs) => exprs.iter().copied().for_each(f),
Array::Repeat { initializer, repeat } => {
f(*initializer);
f(*repeat)
}
},
+ Expr::MacroStmts { tail } => f(*tail),
Expr::Literal(_) => {}
}
}
pub enum Pat {
Missing,
Wild,
- Tuple { args: Vec<PatId>, ellipsis: Option<usize> },
- Or(Vec<PatId>),
- Record { path: Option<Path>, args: Vec<RecordFieldPat>, ellipsis: bool },
+ Tuple { args: Box<[PatId]>, ellipsis: Option<usize> },
+ Or(Box<[PatId]>),
+ Record { path: Option<Box<Path>>, args: Box<[RecordFieldPat]>, ellipsis: bool },
Range { start: ExprId, end: ExprId },
- Slice { prefix: Vec<PatId>, slice: Option<PatId>, suffix: Vec<PatId> },
- Path(Path),
+ Slice { prefix: Box<[PatId]>, slice: Option<PatId>, suffix: Box<[PatId]> },
+ Path(Box<Path>),
Lit(ExprId),
Bind { mode: BindingAnnotation, name: Name, subpat: Option<PatId> },
- TupleStruct { path: Option<Path>, args: Vec<PatId>, ellipsis: Option<usize> },
+ TupleStruct { path: Option<Box<Path>>, args: Box<[PatId]>, ellipsis: Option<usize> },
Ref { pat: PatId, mutability: Mutability },
Box { inner: PatId },
ConstBlock(ExprId),
projects / rust.git / blobdiff