← Back to branch summary

~zorba-coders/zorba/bug-867059

« back to all changes in this revision

Viewing changes to src/runtime/core/flwor_iterator.cpp

  • Committer: Paul J. Lucas
  • Date: 2011-10-31 04:29:54 UTC
  • mfrom: (10498.1.30 zorba)
  • Revision ID: paul@lucasmail.org-20111031042954-ta2dwj5cs72jm1yi
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/runtime/core/flwor_iterator.cpp
18
18
#include "zorbautils/fatal.h"
19
19
#include "diagnostics/assert.h"
20
20
#include "diagnostics/xquery_diagnostics.h"
 
21
#include "diagnostics/util_macros.h"
21
22
 
22
23
#include "context/static_context.h"
23
24
 
1474
1475
          store::Item_t temp;
1475
1476
          if (typedValueIter->next(temp))
1476
1477
          {
1477
 
            throw XQUERY_EXCEPTION(err::XPTY0004,
1478
 
                                   ERROR_PARAMS(ZED(SingletonExpected_2o),
1479
 
                                                ZED(AtomizationHasMoreThanOneValue)));
 
1478
            RAISE_ERROR(err::XPTY0004, loc,
 
1479
            ERROR_PARAMS(ZED(SingletonExpected_2o),
 
1480
                         ZED(AtomizationHasMoreThanOneValue)));
1480
1481
          }
1481
1482
        }
1482
1483
      }
1485
1486
      store::Item_t temp;
1486
1487
      if (consumeNext(temp, specIter->theInput, planState))
1487
1488
      {
1488
 
        throw XQUERY_EXCEPTION(
1489
 
          err::XPTY0004, ERROR_PARAMS(ZED(SingletonExpected_2o))
1490
 
        );
 
1489
        RAISE_ERROR(err::XPTY0004, loc, ERROR_PARAMS(ZED(SingletonExpected_2o)));
1491
1490
      }
1492
1491
    }
1493
1492