From 5d7560d5a108973c08b5f2658e6547ff6c2864ab Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Sun, 20 Apr 2008 20:37:09 +0200 Subject: [PATCH] Fixed Errors_err036 --- TEST | 4 ++-- format-number.lisp | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/TEST b/TEST index 5889321..1d535ab 100644 --- a/TEST +++ b/TEST @@ -12598,7 +12598,7 @@ PASS Errors_err035 [Mixed]: raised an xslt-error as expected Expected output (1): MSFT_Conformance_Tests/Errors/Errors_err035.saxon Actual output: MSFT_Conformance_Tests/Errors/Errors_err035.xuriella -FAIL Errors_err036 [Mixed]: expected error not signalled: +PASS Errors_err036 [Mixed]: raised an xslt-error as expected Stylesheet: MSFT_Conformance_Tests/Errors/format-fract.noindent-xsl Data: MSFT_Conformance_Tests/Errors/data.xml Expected output (1): MSFT_Conformance_Tests/Errors/Errors_err036.saxon @@ -19431,4 +19431,4 @@ PASS XSLTFunctions_DocumentFuncWithEmptyArg [Mixed] Expected output (1): MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.saxon Actual output: MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.xuriella -Passed 2876/3080 tests (3 expected failures, 201 unexpected failures). +Passed 2877/3080 tests (3 expected failures, 200 unexpected failures). diff --git a/format-number.lisp b/format-number.lisp index 65eeecd..ec9537a 100644 --- a/format-number.lisp +++ b/format-number.lisp @@ -188,7 +188,8 @@ (let ((fractional-part-grouping-positions '()) (minimum-fractional-part-size 0) (maximum-fractional-part-size 0) - (current-grouping 0)) + (current-grouping 0) + (digitp nil)) (loop for i from start below end for c = (elt picture i) @@ -197,9 +198,13 @@ (df/grouping-separator (push current-grouping fractional-part-grouping-positions)) (df/digit + (setf digitp t) (incf current-grouping) (incf maximum-fractional-part-size)) (df/zero-digit + (when digitp + (xslt-error + "zero-digit not allowed after digit in fractional picture")) (incf current-grouping) (incf minimum-fractional-part-size) (incf maximum-fractional-part-size)) -- 2.11.4.GIT