Skip to content

Commit

Permalink
flect#47 - Add new rules at the beginning of rules array, so the new …
Browse files Browse the repository at this point in the history
…rules will be applied first

reverse init for to standard rules
  • Loading branch information
renathoaz authored and sio4 committed Mar 12, 2022
1 parent 09688c6 commit 944b32d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions plural_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ var pluralRules = []rule{}
func AddPlural(suffix string, repl string) {
pluralMoot.Lock()
defer pluralMoot.Unlock()
pluralRules = append(pluralRules, rule{
pluralRules = append([]rule{{
suffix: suffix,
fn: func(s string) string {
s = s[:len(s)-len(suffix)]
return s + repl
},
})
}}, pluralRules...)

pluralRules = append(pluralRules, rule{
pluralRules = append([]rule{{
suffix: repl,
fn: noop,
})
}}, pluralRules...)
}

var singleToPlural = map[string]string{
Expand Down Expand Up @@ -280,8 +280,8 @@ var singularToPluralSuffixList = []singularToPluralSuffix{
}

func init() {
for _, suffix := range singularToPluralSuffixList {
AddPlural(suffix.singular, suffix.plural)
AddSingular(suffix.plural, suffix.singular)
for i := len(singularToPluralSuffixList) - 1; i >= 0; i-- {
AddPlural(singularToPluralSuffixList[i].singular, singularToPluralSuffixList[i].plural)
AddSingular(singularToPluralSuffixList[i].plural, singularToPluralSuffixList[i].singular)
}
}
8 changes: 4 additions & 4 deletions singular_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ var singularRules = []rule{}
func AddSingular(ext string, repl string) {
singularMoot.Lock()
defer singularMoot.Unlock()
singularRules = append(singularRules, rule{
singularRules = append([]rule{{
suffix: ext,
fn: func(s string) string {
s = s[:len(s)-len(ext)]
return s + repl
},
})
}}, singularRules...)

singularRules = append(singularRules, rule{
singularRules = append([]rule{{
suffix: repl,
fn: func(s string) string {
return s
},
})
}}, singularRules...)
}

0 comments on commit 944b32d

Please sign in to comment.