parse names with genus and species hybrid (close #287)

Author: dimus

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## [v1.11.6] - 2025-04-01 Tue
+
+- Add [#287]: parse names with genus and species hybrid.
+
 ## [v1.11.5] - 2025-03-30 Sun
 
 - Fix [#286]: parse names with named hybrid and comparison.
@@ -520,7 +524,8 @@
 
 This document follows [changelog guidelines]
 
-
+[v1.11.6]: https://github.com/gnames/gnparser/compare/v1.11.5...v1.11.6
+[v1.11.5]: https://github.com/gnames/gnparser/compare/v1.11.4...v1.11.5
 [v1.11.4]: https://github.com/gnames/gnparser/compare/v1.11.3...v1.11.4
 [v1.11.3]: https://github.com/gnames/gnparser/compare/v1.11.2...v1.11.3
 [v1.11.2]: https://github.com/gnames/gnparser/compare/v1.11.1...v1.11.2

ent/parser/ast.go

@@ -300,6 +300,16 @@ func (p *Engine) newNamedGenusHybridNode(n *node32) *namedGenusHybridNode {
 	annot := parsed.NoAnnot
 	hybr := p.newWordNode(n, parsed.HybridCharType)
 	n = n.next
+	if n.pegRule == ruleNamedSpeciesHybrid {
+		annot = parsed.NamedHybridAnnot
+		p.hybrid = &annot
+		name = p.newNamedSpeciesHybridNode(n)
+		nhn = &namedGenusHybridNode{
+			Hybrid:   hybr,
+			nameData: name,
+		}
+		return nhn
+	}
 	n = n.up
 	p.addWarn(parsed.HybridNamedWarn)
 	if n.begin == 1 {

ent/parser/grammar.peg

@@ -19,11 +19,11 @@ HybridFormulaPart <- HybridChar _ SpeciesEpithet (_ InfraspGroup)?
 
 NamedHybrid <- NamedGenusHybrid / NamedSpeciesHybrid
 
+NamedGenusHybrid <- HybridChar _? (NamedSpeciesHybrid / SingleName)
+
 NamedSpeciesHybrid <- GenusWord (_ Subgenus)? (_ Comparison)? _ HybridChar _?
   SpeciesEpithet (_ InfraspGroup)?
 
-NamedGenusHybrid <- HybridChar _? SingleName
-
 GraftChimeraFormula <- SingleName (_ (GraftChimeraFormulaPart / GraftChimeraFormulaFull))+
 
 GraftChimeraFormulaFull <- GraftChimeraChar (_ SingleName)?