Skip to content

fix: split dictionary using scanner #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Splode merged 1 commit into from
Oct 21, 2022
Merged

fix: split dictionary using scanner #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions dictionary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@
package fname

import (
"bufio"
_ "embed"
"strings"
)

//go:embed data/adjective
var _adjective string
var adjective = strings.Split(_adjective, "\n")
var adjective = split(_adjective)

//go:embed data/adverb
var _adverb string
var adverb = strings.Split(_adverb, "\n")
var adverb = split(_adverb)

//go:embed data/noun
var _noun string
var noun = strings.Split(_noun, "\n")
var noun = split(_noun)

//go:embed data/verb
var _verb string
var verb = strings.Split(_verb, "\n")
var verb = split(_verb)

// Dictionary is a collection of words.
type Dictionary struct {
Expand Down Expand Up @@ -60,3 +61,13 @@ func (d *Dictionary) LengthNoun() int {
func (d *Dictionary) LengthVerb() int {
return len(d.verbs)
}

func split(s string) []string {
scanner := bufio.NewScanner(strings.NewReader(s))
scanner.Split(bufio.ScanLines)
var lines []string
for scanner.Scan() {
lines = append(lines, scanner.Text())
}
return lines
}