Revision 44769 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
DefaultStatement.java | ||
---|---|---|
21 | 21 |
import org.gvsig.expressionevaluator.impl.function.programming.CodeBlockFunction; |
22 | 22 |
import org.gvsig.expressionevaluator.impl.DefaultCodeBuilder.BaseCodes; |
23 | 23 |
import org.gvsig.expressionevaluator.Code.Callable; |
24 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
25 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_TUPLE; |
|
24 | 26 |
|
25 | 27 |
/** |
26 | 28 |
* |
... | ... | |
666 | 668 |
if( context.isReservedWord(identifier) ) { |
667 | 669 |
break; |
668 | 670 |
} |
669 |
Code code = context.getCodeBuilder().constant(identifier);
|
|
671 |
Code code = context.getCodeBuilder().identifier(identifier);
|
|
670 | 672 |
args.add(code); |
671 | 673 |
context.next_token(); |
672 | 674 |
token = context.look_token(); |
... | ... | |
683 | 685 |
); |
684 | 686 |
} |
685 | 687 |
if( this.id!=null ) { |
686 |
Code code = context.getCodeBuilder().function(FUNCTION_LIST, args);
|
|
688 |
Code code = context.getCodeBuilder().function(FUNCTION_TUPLE, args);
|
|
687 | 689 |
context.setCode(id, code); |
688 | 690 |
} |
689 | 691 |
} |
Also available in: Unified diff