Skip to content

Commit 8e707f5

Browse files
author
Юрий Лосев
committed
Respect the linter
1 parent 4ee040c commit 8e707f5

File tree

5 files changed

+33
-20
lines changed

5 files changed

+33
-20
lines changed

cmd/generator.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ func main() {
1717
generateDict()
1818
}
1919

20-
type Row struct {
20+
type row struct {
2121
Name string `json:"Name"`
2222
Sex string `json:"Sex"`
2323
}
2424

25-
type NamesDict []Row
25+
type namesDict []row
2626

2727
func generateDict() {
2828
f, err := ioutil.ReadFile("cmd/russian_names.json")
@@ -32,7 +32,7 @@ func generateDict() {
3232

3333
f = bytes.TrimPrefix(f, []byte("\xef\xbb\xbf")) // отпилить BOM
3434

35-
var rows NamesDict
35+
var rows namesDict
3636

3737
err = json.Unmarshal(f, &rows)
3838
if err != nil {
@@ -48,6 +48,7 @@ func generateDict() {
4848

4949
_, _ = fmt.Fprint(out, "// DO NOT EDIT!\n// Code generated from cmd/generator.go\n\npackage rules\n\n")
5050

51+
fmt.Fprint(out, "// AllNames presents dictionary of firstnames for fallback\n")
5152
fmt.Fprint(out, "var AllNames = map[string]Gender{\n")
5253

5354
for _, row := range rows {
@@ -91,6 +92,7 @@ func generateRules() {
9192

9293
_, _ = fmt.Fprint(out, "// DO NOT EDIT!\n// Code generated from cmd/generator.go\n\npackage rules\n\n")
9394

95+
fmt.Fprint(out, "// AllRules presents all geenerated petrovich rules\n")
9496
fmt.Fprint(out, "var AllRules = Rules{\n\tFirstname: RulesGroup{\n")
9597
printRulesGroup(out, petrovich.Firstname)
9698

example_test.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@ func ExampleTransform() {
3434

3535
for _, p := range people {
3636
fmt.Println(petrovich.Transform(p, petrovich.Dative))
37-
// Output:
38-
// Прокопенко Сергею Ивановичу
39-
// Николаеву Андрею Павловичу
40-
// Морозовой Екатерине Алексеевне
41-
// Павловой Антонине Сергеевне
42-
4337
}
38+
// Output:
39+
// Прокопенко Сергею Ивановичу
40+
// Николаеву Андрею Павловичу
41+
// Морозовой Екатерине Алексеевне
42+
// Павловой Антонине Сергеевне
4443
}
4544

4645
func ExampleTransformShort() {
@@ -72,10 +71,10 @@ func ExampleTransformShort() {
7271
for _, p := range people {
7372
newp := petrovich.Transform(p, petrovich.Instrumental)
7473
fmt.Println(newp.Short())
75-
// Output:
76-
// Прокопенко С.И.
77-
// Николаевым А.П.
78-
// Морозовой Е.А.
79-
// Павловой А.С.
8074
}
75+
// Output:
76+
// Прокопенко С.И.
77+
// Николаевым А.П.
78+
// Морозовой Е.А.
79+
// Павловой А.С.
8180
}

petrovich.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@ import (
1111
//go:generate git submodule update --recursive --remote
1212
//go:generate go run cmd/generator.go
1313

14-
// Gender specify Person`s gender - Male, Female, Androgynous
14+
// Gender specifies Person`s gender - Male, Female, Androgynous
1515
type Gender = rules.Gender
1616

17-
// Case grammatical case (падежи)
17+
// Case specifies grammatical case (падежи)
1818
type Case = rules.Case
1919

2020
const (
21+
// Androgynous gender
2122
Androgynous = rules.Androgynous
22-
Male = rules.Male
23-
Female = rules.Female
23+
// Male gender
24+
Male = rules.Male
25+
// Female gender
26+
Female = rules.Female
27+
28+
// cases
2429

25-
// case
2630
// Nominative именительный
2731
Nominative = rules.Nominative
2832
// Genitive родительный

rules/gender.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ package rules
66
type Gender int8
77

88
const (
9+
// Androgynous gender
910
Androgynous Gender = iota
11+
// Male gender
1012
Male
13+
// Female gender
1114
Female
1215
)

rules/rules.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
package rules
22

3+
// For generation
4+
5+
// Rule for petrovich-rules generation
36
type Rule struct {
47
Gender Gender
58
Test []string
69
Mods []string
710
}
811

12+
// RulesSet set of generated rules
913
type RulesSet []Rule
1014

15+
// RulesGroup group of rules
1116
type RulesGroup struct {
1217
Exceptions RulesSet
1318
Suffixes RulesSet
1419
}
1520

16-
// верхний уровень
21+
// Rules top level petrovich-rules
1722
type Rules struct {
1823
Lastname RulesGroup
1924
Firstname RulesGroup

0 commit comments

Comments
 (0)