Compare commits

...

2 Commits
master ... dev

2 changed files with 12 additions and 5 deletions

View File

@ -45,7 +45,8 @@ func Unpack(str string) (string, error) {
if unicode.IsDigit(char) { if unicode.IsDigit(char) {
currentState = number currentState = number
numOfRepeat, _ = strconv.Atoi(string(char)) numOfRepeat, _ = strconv.Atoi(string(char))
repStr, err := repeatRune(runeArray[i-1], numOfRepeat) n := strconv.Itoa(numOfRepeat)
repStr, err := repeatRune(runeArray[i-len(n)], numOfRepeat)
if err != nil { if err != nil {
// Если функция repeatRune возвращает ошибку, удаляем последний символ из результата. // Если функция repeatRune возвращает ошибку, удаляем последний символ из результата.
res := result.String() res := result.String()
@ -60,10 +61,12 @@ func Unpack(str string) (string, error) {
currentState = start currentState = start
} }
case number: case number:
if unicode.IsDigit(char) { if char == '\\' {
var n = strconv.Itoa(numOfRepeat) currentState = escape
numOfRepeat, _ = strconv.Atoi(n + string(char)) } else if unicode.IsDigit(char) {
repStr, err := repeatRune(runeArray[i-2], numOfRepeat) var n = strconv.Itoa(numOfRepeat) + string(char)
numOfRepeat, _ = strconv.Atoi(n)
repStr, err := repeatRune(runeArray[i-len(n)], numOfRepeat)
if err != nil { if err != nil {
// Если функция repeatRune возвращает ошибку, удаляем последний символ из результата. // Если функция repeatRune возвращает ошибку, удаляем последний символ из результата.
res := result.String() res := result.String()
@ -71,6 +74,7 @@ func Unpack(str string) (string, error) {
result.WriteString(res[0 : len(res)-1]) result.WriteString(res[0 : len(res)-1])
} }
result.WriteString(repStr) result.WriteString(repStr)
} else { } else {
result.WriteRune(char) result.WriteRune(char)
currentState = start currentState = start

View File

@ -26,6 +26,8 @@ func TestUnpack(t *testing.T) {
{input: `qwe\45`, expected: `qwe44444`}, {input: `qwe\45`, expected: `qwe44444`},
{input: `qwe\\5`, expected: `qwe\\\\\`}, {input: `qwe\\5`, expected: `qwe\\\\\`},
{input: `qwe\\\3`, expected: `qwe\3`}, {input: `qwe\\\3`, expected: `qwe\3`},
{input: `qwe2\1`, expected: `qwee1`},
{input: `qwe2\\`, expected: `qwee\`},
} }
for _, tc := range tests { for _, tc := range tests {
@ -56,6 +58,7 @@ func TestStringContainsNumber(t *testing.T) {
}{ }{
{input: "aaa10b", expected: "aaaaaaaaaaaab"}, {input: "aaa10b", expected: "aaaaaaaaaaaab"},
{input: "a12b4", expected: "aaaaaaaaaaaabbbb"}, {input: "a12b4", expected: "aaaaaaaaaaaabbbb"},
{input: "a100", expected: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
} }
for _, tc := range testStrings { for _, tc := range testStrings {
t.Run(tc.input, func(t *testing.T) { t.Run(tc.input, func(t *testing.T) {