dima/exercism-solutions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

phone_number: cleanup, minor fixes

Browse source
This commit is contained in:
Dmitry Kokorin 2016-03-04 13:04:12 +03:00
parent a9b7e33d89
commit 5e514df64f
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cpp/phone-number/phone_number.cpp
View file

@ -7,7 +7,7 @@ using namespace std;
static const size_t number_size = 10; static const size_t number_size = 10;
static const size_t area_code_size = 3; static const size_t area_code_size = 3;
static const size_t first_part_size = 3; static const size_t exchange_size = 3;
static const char invalid_number[] = "0000000000"; static const char invalid_number[] = "0000000000";
@ -23,8 +23,7 @@ phone_number::phone_number(const string &str)
number_.erase(number_.begin()); number_.erase(number_.begin());
} }
else if (number_.size() != number_size) {
if (number_.size() != number_size) {
number_ = invalid_number; number_ = invalid_number;
} }
@ -43,7 +42,7 @@ string phone_number::area_code() const
phone_number::operator string() const phone_number::operator string() const
{ {
return string("(") + area_code() + ") " return string("(") + area_code() + ") "
+ number_.substr(area_code_size, first_part_size) + number_.substr(area_code_size, exchange_size)
+ '-' + '-'
+ number_.substr(area_code_size + first_part_size, string::npos); + number_.substr(area_code_size + exchange_size);
} }