@@ -3,27 +3,27 @@ import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/facade/coll
33import { Locals } from "./locals" ;
44
55export class AST {
6- eval ( context , locals : Locals ) { throw new BaseException ( "Not supported" ) ; }
6+ eval ( context : any , locals : Locals ) : any { throw new BaseException ( "Not supported" ) ; }
77
88 get isAssignable ( ) : boolean { return false ; }
99
10- assign ( context , locals : Locals , value ) { throw new BaseException ( "Not supported" ) ; }
10+ assign ( context : any , locals : Locals , value : any ) { throw new BaseException ( "Not supported" ) ; }
1111
1212 visit ( visitor : AstVisitor ) : any { return null ; }
1313
1414 toString ( ) : string { return "AST" ; }
1515}
1616
1717export class EmptyExpr extends AST {
18- eval ( context , locals : Locals ) : any { return null ; }
18+ eval ( context : any , locals : Locals ) : any { return null ; }
1919
2020 visit ( visitor : AstVisitor ) {
2121 // do nothing
2222 }
2323}
2424
2525export class ImplicitReceiver extends AST {
26- eval ( context , locals : Locals ) : any { return context ; }
26+ eval ( context : any , locals : Locals ) : any { return context ; }
2727
2828 visit ( visitor : AstVisitor ) : any { return visitor . visitImplicitReceiver ( this ) ; }
2929}
@@ -34,7 +34,7 @@ export class ImplicitReceiver extends AST {
3434export class Chain extends AST {
3535 constructor ( public expressions : List < any > ) { super ( ) ; }
3636
37- eval ( context , locals : Locals ) : any {
37+ eval ( context : any , locals : Locals ) : any {
3838 var result ;
3939 for ( var i = 0 ; i < this . expressions . length ; i ++ ) {
4040 var last = this . expressions [ i ] . eval ( context , locals ) ;
@@ -49,7 +49,7 @@ export class Chain extends AST {
4949export class Conditional extends AST {
5050 constructor ( public condition : AST , public trueExp : AST , public falseExp : AST ) { super ( ) ; }
5151
52- eval ( context , locals : Locals ) : any {
52+ eval ( context : any , locals : Locals ) : any {
5353 if ( this . condition . eval ( context , locals ) ) {
5454 return this . trueExp . eval ( context , locals ) ;
5555 } else {
@@ -63,7 +63,7 @@ export class Conditional extends AST {
6363export class If extends AST {
6464 constructor ( public condition : AST , public trueExp : AST , public falseExp ?: AST ) { super ( ) ; }
6565
66- eval ( context , locals ) {
66+ eval ( context : any , locals : Locals ) {
6767 if ( this . condition . eval ( context , locals ) ) {
6868 this . trueExp . eval ( context , locals ) ;
6969 } else if ( isPresent ( this . falseExp ) ) {
@@ -80,7 +80,7 @@ export class AccessMember extends AST {
8080 super ( ) ;
8181 }
8282
83- eval ( context , locals : Locals ) : any {
83+ eval ( context : any , locals : Locals ) : any {
8484 if ( this . receiver instanceof ImplicitReceiver && isPresent ( locals ) &&
8585 locals . contains ( this . name ) ) {
8686 return locals . get ( this . name ) ;
@@ -92,7 +92,7 @@ export class AccessMember extends AST {
9292
9393 get isAssignable ( ) : boolean { return true ; }
9494
95- assign ( context , locals : Locals , value ) : any {
95+ assign ( context : any , locals : Locals , value : any ) : any {
9696 var evaluatedContext = this . receiver . eval ( context , locals ) ;
9797
9898 if ( this . receiver instanceof ImplicitReceiver && isPresent ( locals ) &&
@@ -112,7 +112,7 @@ export class SafeAccessMember extends AST {
112112 super ( ) ;
113113 }
114114
115- eval ( context , locals : Locals ) : any {
115+ eval ( context : any , locals : Locals ) : any {
116116 var evaluatedReceiver = this . receiver . eval ( context , locals ) ;
117117 return isBlank ( evaluatedReceiver ) ? null : this . getter ( evaluatedReceiver ) ;
118118 }
@@ -123,15 +123,15 @@ export class SafeAccessMember extends AST {
123123export class KeyedAccess extends AST {
124124 constructor ( public obj : AST , public key : AST ) { super ( ) ; }
125125
126- eval ( context , locals : Locals ) : any {
126+ eval ( context : any , locals : Locals ) : any {
127127 var obj : any = this . obj . eval ( context , locals ) ;
128128 var key : any = this . key . eval ( context , locals ) ;
129129 return obj [ key ] ;
130130 }
131131
132132 get isAssignable ( ) : boolean { return true ; }
133133
134- assign ( context , locals : Locals , value ) : any {
134+ assign ( context : any , locals : Locals , value : any ) : any {
135135 var obj : any = this . obj . eval ( context , locals ) ;
136136 var key : any = this . key . eval ( context , locals ) ;
137137 obj [ key ] = value ;
@@ -150,15 +150,15 @@ export class BindingPipe extends AST {
150150export class LiteralPrimitive extends AST {
151151 constructor ( public value ) { super ( ) ; }
152152
153- eval ( context , locals : Locals ) : any { return this . value ; }
153+ eval ( context : any , locals : Locals ) : any { return this . value ; }
154154
155155 visit ( visitor : AstVisitor ) : any { return visitor . visitLiteralPrimitive ( this ) ; }
156156}
157157
158158export class LiteralArray extends AST {
159159 constructor ( public expressions : List < any > ) { super ( ) ; }
160160
161- eval ( context , locals : Locals ) : any {
161+ eval ( context : any , locals : Locals ) : any {
162162 return ListWrapper . map ( this . expressions , ( e ) => e . eval ( context , locals ) ) ;
163163 }
164164
@@ -168,7 +168,7 @@ export class LiteralArray extends AST {
168168export class LiteralMap extends AST {
169169 constructor ( public keys : List < any > , public values : List < any > ) { super ( ) ; }
170170
171- eval ( context , locals : Locals ) : any {
171+ eval ( context : any , locals : Locals ) : any {
172172 var res = StringMapWrapper . create ( ) ;
173173 for ( var i = 0 ; i < this . keys . length ; ++ i ) {
174174 StringMapWrapper . set ( res , this . keys [ i ] , this . values [ i ] . eval ( context , locals ) ) ;
@@ -182,7 +182,7 @@ export class LiteralMap extends AST {
182182export class Interpolation extends AST {
183183 constructor ( public strings : List < any > , public expressions : List < any > ) { super ( ) ; }
184184
185- eval ( context , locals ) : any {
185+ eval ( context : any , locals : Locals ) : any {
186186 throw new BaseException ( "evaluating an Interpolation is not supported" ) ;
187187 }
188188
@@ -192,7 +192,7 @@ export class Interpolation extends AST {
192192export class Binary extends AST {
193193 constructor ( public operation : string , public left : AST , public right : AST ) { super ( ) ; }
194194
195- eval ( context , locals : Locals ) : any {
195+ eval ( context : any , locals : Locals ) : any {
196196 var left : any = this . left . eval ( context , locals ) ;
197197 switch ( this . operation ) {
198198 case '&&' :
@@ -243,15 +243,15 @@ export class Binary extends AST {
243243export class PrefixNot extends AST {
244244 constructor ( public expression : AST ) { super ( ) ; }
245245
246- eval ( context , locals : Locals ) : any { return ! this . expression . eval ( context , locals ) ; }
246+ eval ( context : any , locals : Locals ) : any { return ! this . expression . eval ( context , locals ) ; }
247247
248248 visit ( visitor : AstVisitor ) : any { return visitor . visitPrefixNot ( this ) ; }
249249}
250250
251251export class Assignment extends AST {
252- constructor ( public target : AST , public value : AST ) { super ( ) ; }
252+ constructor ( public target : AST , public value : any ) { super ( ) ; }
253253
254- eval ( context , locals : Locals ) : any {
254+ eval ( context : any , locals : Locals ) : any {
255255 return this . target . assign ( context , locals , this . value . eval ( context , locals ) ) ;
256256 }
257257
@@ -264,7 +264,7 @@ export class MethodCall extends AST {
264264 super ( ) ;
265265 }
266266
267- eval ( context , locals : Locals ) : any {
267+ eval ( context : any , locals : Locals ) : any {
268268 var evaluatedArgs = evalList ( context , locals , this . args ) ;
269269 if ( this . receiver instanceof ImplicitReceiver && isPresent ( locals ) &&
270270 locals . contains ( this . name ) ) {
@@ -285,7 +285,7 @@ export class SafeMethodCall extends AST {
285285 super ( ) ;
286286 }
287287
288- eval ( context , locals : Locals ) : any {
288+ eval ( context : any , locals : Locals ) : any {
289289 var evaluatedReceiver = this . receiver . eval ( context , locals ) ;
290290 if ( isBlank ( evaluatedReceiver ) ) return null ;
291291 var evaluatedArgs = evalList ( context , locals , this . args ) ;
@@ -298,7 +298,7 @@ export class SafeMethodCall extends AST {
298298export class FunctionCall extends AST {
299299 constructor ( public target : AST , public args : List < any > ) { super ( ) ; }
300300
301- eval ( context , locals : Locals ) : any {
301+ eval ( context : any , locals : Locals ) : any {
302302 var obj : any = this . target . eval ( context , locals ) ;
303303 if ( ! ( obj instanceof Function ) ) {
304304 throw new BaseException ( `${ obj } is not a function` ) ;
@@ -312,11 +312,13 @@ export class FunctionCall extends AST {
312312export class ASTWithSource extends AST {
313313 constructor ( public ast : AST , public source : string , public location : string ) { super ( ) ; }
314314
315- eval ( context , locals : Locals ) : any { return this . ast . eval ( context , locals ) ; }
315+ eval ( context : any , locals : Locals ) : any { return this . ast . eval ( context , locals ) ; }
316316
317317 get isAssignable ( ) : boolean { return this . ast . isAssignable ; }
318318
319- assign ( context , locals : Locals , value ) : any { return this . ast . assign ( context , locals , value ) ; }
319+ assign ( context : any , locals : Locals , value : any ) : any {
320+ return this . ast . assign ( context , locals , value ) ;
321+ }
320322
321323 visit ( visitor : AstVisitor ) : any { return this . ast . visit ( visitor ) ; }
322324
0 commit comments