@@ -12,19 +12,27 @@ */ package flapjack.cobol.util; +import java.text.MessageFormat; import java.util.regex.Matcher; import java.util.regex.Pattern; public class CobolDecimalPatternParser { - private static final Pattern NO_MULTIPLIER = Pattern.compile("(?i)9+v9+"); - private static final Pattern MULTIPLIER = Pattern.compile("v9\\(([0-9]+)\\)", Pattern.CASE_INSENSITIVE); + private static final String NOT_A_DECIMAL_PATTERN = "Unable to parse out the decimal points from cobol pattern ({0})"; + private static final Pattern NO_MULTIPLIER = Pattern.compile("(?i)9+$"); + private static final Pattern MULTIPLIER = Pattern.compile("9\\(([0-9]+)\\)$", Pattern.CASE_INSENSITIVE); public int parseDecimalPlaces(String pattern) { - if (Pattern.matches(NO_MULTIPLIER.pattern(), pattern)) { - return pattern.split("v|V")[1].length(); + if (pattern.toLowerCase().indexOf("v") == -1) { + throw new IllegalArgumentException(MessageFormat.format(NOT_A_DECIMAL_PATTERN, new Object[]{pattern})); } - Matcher matcher = MULTIPLIER.matcher(pattern); + + String decimal = pattern.split("v|V")[1]; + if (Pattern.matches(NO_MULTIPLIER.pattern(), decimal)) { + return decimal.length(); + } + + Matcher matcher = MULTIPLIER.matcher(decimal); matcher.find(); return Integer.parseInt(matcher.group(1)); } flapjack-cobol/src/main/java/flapjack/cobol/util/CobolDecimalPatternParser.java @@ -1,11 +1,11 @@ /** * Copyright 2008-2009 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at: - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. @@ -16,13 +16,30 @@ import junit.framework.TestCase; public class CobolDecimalPatternParserTest extends TestCase { - public void test() { - CobolDecimalPatternParser parser = new CobolDecimalPatternParser(); + private CobolDecimalPatternParser parser; + + protected void setUp() throws Exception { + super.setUp(); + parser = new CobolDecimalPatternParser(); + } + public void test_problemWithCobolPattern() { + try { + parser.parseDecimalPlaces("999"); + fail(); + } catch (IllegalArgumentException err) { + assertEquals("Unable to parse out the decimal points from cobol pattern (999)", err.getMessage()); + } + } + + public void test() { assertEquals(1, parser.parseDecimalPlaces("9v9")); assertEquals(2, parser.parseDecimalPlaces("9v99")); assertEquals(2, parser.parseDecimalPlaces("9V99")); assertEquals(2, parser.parseDecimalPlaces("9V9(2)")); assertEquals(12, parser.parseDecimalPlaces("9V9(12)")); + assertEquals(3, parser.parseDecimalPlaces("999V999")); + assertEquals(3, parser.parseDecimalPlaces("9(2)v999")); } + } flapjack-cobol/src/test/java/flapjack/cobol/util/CobolDecimalPatternParserTest.java ac8c63396686e665e2c6f49429776829a091cf05 Dan Dudley born2snipe@gmail.com http://github.com/born2snipe/flapjack/commit/326aa113506599242a9b9ef4944cb62afcdacee1 326aa113506599242a9b9ef4944cb62afcdacee1 2009-11-04T21:29:38-08:00 2009-11-04T21:29:38-08:00 updated to handle multiple decimal places properly 0996c2af04e8aee18d7e56f977a068d1c6fd3297 Dan Dudley born2snipe@gmail.com