Stop PB1, go to 2
This commit is contained in:
		
					parent
					
						
							
								8a1eb79841
							
						
					
				
			
			
				commit
				
					
						a892885241
					
				
			
		
					 3 changed files with 114 additions and 38 deletions
				
			
		| 
						 | 
				
			
			@ -96,33 +96,45 @@ namespace pb1 {
 | 
			
		|||
        line_with_numbers.reserve(toSearch.size());
 | 
			
		||||
        word.reserve(sizeof("seven") - 1);
 | 
			
		||||
        for (int i = 0; i < toSearch.size(); ++i) {
 | 
			
		||||
            const int second_letter = i + 1, third = i + 2, fourth = i + 3, fifth = i + 4, sixth = i + 5;
 | 
			
		||||
            const std::uint32_t nb_characters_remaining = toSearch.size() - i - 1;
 | 
			
		||||
            const std::uint32_t nb_characters_remaining = toSearch.size() - i;
 | 
			
		||||
            switch (toSearch[i]) {
 | 
			
		||||
                case 'o': {
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters[0].size()) {
 | 
			
		||||
                        line_with_numbers.append(toSearch.substr(i));
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.append(toSearch.substr(i, digitLetters[0].size()));
 | 
			
		||||
                    if (!numbersSet.contains(word)) {
 | 
			
		||||
                        const auto pos = word.find_first_of(digits);
 | 
			
		||||
                        if (pos != std::string::npos) {
 | 
			
		||||
                            line_with_numbers.push_back(word[pos]);
 | 
			
		||||
                    if (nb_characters_remaining >= digitLetters[0].size()) {
 | 
			
		||||
                        word.append(toSearch.substr(i, digitLetters[0].size()));
 | 
			
		||||
                        if (numbersSet.contains(word)) {
 | 
			
		||||
                            line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
                        line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                        ++i;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 't': {
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters[2].size()) {
 | 
			
		||||
                    if (nb_characters_remaining >= digitLetters[1].size()) {
 | 
			
		||||
                        // TODO: problème si on a two mais là ça ajoute + de caractère…
 | 
			
		||||
                        const auto number_two = toSearch.substr(i, digitLetters[1].size());
 | 
			
		||||
                        const auto number_three = [&]() -> std::string_view {
 | 
			
		||||
                            const auto tmp = toSearch.substr(i);
 | 
			
		||||
                            if (tmp.size() <= digitLetters[2].size()) {
 | 
			
		||||
                                return toSearch.substr(i);
 | 
			
		||||
                            } else {
 | 
			
		||||
                                return toSearch.substr(i, digitLetters[2].size());
 | 
			
		||||
                            }
 | 
			
		||||
                        }();
 | 
			
		||||
                        if (numbersSet.contains(number_two) or numbersSet.contains(number_three)) {
 | 
			
		||||
                            word.append(numbersSet.contains(number_two) ? number_two : number_three);
 | 
			
		||||
                            line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 'f': {
 | 
			
		||||
                    // length five and four are equal
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters[3].size()) {
 | 
			
		||||
                        line_with_numbers.append(toSearch.substr(i));
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.append(toSearch.substr(i, digitLetters[2].size()));
 | 
			
		||||
                    word.append(toSearch.substr(i, digitLetters[3].size()));
 | 
			
		||||
                    if (!numbersSet.contains(word)) {
 | 
			
		||||
                        const auto pos = word.find_first_of(digits);
 | 
			
		||||
                        if (pos != std::string::npos) {
 | 
			
		||||
| 
						 | 
				
			
			@ -130,24 +142,79 @@ namespace pb1 {
 | 
			
		|||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
                        line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                        i += 2;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 'f':
 | 
			
		||||
                case 's': {
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters[6].size()) {
 | 
			
		||||
                        line_with_numbers.append(toSearch.substr(i));
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
                    const auto number_six = toSearch.substr(i, digitLetters[5].size());
 | 
			
		||||
                    const auto number_seven = toSearch.substr(i, digitLetters[6].size());
 | 
			
		||||
                    if (!numbersSet.contains(number_six) and !numbersSet.contains(number_seven)) {
 | 
			
		||||
                        const auto pos = number_seven.find_first_of(digits);
 | 
			
		||||
                        if (pos != std::string::npos) {
 | 
			
		||||
                            line_with_numbers.push_back(word[pos]);
 | 
			
		||||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
                        line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 's':
 | 
			
		||||
                case 'e': {
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters[7].size()) {
 | 
			
		||||
                        line_with_numbers.append(toSearch.substr(i));
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.append(toSearch.substr(i, digitLetters[7].size()));
 | 
			
		||||
                    if (!numbersSet.contains(word)) {
 | 
			
		||||
                        const auto pos = word.find_first_of(digits);
 | 
			
		||||
                        if (pos != std::string::npos) {
 | 
			
		||||
                            line_with_numbers.push_back(word[pos]);
 | 
			
		||||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
                        line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 'e':
 | 
			
		||||
                case 'n': {
 | 
			
		||||
                    if (nb_characters_remaining < digitLetters.back().size()) {
 | 
			
		||||
                        line_with_numbers.append(toSearch.substr(i));
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
                    word.append(toSearch.substr(i, digitLetters.back().size()));
 | 
			
		||||
                    if (!numbersSet.contains(word)) {
 | 
			
		||||
                        const auto pos = word.find_first_of(digits);
 | 
			
		||||
                        if (pos != std::string::npos) {
 | 
			
		||||
                            line_with_numbers.push_back(word[pos]);
 | 
			
		||||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
                        line_with_numbers.push_back(numbersSet.at(word));
 | 
			
		||||
                    }
 | 
			
		||||
                    word.clear();
 | 
			
		||||
                }
 | 
			
		||||
                    break;
 | 
			
		||||
                case 'n':
 | 
			
		||||
                case '0':
 | 
			
		||||
                case '1':
 | 
			
		||||
                case '2':
 | 
			
		||||
                case '3':
 | 
			
		||||
                case '4':
 | 
			
		||||
                case '5':
 | 
			
		||||
                case '6':
 | 
			
		||||
                case '7':
 | 
			
		||||
                case '8':
 | 
			
		||||
                case '9':
 | 
			
		||||
                    line_with_numbers.push_back(toSearch[i]);
 | 
			
		||||
                    break;
 | 
			
		||||
                default:
 | 
			
		||||
                    if ((toSearch[i] - '0') < 10) {
 | 
			
		||||
                        line_with_numbers.push_back(toSearch[i]);
 | 
			
		||||
                    }
 | 
			
		||||
                    continue;
 | 
			
		||||
                    break;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        if (!line_with_numbers.empty()) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue