Revision 46104 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/DefaultExpressionBuilder.java

View differences:

DefaultExpressionBuilder.java
451 451 
          if( this.parameters!=null ) {
452 452 
            for (int i = 0; i < parameters.size(); i++) {
453 453 
                Value argument = parameters.get(i);
454 
                if( argument == target ) {
455 
                    parameters.set(i, replacement);
456 
                } else {
457 
                    argument.replace(target, replacement);
454 
                if (argument != null) {
455 
                    if( argument == target ) {
456 
                        parameters.set(i, replacement);
457 
                    } else {
458 
                        argument.replace(target, replacement);
459 
                    }
458 460 
                }
459 461 
            }
460 462 
          }
......
1535 1537 
  public Function date_add(Value datefield, Value valueToAdd, Value date) {
1536 1538 
    return function(FUNCTION_DATEADD, datefield, valueToAdd, date);
1537 1539 
  }
1540
1541 
  @Override
1542 
  public Function let(String name, Value value) {
1543 
    return function(FUNCTION_LET, this.variable(name), value);
1544 
  }
1538 1545 

  		




  1539
  1546
  
    
  @Override


  		




  1540
  1547
  
    
  public Function date_diff(Value datefield, Value valueToSubst, Value date) {


  		












Also available in:  Unified diff