Revision 44752 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultStatement.java

View differences:

DefaultStatement.java
8 8 
import org.apache.commons.lang3.tuple.ImmutablePair;
9 9 
import org.apache.commons.lang3.tuple.Pair;
10 10 
import org.gvsig.expressionevaluator.Code;
11 
import org.gvsig.expressionevaluator.Code.Caller;
12 11 
import org.gvsig.expressionevaluator.CodeBuilder;
13 12 
import org.gvsig.expressionevaluator.Codes;
14 13 
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_LIST;
......
21 20 
import org.gvsig.expressionevaluator.Statement.StatementContext;
22 21 
import org.gvsig.expressionevaluator.impl.function.programming.CodeBlockFunction;
23 22 
import org.gvsig.expressionevaluator.impl.DefaultCodeBuilder.BaseCodes;
23 
import org.gvsig.expressionevaluator.Code.Callable;
24 24 

  		




  25
  25
  
    
/**


  		




  26
  26
  
    
 *


  		




  ......




  834
  834
  
    
            


  		




  835
  835
  
    
            Codes base_args = super.build(context);


  		




  836
  836
  
    
            for (Code arg : base_args) {


  		




  837
  
  
    
                if( arg.code() == Code.CALLER && 


  		




  838
  
  
    
                    ((Caller)arg).name().equals(CodeBlockFunction.NAME) ) {


  		




  839
  
  
    
                    Codes block_args = ((Caller)arg).parameters();


  		




  
  837
  
    
                if( arg.code() == Code.CALLABLE && 


  		




  
  838
  
    
                    ((Callable)arg).name().equals(CodeBlockFunction.NAME) ) {


  		




  
  839
  
    
                    Codes block_args = ((Callable)arg).parameters();


  		




  840
  840
  
    
                    for (Code block_arg : block_args) {


  		




  841
  841
  
    
                        args.add(block_arg);


  		




  842
  842
  
    
                    }


  		




  ......




  881
  881
  
    
                    if( args.size()==1 && 


  		




  882
  882
  
    
                        StringUtils.equalsIgnoreCase(CodeBlockFunction.NAME,this.getCodeID()) ) {


  		




  883
  883
  
    
                        Code code0 = args.get(0);


  		




  884
  
  
    
                        if( code0.code() == Code.CALLER && 


  		




  885
  
  
    
                                StringUtils.equalsIgnoreCase(CodeBlockFunction.NAME,((Caller)code0).name())


  		




  
  884
  
    
                        if( code0.code() == Code.CALLABLE && 


  		




  
  885
  
    
                                StringUtils.equalsIgnoreCase(CodeBlockFunction.NAME,((Callable)code0).name())


  		




  886
  886
  
    
                                ) {


  		




  887
  887
  
    
                            code = code0;


  		




  888
  888
  
    
                        }


  		












Also available in:  Unified diff