From 0235308c48baf0d06d8f1bd93ed9a1ca46060e95 Mon Sep 17 00:00:00 2001 From: Michal Frystacky Date: Mon, 29 Oct 2018 15:29:26 -0800 Subject: [PATCH 1/2] Update article.md Clarifications and grammar improvements. --- 5-regular-expressions/09-regexp-groups/article.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5-regular-expressions/09-regexp-groups/article.md b/5-regular-expressions/09-regexp-groups/article.md index ab0d301a..80721b71 100644 --- a/5-regular-expressions/09-regexp-groups/article.md +++ b/5-regular-expressions/09-regexp-groups/article.md @@ -1,6 +1,6 @@ # Capturing groups -A part of the pattern can be enclosed in parentheses `pattern:(...)`. That's called a "capturing group". +A part of a pattern can be enclosed in parentheses `pattern:(...)`. This is called a "capturing group". That has two effects: @@ -30,9 +30,9 @@ john.smith@site.com.uk The pattern: `pattern:[-.\w]+@([\w-]+\.)+[\w-]{2,20}`. -- The first part before `@` may include wordly characters, a dot and a dash `pattern:[-.\w]+`, like `match:john.smith`. +- The first part before `@` may include any alphanumeric word characters, a dot and a dash `pattern:[-.\w]+`, like `match:john.smith`. - Then `pattern:@` -- And then the domain. May be a second-level domain `site.com` or with subdomains like `host.site.com.uk`. We can match it as "a word followed by a dot" repeated one or more times for subdomains: `match:mail.` or `match:site.com.`, and then "a word" for the last part: `match:.com` or `match:.uk`. +- And then the domain and maybe a second-level domain like `site.com` or with subdomains like `host.site.com.uk`. We can match it as "a word followed by a dot" repeated one or more times for subdomains: `match:mail.` or `match:site.com.`, and then "a word" for the last part: `match:.com` or `match:.uk`. The word followed by a dot is `pattern:(\w+\.)+` (repeated). The last word should not have a dot at the end, so it's just `\w{2,20}`. The quantifier `pattern:{2,20}` limits the length, because domain zones are like `.uk` or `.com` or `.museum`, but can't be longer than 20 characters. From 950af8cf397cf31f354f451901420e885ef48bd0 Mon Sep 17 00:00:00 2001 From: Michal Frystacky Date: Mon, 29 Oct 2018 16:24:31 -0800 Subject: [PATCH 2/2] Update task.md Grammar, spelling, and some clarifications --- .../09-regexp-groups/1-find-webcolor-3-or-6/task.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md b/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md index c23097c0..3078a757 100644 --- a/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md +++ b/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md @@ -1,6 +1,6 @@ # Find color in the format #abc or #abcdef -Write a regexp that matches colors in the format `#abc` or `#abcdef`. That is: `#` followed by 3 or 6 hexadimal digits. +Write a RegExp that matches colors in the format `#abc` or `#abcdef`. That is: `#` followed by 3 or 6 hexadecimal digits. Usage example: ```js @@ -11,4 +11,4 @@ let str = "color: #3f3; background-color: #AA00ef; and: #abcd"; alert( str.match(reg) ); // #3f3 #AA0ef ``` -P.S. Should be exactly 3 or 6 hex digits: values like `#abcd` should not match. +P.S. This should be exactly 3 or 6 hex digits: values like `#abcd` should not match.