zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819

Fixed bug #866984 (better error message for an eval error)
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-08-29 08:20:45 +0000
+++ ChangeLog	2012-08-29 10:51:54 +0000
@@ -17,7 +17,8 @@
   * Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
   * Fixed bug #1039488 (inserting more than one pair at once in a JSON object)
   * Fixed bug #1042840 (qname pool free-list corruption)
-
+  * Fixed bug #866984 (better error message for an eval error)
+	
 version 2.6
 
 New Features:

=== modified file 'src/runtime/eval/eval.cpp'
--- src/runtime/eval/eval.cpp	2012-08-29 08:20:45 +0000
+++ src/runtime/eval/eval.cpp	2012-08-29 10:51:54 +0000
@@ -415,7 +415,10 @@
 
   rchandle<MainModule> mm = ast.dyn_cast<MainModule>();
   if (mm == NULL)
-    throw XQUERY_EXCEPTION(err::XPST0003, ERROR_LOC(loc));
+  {
+    RAISE_ERROR(err::XPST0003, loc,
+    ERROR_PARAMS(ZED(XPST0003_ModuleDeclNotInMain)));
+  }
 
   PlanIter_t rootIter = compiler.compile(ast,
                                          false, // do not apply PUL