Revision 46505 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/DefaultCodeBuilder.java
| DefaultCodeBuilder.java | ||
|---|---|---|
| 520 | 520 |
break; |
| 521 | 521 |
case FUNCTION: |
| 522 | 522 |
default: |
| 523 |
ExpressionBuilder.Function f = builder.function(this.name()); |
|
| 524 |
if( this.parameters()!=null ) {
|
|
| 525 |
for (Code parameter : this.parameters()) {
|
|
| 526 |
if (parameter==null) {
|
|
| 527 |
f.parameter(null); |
|
| 528 |
} else {
|
|
| 529 |
f.parameter(parameter.toValue(builder)); |
|
| 530 |
} |
|
| 531 |
} |
|
| 523 |
if(this.function == null){
|
|
| 524 |
ExpressionBuilder.Function f = builder.function(this.name()); |
|
| 525 |
if( this.parameters()!=null ) {
|
|
| 526 |
for (Code parameter : this.parameters()) {
|
|
| 527 |
if (parameter==null) {
|
|
| 528 |
f.parameter(null); |
|
| 529 |
} else {
|
|
| 530 |
f.parameter(parameter.toValue(builder)); |
|
| 531 |
} |
|
| 532 |
} |
|
| 533 |
} |
|
| 534 |
value = f; |
|
| 535 |
} else {
|
|
| 536 |
value = this.function.toValue(builder, this.parameters()); |
|
| 532 | 537 |
} |
| 533 |
value = f; |
|
| 534 | 538 |
break; |
| 535 | 539 |
|
| 536 | 540 |
} |
Also available in: Unified diff