@@ -11,9 +11,7 @@ import haxe.macro.Expr;
1111class ExprUtils {
1212
1313 public static function walkFile (file : {pack : Array <String >, decls : Array <TypeDecl > }, cb : Expr -> Void ) {
14- for (decl in file .decls ){
15- walkTypeDecl (decl , cb );
16- }
14+ for (decl in file .decls ) walkTypeDecl (decl , cb );
1715 }
1816
1917 public static function walkTypeDecl (td : TypeDecl , cb : Expr -> Void ) {
@@ -48,21 +46,15 @@ class ExprUtils {
4846 case HExtends (t ) | HImplements (t ): walkTypePath (t ,cb );
4947 default :
5048 }
51- for (f in d .data ) {
52- walkField (f ,cb );
53- }
49+ for (f in d .data ) walkField (f ,cb );
5450 }
5551
5652 public static function walkEnum (d : Definition <EnumFlag , Array <EnumConstructor >>, cb : Expr -> Void ) {
5753 walkCommonDefinition (d , cb );
5854 for (ec in d .data ) {
5955 walkMeta (ec .meta , cb );
60- for (arg in ec .args ) {
61- walkComplexType (arg .type , cb );
62- }
63- for (param in ec .params ) {
64- walkTypeParamDecl (param , cb );
65- }
56+ for (arg in ec .args ) walkComplexType (arg .type , cb );
57+ for (param in ec .params ) walkTypeParamDecl (param , cb );
6658 if (ec .type != null ) walkComplexType (ec .type , cb );
6759 }
6860 }
@@ -73,9 +65,7 @@ class ExprUtils {
7365 case AFromType (ct ) | AToType (ct ) | AIsType (ct ): walkComplexType (ct ,cb );
7466 default :
7567 }
76- for (f in d .data ) {
77- walkField (f ,cb );
78- }
68+ for (f in d .data ) walkField (f ,cb );
7969 }
8070
8171 public static function walkImport (sl , mode , cb : Expr -> Void ) {
@@ -104,12 +94,8 @@ class ExprUtils {
10494 }
10595
10696 public static function walkTypeParamDecl (tp : TypeParamDecl , cb : Expr -> Void ) {
107- if (tp .constraints != null ) {
108- for (c in tp .constraints ) walkComplexType (c , cb );
109- }
110- if (tp .params != null ) {
111- for (t in tp .params ) walkTypeParamDecl (t , cb );
112- }
97+ if (tp .constraints != null ) for (c in tp .constraints ) walkComplexType (c , cb );
98+ if (tp .params != null ) for (t in tp .params ) walkTypeParamDecl (t , cb );
11399 }
114100
115101 public static function walkFunction (f : Function , cb : Expr -> Void ) {
@@ -119,17 +105,11 @@ class ExprUtils {
119105 }
120106 if (f .ret != null ) walkComplexType (f .ret , cb );
121107 if (f .expr != null ) walkExpr (f .expr , cb );
122- if (f .params != null ) {
123- for (tp in f .params ) {
124- walkTypeParamDecl (tp , cb );
125- }
126- }
108+ if (f .params != null ) for (tp in f .params ) walkTypeParamDecl (tp , cb );
127109 }
128110
129111 public static function walkCase (c : Case , cb : Expr -> Void ) {
130- for (v in c .values ) {
131- walkExpr (v , cb );
132- }
112+ for (v in c .values ) walkExpr (v , cb );
133113 if (c .guard != null ) walkExpr (c .guard , cb );
134114 if (c .expr != null ) walkExpr (c .expr , cb );
135115 }
@@ -180,33 +160,21 @@ class ExprUtils {
180160 case EField (e , field ): walkExpr (e , cb );
181161 case EParenthesis (e ): walkExpr (e , cb );
182162 case EObjectDecl (fields ):
183- for (f in fields ) {
184- walkExpr (f .expr , cb );
185- }
163+ for (f in fields ) walkExpr (f .expr , cb );
186164 case EArrayDecl (values ):
187- for (v in values ) {
188- walkExpr (v , cb );
189- }
165+ for (v in values ) walkExpr (v , cb );
190166 case ECall (e , params ):
191167 walkExpr (e , cb );
192- for (p in params ) {
193- walkExpr (p , cb );
194- }
168+ for (p in params ) walkExpr (p , cb );
195169 case ENew (t , params ):
196170 walkTypePath (t , cb );
197- for (p in params ) {
198- walkExpr (p , cb );
199- }
171+ for (p in params ) walkExpr (p , cb );
200172 case EUnop (op , postFix , e ): walkExpr (e , cb );
201173 case EVars (vars ):
202- for (v in vars ) {
203- walkVar (v , cb );
204- }
174+ for (v in vars ) walkVar (v , cb );
205175 case EFunction (name , f ): walkFunction (f , cb );
206176 case EBlock (exprs ):
207- for (e in exprs ) {
208- walkExpr (e , cb );
209- }
177+ for (e in exprs ) walkExpr (e , cb );
210178 case EFor (it , expr ): walkExpr (it , cb ); walkExpr (expr , cb );
211179 case EIn (e1 , e2 ): walkExpr (e1 , cb ); walkExpr (e2 , cb );
212180 case EIf (econd , eif , eelse ):
@@ -217,9 +185,7 @@ class ExprUtils {
217185 case ESwitch (e , cases , edef ):
218186 walkExpr (e , cb );
219187 for (c in cases ) walkCase (c , cb );
220- if (edef != null && edef .expr != null ){
221- walkExpr (edef , cb );
222- }
188+ if (edef != null && edef .expr != null ) walkExpr (edef , cb );
223189 case ETry (e , catches ):
224190 walkExpr (e , cb );
225191 for (c in catches ) walkCatch (c , cb );
@@ -242,11 +208,8 @@ class ExprUtils {
242208 walkExpr (e , cb );
243209 walkComplexType (t , cb );
244210 case EMeta (s , e ):
245- if (s .params != null ) {
246- for (mp in s .params ) walkExpr (mp , cb );
247- }
211+ if (s .params != null ) for (mp in s .params ) walkExpr (mp , cb );
248212 walkExpr (e , cb );
249213 }
250214 }
251-
252215}
0 commit comments