From 4974ad9fa7bc47fa0194726a649adb9445ad21fb Mon Sep 17 00:00:00 2001 From: Ilya Kantor Date: Mon, 14 Jan 2019 16:59:56 +0300 Subject: [PATCH] fix --- .../3-find-decimal-positive-numbers/solution.md | 10 ++++++---- .../3-find-decimal-positive-numbers/task.md | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md index becd6a8f..23065413 100644 --- a/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md +++ b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md @@ -1,16 +1,18 @@ -An integer number is `pattern:\d+`. +An non-negative integer number is `pattern:\d+`. We should exclude `0` as the first digit, as we don't need zero, but we can allow it in further digits. + +So that gives us `pattern:[1-9]\d*`. A decimal part is: `pattern:\.\d+`. Because the decimal part is optional, let's put it in parentheses with the quantifier `pattern:'?'`. -Finally we have the regexp: `pattern:\d+(\.\d+)?`: +Finally we have the regexp: `pattern:[1-9]\d*(\.\d+)?`: ```js run -let reg = /\d+(\.\d+)?/g; +let reg = /[1-9]\d*(\.\d+)?/g; -let str = "1.5 0 12. 123.4."; +let str = "1.5 0 -5 12. 123.4."; alert( str.match(reg) ); // 1.5, 0, 12, 123.4 ``` diff --git a/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md index 2ce17876..ad8c81ea 100644 --- a/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md +++ b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md @@ -6,7 +6,7 @@ An example of use: ```js let reg = /your regexp/g; -let str = "1.5 0 12. 123.4."; +let str = "1.5 0 -5 12. 123.4."; -alert( str.match(reg) ); // 1.5, 0, 12, 123.4 +alert( str.match(reg) ); // 1.5, 12, 123.4 (ignores 0 and -5) ```