← Back to branch summary

~zorba-coders/zorba/bug1123016

« back to all changes in this revision

Viewing changes to src/compiler/expression/expr_type.cpp

  • Committer: Sorin Marian Nasoi
  • Date: 2013-04-09 11:44:43 UTC
  • mfrom: (11301.1.53 zorba)
  • Revision ID: spungi@gmail.com-20130409114443-89vz57gpyjzwoiok
Merged lp:zorba trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/compiler/expression/expr_type.cpp
653
653
  case function_item_expr_kind:
654
654
  {
655
655
    theType = rtm.ANY_FUNCTION_TYPE_ONE;
 
656
 
656
657
    function_item_expr* fiExpr = static_cast<function_item_expr*>(this);
 
658
 
657
659
    if (fiExpr->get_function() != NULL)
658
660
    {
659
661
      const xqtref_t& retType = fiExpr->get_function()->getSignature().returnType();
660
662
      std::vector<xqtref_t> paramTypes;
661
 
      for (csize i=0; i<fiExpr->get_function()->getSignature().paramCount(); i++ )
 
663
 
 
664
      for (csize i = 0; i < fiExpr->get_function()->getSignature().paramCount(); ++i)
662
665
        paramTypes.push_back(fiExpr->get_function()->getSignature()[i]);
663
666
 
664
667
      theType = new FunctionXQType(&rtm, paramTypes, retType, TypeConstants::QUANT_ONE);
988
991
    }
989
992
 
990
993
    if (testNodeName != NULL &&
 
994
        nodeTest->getWildKind() == match_no_wild &&
991
995
        inNodeName != NULL &&
992
996
        !inNodeName->equals(testNodeName))
993
997
    {
1004
1008
    case store::StoreConsts::textNode:
1005
1009
    case store::StoreConsts::piNode:
1006
1010
    case store::StoreConsts::commentNode:
 
1011
    case store::StoreConsts::namespaceNode:
1007
1012
      return create_axis_step_type(tm, inNodeKind, testNodeName, inQuant, false);
1008
1013
 
1009
1014
    case store::StoreConsts::anyNode:
1019
1024
      case store::StoreConsts::textNode:
1020
1025
      case store::StoreConsts::piNode:
1021
1026
      case store::StoreConsts::commentNode:
 
1027
      case store::StoreConsts::namespaceNode:
1022
1028
        return create_axis_step_type(tm, testNodeKind, testNodeName, inQuant, false);
1023
1029
 
1024
1030
      default: