refactor: remove dictionary accessor functions

Do not return errors from out-of-bounds indexing. Remove dictionary
accessor methods, prefering direct access from slices. Remove extraneous
test cases.

Author: Splode

dictionary.go

@@ -4,7 +4,6 @@ package fname
 import (
 	"bufio"
 	"embed"
-	"fmt"
 )
 
 const (
@@ -53,38 +52,6 @@ func NewDictionary() *Dictionary {
 	}
 }
 
-// Adjective returns a random adjective.
-func (d *Dictionary) Adjective(idx int) (string, error) {
-	if idx < 0 || idx >= len(d.adectives) {
-		return "", fmt.Errorf("index out of range: %d", idx)
-	}
-	return d.adectives[idx], nil
-}
-
-// Adverb returns a random adverb.
-func (d *Dictionary) Adverb(idx int) (string, error) {
-	if idx < 0 || idx >= len(d.adverbs) {
-		return "", fmt.Errorf("index out of range: %d", idx)
-	}
-	return d.adverbs[idx], nil
-}
-
-// Noun returns a random noun.
-func (d *Dictionary) Noun(idx int) (string, error) {
-	if idx < 0 || idx >= len(d.nouns) {
-		return "", fmt.Errorf("index out of range: %d", idx)
-	}
-	return d.nouns[idx], nil
-}
-
-// Verb returns a random verb.
-func (d *Dictionary) Verb(idx int) (string, error) {
-	if idx < 0 || idx >= len(d.verbs) {
-		return "", fmt.Errorf("index out of range: %d", idx)
-	}
-	return d.verbs[idx], nil
-}
-
 // LengthAdjective returns the number of adjectives in the dictionary.
 func (d *Dictionary) LengthAdjective() int {
 	return len(d.adectives)

dictionary_test.go

@@ -32,72 +32,6 @@ func TestNewDictionary(t *testing.T) {
 				t.Error("\t\tShould be able to load the verb file.")
 			}
 
-			adj, err := d.Adjective(0)
-			if err != nil {
-				t.Error("\t\tShould be able to get an adjective from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get an adjective from the dictionary.")
-			if adj != "able" {
-				t.Error("\t\tShould be able to get the first adjective from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get the first adjective from the dictionary.")
-
-			_, err = d.Adjective(-1)
-			if err == nil {
-				t.Error("\t\tShould not be able to get an adjective from the dictionary with a negative index.")
-			}
-			t.Log("\t\tShould not be able to get an adjective from the dictionary with a negative index.")
-
-			adv, err := d.Adverb(0)
-			if err != nil {
-				t.Error("\t\tShould be able to get an adverb from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get an adverb from the dictionary.")
-			if adv != "abnormally" {
-				t.Error("\t\tShould be able to get the first adverb from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get the first adverb from the dictionary.")
-
-			_, err = d.Adverb(-1)
-			if err == nil {
-				t.Error("\t\tShould not be able to get an adverb from the dictionary with a negative index.")
-			}
-			t.Log("\t\tShould not be able to get an adverb from the dictionary with a negative index.")
-
-			noun, err := d.Noun(0)
-			if err != nil {
-				t.Error("\t\tShould be able to get a noun from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get a noun from the dictionary.")
-
-			if noun != "aardvark" {
-				t.Error("\t\tShould be able to get the first noun from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get the first noun from the dictionary.")
-
-			_, err = d.Noun(-1)
-			if err == nil {
-				t.Error("\t\tShould not be able to get a noun from the dictionary with a negative index.")
-			}
-			t.Log("\t\tShould not be able to get a noun from the dictionary with a negative index.")
-
-			verb, err := d.Verb(0)
-			if err != nil {
-				t.Error("\t\tShould be able to get a verb from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get a verb from the dictionary.")
-
-			if verb != "abandoned" {
-				t.Error("\t\tShould be able to get the first verb from the dictionary.")
-			}
-			t.Log("\t\tShould be able to get the first verb from the dictionary.")
-
-			_, err = d.Verb(-1)
-			if err == nil {
-				t.Error("\t\tShould not be able to get a verb from the dictionary with a negative index.")
-			}
-			t.Log("\t\tShould not be able to get a verb from the dictionary with a negative index.")
-
 			if len(d.adectives) != d.LengthAdjective() {
 				t.Error("\t\tShould be able to get the length of the adjective file.")
 			}

generator.go

@@ -58,35 +58,20 @@ func NewGenerator(opts ...GeneratorOption) *Generator {
 // Generate generates a random name.
 func (r *Generator) Generate() (string, error) {
 	// TODO: address case where adjective and noun are the same, such as "orange-orange" or "sound-sound"
-	adjective, err := r.dict.Adjective(rand.Intn(r.dict.LengthAdjective()))
-	if err != nil {
-		return "", err
-	}
-	noun, err := r.dict.Noun(rand.Intn(r.dict.LengthNoun()))
-	if err != nil {
-		return "", err
-	}
+	adjective := r.dict.adectives[rand.Intn(r.dict.LengthAdjective())]
+	noun := r.dict.nouns[rand.Intn(r.dict.LengthNoun())]
 	words := []string{adjective, noun}
 
 	switch r.size {
 	case 2:
 		return strings.Join(words, r.delimiter), nil
 	case 3:
-		verb, err := r.dict.Verb(rand.Intn(r.dict.LengthVerb()))
-		if err != nil {
-			return "", err
-		}
+		verb := r.dict.verbs[rand.Intn(r.dict.LengthVerb())]
 		words = append(words, verb)
 	case 4:
-		verb, err := r.dict.Verb(rand.Intn(r.dict.LengthVerb()))
-		if err != nil {
-			return "", err
-		}
+		verb := r.dict.verbs[rand.Intn(r.dict.LengthVerb())]
 		words = append(words, verb)
-		adverb, err := r.dict.Adverb(rand.Intn(r.dict.LengthAdverb()))
-		if err != nil {
-			return "", err
-		}
+		adverb := r.dict.adverbs[rand.Intn(r.dict.LengthAdverb())]
 		words = append(words, adverb)
 	default:
 		return "", fmt.Errorf("invalid size: %d", r.size)