zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1162631 into lp:zorba.

Commit message:
Now adhere to the spec regarding negative numbers in English.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1162631 in Zorba: "format-integer 'w' format of negative numbers"
  https://bugs.launchpad.net/zorba/+bug/1162631

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1162631/+merge/165482

Now adhere to the spec regarding negative numbers in English.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1162631/+merge/165482
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-23 19:30:53 +0000
+++ ChangeLog	2013-05-23 20:35:33 +0000
@@ -14,6 +14,7 @@
 
 Bug Fixes/Other Changes:
   * Fixed bug in hoisting through try-catch expr
+  * Fixed bug #1162631 (format-integer 'w' format of negative numbers)
   * Fixed bug #1103115 (Timezone units as hours are wrong)
   * Fixed implementation of fn:deep-equal according to latest W3C spec.
   * Must apply document ordering on the domain expression of a FOR clause, if

=== modified file 'src/util/string_util.cpp'
--- src/util/string_util.cpp	2013-05-08 01:05:04 +0000
+++ src/util/string_util.cpp	2013-05-23 20:35:33 +0000
@@ -328,7 +328,7 @@
   }
 
   if ( negative )
-    r.insert( 0, "negative " );
+    r.insert( (zstring::size_type)0, 1, '-' );
   return r;
 }
 

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-05-22 22:38:56 +0000
+++ test/fots/CMakeLists.txt	2013-05-23 20:35:33 +0000
@@ -143,7 +143,6 @@
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)
 EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-006 0)
-EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-044 21448)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat41 1167427)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat42 1167427)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)