add tr., subtr. to comb. uninomials (close #240)

gnames · Mar 9, 2023 · bd770b4 · bd770b4
1 parent 4f35cfb
commit bd770b4
Show file tree

Hide file tree

Showing 6 changed files with 3,150 additions and 3,068 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add [#240]: add `tr.` `subtr.` as ranks for combo-uninomials.
+
 ## [v1.7.1] - 2023-03-07 Tue
 
 - Add: upgrade all modules.
@@ -415,6 +417,8 @@
 
 This document follows [changelog guidelines]
 
+[v1.7.2]: https://github.com/gnames/gnparser/compare/v1.7.1...v1.7.2
+[v1.7.1]: https://github.com/gnames/gnparser/compare/v1.7.0...v1.7.1
 [v1.7.0]: https://github.com/gnames/gnparser/compare/v1.6.9...v1.7.0
 [v1.6.9]: https://github.com/gnames/gnparser/compare/v1.6.8...v1.6.9
 [v1.6.8]: https://github.com/gnames/gnparser/compare/v1.6.7...v1.6.8

diff --git a/ent/parser/ast.go b/ent/parser/ast.go
@@ -788,7 +788,7 @@ func (p *Engine) newUninomialComboNode(n *node32) *uninomialComboNode {
 		u1 = &uninomialNode{Word: uw}
 		n = n.next
 		u2w := p.newWordNode(n.up, parsed.UninomialType)
-		n := n.next
+		n = n.next
 		au2 := p.newAuthorshipNode(n)
 		rw := &parsed.Word{
 			Verbatim:   "subgen.",
@@ -822,6 +822,10 @@ func (p *Engine) newRankUninomialNode(n *node32) *rankUninomialNode {
 		run.Word.Normalized = "subgen."
 	case strings.HasPrefix(run.Word.Verbatim, "fam"):
 		run.Word.Normalized = "fam."
+	case strings.HasPrefix(run.Word.Verbatim, "tr"):
+		run.Word.Normalized = "trib."
+	case strings.HasPrefix(run.Word.Verbatim, "subtr"):
+		run.Word.Normalized = "subtrib."
 	}
 	return &run
 }

diff --git a/ent/parser/grammar.peg b/ent/parser/grammar.peg
@@ -112,8 +112,8 @@ UninomialCombo2 <- Uninomial _ RankUninomial _ Uninomial
 
 RankUninomial <- RankUninomialPlain / RankUninomialNotho
 
-RankUninomialPlain <- ('sect' / 'subsect' / 'trib' / 'subtrib' / 'subser' /
-  'ser' / 'subgen' / 'subg' / 'fam' / 'subfam' / 'div' /
+RankUninomialPlain <- ('sect' / 'subsect' / 'trib' / 'tr' / 'subtrib' /
+  'subtr' / 'subser' / 'ser' / 'subgen' / 'subg' / 'fam' / 'subfam' / 'div' /
   'supertrib') ('.' / &(SpaceCharEOI))
 
 RankUninomialNotho <- ('notho' _? ('sect' / 'gen' / 'ser' / 'subgeen' /