difftreelog
feat use visitor for async_import etc
in: master
4 files changed
crates/jrsonnet-evaluator/src/async_import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/async_import.rs
+++ b/crates/jrsonnet-evaluator/src/async_import.rs
@@ -2,10 +2,11 @@
use std::{any::Any, cell::RefCell, future::Future};
use jrsonnet_gcmodule::Acyclic;
+use jrsonnet_ir::visit::Visitor;
use jrsonnet_ir::{
ArgsDesc, AssertExpr, AssertStmt, BindSpec, CompSpec, Destruct, Expr, ExprParam, ExprParams,
- FieldMember, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, ObjBody, Slice, SliceDesc,
- Source, SourcePath, Spanned,
+ FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData, ImportKind, ObjBody, Slice,
+ SliceDesc, Source, SourcePath, Spanned,
};
use rustc_hash::FxHashMap;
@@ -17,213 +18,12 @@
}
pub struct FoundImports(Vec<Import>);
-
-// Visits all nodes, trying to find import statements
-#[allow(clippy::too_many_lines)]
-pub fn find_imports(expr: &Spanned<Expr>, out: &mut FoundImports) {
- #[allow(unused_variables, clippy::needless_pass_by_ref_mut)]
- fn in_destruct(dest: &Destruct, out: &mut FoundImports) {
- match dest {
- #[cfg(feature = "exp-destruct")]
- Destruct::Array {
- start,
- rest: _,
- end,
- } => {
- for dest in start {
- in_destruct(dest, out);
- }
- for dest in end {
- in_destruct(dest, out);
- }
- }
- #[cfg(feature = "exp-destruct")]
- Destruct::Object { fields, rest: _ } => {
- for (_, dest, default) in fields {
- if let Some(dest) = dest {
- in_destruct(dest, out);
- }
- if let Some(expr) = default {
- find_imports(expr, out);
- }
- }
- }
- #[cfg(feature = "exp-destruct")]
- Destruct::Skip => {}
- Destruct::Full(_) => {}
- }
- }
- fn in_compspec(specs: &[CompSpec], out: &mut FoundImports) {
- for spec in specs {
- match spec {
- CompSpec::IfSpec(IfSpecData(expr)) => find_imports(expr, out),
- CompSpec::ForSpec(ForSpecData(destruct, expr)) => {
- in_destruct(destruct, out);
- find_imports(expr, out);
- }
- }
- }
- }
- fn in_params(params: &ExprParams, out: &mut FoundImports) {
- for ExprParam { destruct, default } in &*params.exprs {
- in_destruct(destruct, out);
- if let Some(expr) = default {
- find_imports(expr, out);
- }
- }
- }
- fn in_bind(specs: &[BindSpec], out: &mut FoundImports) {
- for spec in specs {
- match spec {
- BindSpec::Field {
- into: dest,
- value: expr,
- } => {
- in_destruct(dest, out);
- find_imports(expr, out);
- }
- BindSpec::Function {
- name: _,
- params,
- value: expr,
- } => {
- in_params(params, out);
- find_imports(expr, out);
- }
- }
- }
- }
- fn in_args(ArgsDesc { unnamed, named }: &ArgsDesc, out: &mut FoundImports) {
- for expr in unnamed {
- find_imports(expr, out);
- }
- for (_, expr) in named {
- find_imports(expr, out);
- }
- }
- fn in_obj(obj: &ObjBody, out: &mut FoundImports) {
- match obj {
- ObjBody::MemberList(obj) => {
- for FieldMember {
- name,
- params,
- value,
- ..
- } in &obj.fields
- {
- match name {
- FieldName::Fixed(_) => {}
- FieldName::Dyn(expr) => find_imports(expr, out),
- }
- if let Some(params) = params {
- in_params(params, out);
- }
- find_imports(value, out);
- }
- for _ in &*obj.locals {
- todo!()
- }
- for assert in &*obj.asserts {
- find_imports(&assert.0, out);
- if let Some(expr) = &assert.1 {
- find_imports(expr, out);
- }
- }
- }
- ObjBody::ObjComp(_) => todo!(),
- }
- }
- match &**expr {
- Expr::Import(_, v) => {
- if let Expr::Str(s) = &***v {
- out.0.push(Import {
- path: ResolvePathOwned::Str(s.to_string()),
- expression: todo!(),
- });
- }
- // Non-string import will fail in runtime
- }
-
- Expr::Literal(_) | Expr::Str(_) | Expr::Num(_) | Expr::Var(_) => {}
-
- Expr::Arr(arr) => {
- for expr in &**arr {
- find_imports(expr, out);
- }
- }
- Expr::ArrComp(expr, specs) => {
- find_imports(expr, out);
- in_compspec(specs, out);
- }
- Expr::Obj(obj) => in_obj(obj, out),
- Expr::ObjExtend(expr, obj) => {
- find_imports(expr, out);
- in_obj(obj, out);
- }
- Expr::BinaryOp(binop) => {
- find_imports(&binop.lhs, out);
- find_imports(&binop.rhs, out);
- }
- Expr::AssertExpr(assert) => {
- let AssertExpr {
- assert: AssertStmt(expr, expr2),
- rest,
- } = &**assert;
- find_imports(expr, out);
- if let Some(expr) = expr2 {
- find_imports(expr, out);
- }
- find_imports(rest, out);
- }
- Expr::LocalExpr(specs, expr) => {
- in_bind(specs, out);
- find_imports(expr, out);
- }
- Expr::Apply(expr, args, _) => {
- find_imports(expr, out);
- in_args(args, out);
- }
- Expr::Index { indexable, parts } => {
- find_imports(indexable, out);
- for part in parts {
- find_imports(&part.value, out);
- }
- }
- Expr::Function(params, expr) => {
- in_params(params, out);
- find_imports(expr, out);
- }
- Expr::IfElse(if_else) => {
- let IfElse {
- cond: IfSpecData(expr),
- cond_then,
- cond_else,
- } = &**if_else;
- find_imports(expr, out);
- find_imports(cond_then, out);
- if let Some(expr) = cond_else {
- find_imports(expr, out);
- }
- }
- Expr::Slice(slice) => {
- let Slice {
- value,
- slice: SliceDesc { start, end, step },
- } = &**slice;
- find_imports(value, out);
- if let Some(expr) = start {
- find_imports(expr, out);
- }
- if let Some(expr) = end {
- find_imports(expr, out);
- }
- if let Some(expr) = step {
- find_imports(expr, out);
- }
- }
- Expr::UnaryOp(_, expr) | Expr::ErrorStmt(expr) => {
- find_imports(expr, out);
- }
+impl Visitor for FoundImports {
+ fn visit_import(&mut self, expression: bool, value: IStr) {
+ self.0.push(Import {
+ path: ResolvePathOwned::Str(value.to_string()),
+ expression,
+ })
}
}
@@ -322,12 +122,10 @@
};
let source = Source::new(path.clone(), code.clone());
// If failed - then skip import
- file.parsed = crate::parse_jsonnet(&code, source)
- .map(Rc::new)
- .ok();
+ file.parsed = crate::parse_jsonnet(&code, source).map(Rc::new).ok();
if let Some(parsed) = &file.parsed {
let mut imports = FoundImports(vec![]);
- find_imports(parsed, &mut imports);
+ imports.visit_expr(parsed);
for import in imports.0 {
queue.push(Job::ResolveImport {
from: path.clone(),
crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth1use std::{2 fmt::{self, Debug, Display},3 ops::Deref,4 rc::Rc,5};67use jrsonnet_gcmodule::Acyclic;8use jrsonnet_interner::IStr;910use crate::{11 function::{FunctionSignature, ParamDefault, ParamName, ParamParse},12 source::Source,13};1415#[derive(Debug, PartialEq, Acyclic)]16pub enum FieldName {17 /// {fixed: 2}18 Fixed(IStr),19 /// {["dyn"+"amic"]: 3}20 Dyn(Expr),21}2223#[derive(Debug, Clone, Copy, PartialEq, Eq, Acyclic)]24#[repr(u8)]25pub enum Visibility {26 /// :27 Normal,28 /// ::29 Hidden,30 /// :::31 Unhide,32}3334impl Visibility {35 pub fn is_visible(&self) -> bool {36 matches!(self, Self::Normal | Self::Unhide)37 }38}3940#[derive(Debug, PartialEq, Acyclic)]41pub struct AssertStmt(pub Spanned<Expr>, pub Option<Spanned<Expr>>);4243#[derive(Debug, PartialEq, Acyclic)]44pub struct FieldMember {45 pub name: Spanned<FieldName>,46 pub plus: bool,47 pub params: Option<ExprParams>,48 pub visibility: Visibility,49 pub value: Rc<Expr>,50}5152#[derive(Debug, PartialEq, Acyclic)]53pub enum Member {54 Field(FieldMember),55 BindStmt(BindSpec),56 AssertStmt(AssertStmt),57}5859#[derive(Debug, Clone, Copy, PartialEq, Eq, Acyclic)]60pub enum UnaryOpType {61 Plus,62 Minus,63 BitNot,64 Not,65}6667impl Display for UnaryOpType {68 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {69 use UnaryOpType::*;70 write!(71 f,72 "{}",73 match self {74 Plus => "+",75 Minus => "-",76 BitNot => "~",77 Not => "!",78 }79 )80 }81}8283#[derive(Debug, Clone, Copy, PartialEq, Eq, Acyclic)]84pub enum BinaryOpType {85 Mul,86 Div,8788 /// Implemented as intrinsic, put here for completeness89 Mod,9091 Add,92 Sub,9394 Lhs,95 Rhs,9697 Lt,98 Gt,99 Lte,100 Gte,101102 BitAnd,103 BitOr,104 BitXor,105106 Eq,107 Neq,108109 And,110 Or,111 #[cfg(feature = "exp-null-coaelse")]112 NullCoaelse,113114 // Equialent to std.objectHasEx(a, b, true)115 In,116}117118impl Display for BinaryOpType {119 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {120 use BinaryOpType::*;121 write!(122 f,123 "{}",124 match self {125 Mul => "*",126 Div => "/",127 Mod => "%",128 Add => "+",129 Sub => "-",130 Lhs => "<<",131 Rhs => ">>",132 Lt => "<",133 Gt => ">",134 Lte => "<=",135 Gte => ">=",136 BitAnd => "&",137 BitOr => "|",138 BitXor => "^",139 Eq => "==",140 Neq => "!=",141 And => "&&",142 Or => "||",143 In => "in",144 #[cfg(feature = "exp-null-coaelse")]145 NullCoaelse => "??",146 }147 )148 }149}150151/// name, default value152#[derive(Debug, PartialEq, Acyclic)]153pub struct ExprParam {154 pub destruct: Destruct,155 pub default: Option<Rc<Expr>>,156}157158/// Defined function parameters159#[derive(Debug, Clone, PartialEq, Acyclic)]160pub struct ExprParams {161 pub exprs: Rc<Vec<ExprParam>>,162 pub signature: FunctionSignature,163 pub(crate) binds_len: usize,164}165impl ExprParams {166 pub fn len(&self) -> usize {167 self.exprs.len()168 }169 pub fn is_empty(&self) -> bool {170 self.exprs.is_empty()171 }172173 pub fn binds_len(&self) -> usize {174 self.binds_len175 }176 pub fn new(exprs: Vec<ExprParam>) -> Self {177 Self {178 signature: FunctionSignature::new(179 exprs180 .iter()181 .map(|p| {182 ParamParse::new(183 p.destruct.name(),184 ParamDefault::exists(p.default.is_some()),185 )186 })187 .collect(),188 ),189 binds_len: exprs.iter().map(|v| v.destruct.binds_len()).sum(),190 exprs: Rc::new(exprs),191 }192 }193}194195#[derive(Debug, PartialEq, Acyclic)]196pub struct ArgsDesc {197 pub unnamed: Vec<Rc<Expr>>,198 pub named: Vec<(IStr, Rc<Expr>)>,199}200impl ArgsDesc {201 pub fn new(unnamed: Vec<Rc<Expr>>, named: Vec<(IStr, Rc<Expr>)>) -> Self {202 Self { unnamed, named }203 }204}205206#[derive(Debug, Clone, PartialEq, Eq, Acyclic)]207pub enum DestructRest {208 /// ...rest209 Keep(IStr),210 /// ...211 Drop,212}213214#[derive(Debug, Clone, PartialEq, Acyclic)]215pub enum Destruct {216 Full(IStr),217 #[cfg(feature = "exp-destruct")]218 Skip,219 #[cfg(feature = "exp-destruct")]220 Array {221 start: Vec<Destruct>,222 rest: Option<DestructRest>,223 end: Vec<Destruct>,224 },225 #[cfg(feature = "exp-destruct")]226 Object {227 #[allow(clippy::type_complexity)]228 fields: Vec<(IStr, Option<Destruct>, Option<Rc<Spanned<Expr>>>)>,229 rest: Option<DestructRest>,230 },231}232impl Destruct {233 /// Name of destructure, used for function parameter names234 pub fn name(&self) -> ParamName {235 match self {236 Self::Full(name) => ParamName::Named(name.clone()),237 #[cfg(feature = "exp-destruct")]238 _ => ParamName::Unnamed,239 }240 }241 pub fn binds_len(&self) -> usize {242 #[cfg(feature = "exp-destruct")]243 fn cap_rest(rest: &Option<DestructRest>) -> usize {244 match rest {245 Some(DestructRest::Keep(_)) => 1,246 Some(DestructRest::Drop) => 0,247 None => 0,248 }249 }250 match self {251 Self::Full(_) => 1,252 #[cfg(feature = "exp-destruct")]253 Self::Skip => 0,254 #[cfg(feature = "exp-destruct")]255 Self::Array { start, rest, end } => {256 start.iter().map(Destruct::binds_len).sum::<usize>()257 + end.iter().map(Destruct::binds_len).sum::<usize>()258 + cap_rest(rest)259 }260 #[cfg(feature = "exp-destruct")]261 Self::Object { fields, rest } => {262 let mut out = 0;263 for (_, into, _) in fields {264 match into {265 Some(v) => out += v.binds_len(),266 // Field is destructured to default name267 None => out += 1,268 }269 }270 out + cap_rest(rest)271 }272 }273 }274}275276#[derive(Debug, PartialEq, Acyclic)]277pub enum BindSpec {278 Field {279 into: Destruct,280 value: Rc<Expr>,281 },282 Function {283 name: IStr,284 params: ExprParams,285 value: Rc<Expr>,286 },287}288impl BindSpec {289 pub fn binds_len(&self) -> usize {290 match self {291 BindSpec::Field { into, .. } => into.binds_len(),292 BindSpec::Function { .. } => 1,293 }294 }295}296297#[derive(Debug, PartialEq, Acyclic)]298pub struct IfSpecData {299 pub span: Span,300 pub cond: Expr,301}302303#[derive(Debug, PartialEq, Acyclic)]304pub struct ForSpecData {305 pub destruct: Destruct,306 pub over: Expr,307}308309#[derive(Debug, PartialEq, Acyclic)]310pub enum CompSpec {311 IfSpec(IfSpecData),312 ForSpec(ForSpecData),313}314315#[derive(Debug, PartialEq, Acyclic)]316pub struct ObjComp {317 pub locals: Rc<Vec<BindSpec>>,318 pub field: Rc<FieldMember>,319 pub compspecs: Vec<CompSpec>,320}321322#[derive(Debug, PartialEq, Acyclic)]323pub struct ObjMembers {324 pub locals: Rc<Vec<BindSpec>>,325 pub asserts: Rc<Vec<AssertStmt>>,326 pub fields: Vec<FieldMember>,327}328329#[derive(Debug, PartialEq, Acyclic)]330pub enum ObjBody {331 MemberList(ObjMembers),332 ObjComp(ObjComp),333}334335#[derive(Debug, PartialEq, Eq, Clone, Copy, Acyclic)]336pub enum LiteralType {337 This,338 Super,339 Dollar,340 Null,341 True,342 False,343}344345#[derive(Debug, PartialEq, Acyclic)]346pub struct SliceDesc {347 pub start: Option<Spanned<Expr>>,348 pub end: Option<Spanned<Expr>>,349 pub step: Option<Spanned<Expr>>,350}351352#[derive(Debug, PartialEq, Acyclic)]353pub struct AssertExpr {354 pub assert: AssertStmt,355 pub rest: Expr,356}357358#[derive(Debug, PartialEq, Acyclic)]359pub struct BinaryOp {360 pub lhs: Expr,361 pub op: BinaryOpType,362 pub rhs: Expr,363}364365#[derive(Debug, PartialEq, Acyclic)]366pub enum ImportKind {367 Normal,368 Str,369 Bin,370}371372#[derive(Debug, PartialEq, Acyclic)]373pub struct IfElse {374 pub cond: IfSpecData,375 pub cond_then: Expr,376 pub cond_else: Option<Expr>,377}378379#[derive(Debug, PartialEq, Acyclic)]380pub struct Slice {381 pub value: Expr,382 pub slice: SliceDesc,383}384385/// Syntax base386#[derive(Debug, PartialEq, Acyclic)]387pub enum Expr {388 Literal(LiteralType),389390 /// String value: "hello"391 Str(IStr),392 /// Number: 1, 2.0, 2e+20393 Num(f64),394 /// Variable name: test395 Var(Spanned<IStr>),396397 /// Array of expressions: [1, 2, "Hello"]398 Arr(Rc<Vec<Expr>>),399 /// Array comprehension:400 /// ```jsonnet401 /// ingredients: [402 /// { kind: kind, qty: 4 / 3 }403 /// for kind in [404 /// 'Honey Syrup',405 /// 'Lemon Juice',406 /// 'Farmers Gin',407 /// ]408 /// ],409 /// ```410 ArrComp(Rc<Expr>, Vec<CompSpec>),411412 /// Object: {a: 2}413 Obj(ObjBody),414 /// Object extension: var1 {b: 2}415 ObjExtend(Rc<Expr>, ObjBody),416417 /// -2418 UnaryOp(UnaryOpType, Box<Expr>),419 /// 2 - 2420 BinaryOp(Box<BinaryOp>),421 /// assert 2 == 2 : "Math is broken"422 AssertExpr(Rc<AssertExpr>),423 /// local a = 2; { b: a }424 LocalExpr(Vec<BindSpec>, Box<Expr>),425426 /// import* "hello"427 Import(Spanned<ImportKind>, Box<Expr>),428 /// error "I'm broken"429 ErrorStmt(Span, Box<Expr>),430 /// a(b, c)431 Apply(Box<Expr>, Spanned<ArgsDesc>, bool),432 /// a[b], a.b, a?.b433 Index {434 indexable: Box<Expr>,435 parts: Vec<IndexPart>,436 },437 /// function(x) x438 Function(ExprParams, Rc<Expr>),439 /// if true == false then 1 else 2440 IfElse(Box<IfElse>),441 Slice(Box<Slice>),442}443444#[derive(Debug, PartialEq, Acyclic)]445pub struct IndexPart {446 pub span: Span,447 pub value: Expr,448 #[cfg(feature = "exp-null-coaelse")]449 pub null_coaelse: bool,450}451452/// file, begin offset, end offset453#[derive(Clone, PartialEq, Eq, Acyclic)]454#[repr(C)]455pub struct Span(pub Source, pub u32, pub u32);456impl Span {457 pub fn belongs_to(&self, other: &Span) -> bool {458 other.0 == self.0 && other.1 <= self.1 && other.2 >= self.2459 }460}461462static_assertions::assert_eq_size!(Span, (usize, usize));463464impl Debug for Span {465 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {466 write!(f, "{:?}:{:?}-{:?}", self.0, self.1, self.2)467 }468}469470#[derive(Clone, PartialEq, Acyclic)]471pub struct Spanned<T: Acyclic> {472 pub value: T,473 pub span: Span,474}475impl<T: Acyclic> Deref for Spanned<T> {476 type Target = T;477 fn deref(&self) -> &Self::Target {478 &self.value479 }480}481impl<T: Acyclic> Spanned<T> {482 #[inline]483 pub fn new(value: T, span: Span) -> Self {484 Self { value, span }485 }486}487488impl<T: Debug + Acyclic> Debug for Spanned<T> {489 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {490 let expr = &**self;491 if f.alternate() {492 write!(f, "{:#?}", expr)?;493 } else {494 write!(f, "{:?}", expr)?;495 }496 write!(f, " from {:?}", self.span)?;497 Ok(())498 }499}crates/jrsonnet-ir/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/lib.rs
+++ b/crates/jrsonnet-ir/src/lib.rs
@@ -7,6 +7,7 @@
mod location;
mod source;
pub mod unescape;
+pub mod visit;
pub use location::CodeLocation;
pub use source::{
crates/jrsonnet-ir/src/visit.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir/src/visit.rs
@@ -0,0 +1,271 @@
+use jrsonnet_interner::IStr;
+
+use crate::{
+ ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, Expr, ExprParam,
+ ExprParams, FieldMember, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, IndexPart,
+ ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,
+};
+
+pub trait Visitor: Sized {
+ fn visit_expr(&mut self, e: &Expr) {
+ visit_expr(self, e)
+ }
+ fn visit_import(&mut self, _as_expression: bool, _value: IStr) {}
+}
+
+#[cfg(feature = "exp-destruct")]
+pub fn visit_destruct_rest<V: Visitor>(_v: &mut V, destruct: &crate::DestructRest) {
+ match destruct {
+ crate::DestructRest::Keep(_name) => {}
+ crate::DestructRest::Drop => {}
+ }
+}
+
+pub fn visit_destruct<V: Visitor>(v: &mut V, destruct: &Destruct) {
+ match destruct {
+ Destruct::Full(_istr) => {}
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Skip => {}
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Array { start, rest, end } => {
+ for s in start {
+ visit_destruct(v, s);
+ }
+ if let Some(rest) = rest {
+ visit_destruct_rest(v, rest);
+ }
+ for s in end {
+ visit_destruct(v, s);
+ }
+ }
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Object { fields, rest } => {
+ for (_name, into, default) in fields {
+ if let Some(into) = into {
+ visit_destruct(v, into);
+ }
+ if let Some(default) = default {
+ v.visit_expr(default);
+ }
+ if let Some(rest) = rest {
+ visit_destruct_rest(v, rest);
+ }
+ }
+ }
+ }
+}
+
+pub fn visit_if_spec<V: Visitor>(v: &mut V, cond: &IfSpecData) {
+ let IfSpecData { span: _, cond } = cond;
+ v.visit_expr(cond);
+}
+
+pub fn visit_comp_spec<V: Visitor>(v: &mut V, c: &CompSpec) {
+ match c {
+ CompSpec::IfSpec(cond) => visit_if_spec(v, cond),
+ CompSpec::ForSpec(for_spec_data) => {
+ let ForSpecData { destruct, over } = for_spec_data;
+ visit_destruct(v, destruct);
+ v.visit_expr(over);
+ }
+ }
+}
+pub fn visit_params<V: Visitor>(v: &mut V, par: &ExprParams) {
+ let ExprParams {
+ exprs,
+ signature: _,
+ binds_len: _,
+ } = par;
+ for par in &**exprs {
+ let ExprParam { destruct, default } = ∥
+ visit_destruct(v, destruct);
+ if let Some(default) = default {
+ v.visit_expr(default);
+ }
+ }
+}
+
+pub fn visit_bind_spec<V: Visitor>(v: &mut V, bind: &BindSpec) {
+ match bind {
+ BindSpec::Field { into, value } => {
+ visit_destruct(v, into);
+ v.visit_expr(value);
+ }
+ BindSpec::Function {
+ name: _,
+ params,
+ value,
+ } => {
+ visit_params(v, params);
+ v.visit_expr(value);
+ }
+ }
+}
+
+pub fn visit_field_member<V: Visitor>(v: &mut V, mem: &FieldMember) {
+ let FieldMember {
+ name,
+ plus: _,
+ params,
+ visibility: _,
+ value,
+ } = mem;
+ match &**name {
+ FieldName::Fixed(_istr) => {}
+ FieldName::Dyn(expr) => v.visit_expr(expr),
+ }
+ if let Some(params) = params {
+ visit_params(v, params);
+ }
+ v.visit_expr(value);
+}
+
+pub fn visit_obj_body<V: Visitor>(v: &mut V, obj_body: &ObjBody) {
+ match obj_body {
+ ObjBody::MemberList(obj_members) => {
+ let ObjMembers {
+ locals,
+ asserts,
+ fields,
+ } = obj_members;
+ for local in &**locals {
+ visit_bind_spec(v, local);
+ }
+ for assert in &**asserts {
+ visit_assert_stmt(v, assert);
+ }
+ for field in fields {
+ visit_field_member(v, field);
+ }
+ }
+ ObjBody::ObjComp(obj_comp) => {
+ let ObjComp {
+ locals,
+ field,
+ compspecs,
+ } = obj_comp;
+ for local in &**locals {
+ visit_bind_spec(v, local);
+ }
+ visit_field_member(v, field);
+ for compspec in compspecs {
+ visit_comp_spec(v, compspec);
+ }
+ }
+ }
+}
+
+pub fn visit_assert_stmt<V: Visitor>(v: &mut V, ass: &AssertStmt) {
+ let AssertStmt(cond, msg) = ass;
+ v.visit_expr(cond);
+ if let Some(msg) = msg {
+ v.visit_expr(msg);
+ }
+}
+pub fn visit_expr<V: Visitor>(v: &mut V, e: &Expr) {
+ match e {
+ Expr::Literal(_literal_type) => {}
+ Expr::Str(_istr) => {}
+ Expr::Num(_num) => {}
+ Expr::Var(_spanned) => {}
+ Expr::Arr(exprs) => {
+ for e in &**exprs {
+ v.visit_expr(e);
+ }
+ }
+ Expr::ArrComp(expr, comp_specs) => {
+ v.visit_expr(expr);
+ for ele in comp_specs {
+ visit_comp_spec(v, ele);
+ }
+ }
+ Expr::Obj(obj_body) => visit_obj_body(v, obj_body),
+ Expr::ObjExtend(expr, obj_body) => {
+ v.visit_expr(expr);
+ visit_obj_body(v, obj_body);
+ }
+ Expr::UnaryOp(_unary_op_type, expr) => {
+ v.visit_expr(expr);
+ }
+ Expr::BinaryOp(binary_op) => {
+ let BinaryOp { lhs, op: _, rhs } = &**binary_op;
+ v.visit_expr(lhs);
+ v.visit_expr(rhs);
+ }
+ Expr::AssertExpr(assert_expr) => {
+ let AssertExpr { assert, rest } = &**assert_expr;
+ visit_assert_stmt(v, assert);
+ v.visit_expr(rest);
+ }
+ Expr::LocalExpr(bind_specs, expr) => {
+ for local in bind_specs {
+ visit_bind_spec(v, local);
+ }
+ v.visit_expr(expr);
+ }
+ Expr::Import(kind, expr) => {
+ v.visit_expr(expr);
+
+ if let Expr::Str(expr) = &**expr {
+ v.visit_import(matches!(**kind, ImportKind::Normal), expr.clone());
+ }
+ }
+ Expr::ErrorStmt(_span, expr) => {
+ v.visit_expr(expr);
+ }
+ Expr::Apply(expr, spanned, _) => {
+ v.visit_expr(expr);
+ let ArgsDesc { unnamed, named } = &**spanned;
+ for unnamed in unnamed {
+ v.visit_expr(unnamed);
+ }
+ for (_name, named) in named {
+ v.visit_expr(named);
+ }
+ }
+ Expr::Index { indexable, parts } => {
+ v.visit_expr(indexable);
+
+ for part in parts {
+ let IndexPart {
+ span: _,
+ value,
+ #[cfg(feature = "exp-null-coaelse")]
+ null_coaelse: _,
+ } = part;
+ v.visit_expr(value);
+ }
+ }
+ Expr::Function(expr_params, expr) => {
+ visit_params(v, expr_params);
+ v.visit_expr(expr);
+ }
+ Expr::IfElse(if_else) => {
+ let IfElse {
+ cond,
+ cond_then,
+ cond_else,
+ } = &**if_else;
+ visit_if_spec(v, cond);
+ v.visit_expr(cond_then);
+ if let Some(cond_else) = cond_else {
+ v.visit_expr(cond_else);
+ }
+ }
+ Expr::Slice(slice) => {
+ let Slice { value, slice } = &**slice;
+ v.visit_expr(value);
+ let SliceDesc { start, end, step } = slice;
+
+ if let Some(start) = start {
+ v.visit_expr(start);
+ }
+ if let Some(end) = end {
+ v.visit_expr(end);
+ }
+ if let Some(step) = step {
+ v.visit_expr(step);
+ }
+ }
+ }
+}