From da7209922bc5ee5a8906bdd5f292d9d294cf329c Mon Sep 17 00:00:00 2001 From: Dmitry Mozzherin Date: Mon, 14 Mar 2022 10:14:49 -0500 Subject: [PATCH] use PEG instead of RegEx for preprocessing (close #223) --- .gitignore | 1 + CHANGELOG.md | 117 +- Makefile | 3 + config_test.go | 4 +- ent/internal/preparser/grammar.peg | 51 + ent/internal/preparser/grammar.peg.go | 4098 ++++++++++++++++++++ ent/internal/preparser/preparser.go | 46 + ent/internal/preparser/preparser_test.go | 117 + ent/internal/preprocess/preprocess.go | 49 +- ent/internal/preprocess/preprocess_test.go | 40 +- ent/parsed/annotation_test.go | 6 +- ent/parsed/warning_test.go | 6 +- ent/parser/engine.go | 393 +- ent/parser/parser.go | 4 +- ent/parser/parser_test.go | 12 +- ent/stemmer/stemmer_test.go | 8 +- ent/str/str_test.go | 252 +- gnparser/tools.go | 3 +- gnparser_test.go | 34 +- go.mod | 42 +- go.sum | 795 +--- io/web/web_internal_test.go | 416 +- testdata/test_data.md | 16 +- version.go | 2 +- 24 files changed, 5033 insertions(+), 1482 deletions(-) create mode 100644 ent/internal/preparser/grammar.peg create mode 100644 ent/internal/preparser/grammar.peg.go create mode 100644 ent/internal/preparser/preparser.go create mode 100644 ent/internal/preparser/preparser_test.go diff --git a/.gitignore b/.gitignore index 322d114..65f9319 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ build/** *.pprof *.test *.gif +__debug_bin diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d92b28..2984302 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,20 @@ ## Unreleased +## [v1.6.5] - 2022-03-21 Mon + +- Add [#223]: Use PEG parser for preprocess instead of RegEx. + This approach gives 15-17% speed increase. + ## [v1.6.4] - 2022-03-19 Sat - Add [#224]: Parse correctly italian authors with `degli`. -## [v1.6.3] - 2022-02-08 +## [v1.6.3] - 2022-02-08 Tue - Add [#222]: Improve logs for NSQ, switch to zerologs library. -## [v1.6.2] +## [v1.6.2] - 2022-02-04 Fri - Fix [#221]: No parsing for names with `cyanobacterium`. - Fix [#220]: `Crenarchaeote enrichment culture clone` should stop parsing @@ -18,20 +23,20 @@ - Fix [#219]: filter out `complex` word during preprocessing for names like `Aegla uruguayana complex`. -## [v1.6.1] +## [v1.6.1] - 2022-02-01 Sat - Add: use NSQ logger from sfgrp/lognsq -## [v1.6.0] +## [v1.6.0] - 2022-01-22 Sat - Add [#218]: enable/disable logs for web-services, allow logs aggregation with NSQd. -## [v1.5.7] +## [v1.5.7] - 2021-11-26 Fri - Fix: parsed.NormalizeByType preserves period char. -## [v1.5.6] +## [v1.5.6] - 2021-11-21 Sun - Add [#212]: Set year from 'ex' authorship as a year of a name. Add 'ex' authors to list of all authors. @@ -44,22 +49,22 @@ - Fix [#213]: Stop generating space between `Mc`, `Mac` and the rest of an an author name. -## [v1.5.5] +## [v1.5.5] - 2021-11-17 Wed - Add [#207]: PR [#209] by @tobymarsden, fix parsing of names with `nudum` specific epithet. -## [v1.5.4] +## [v1.5.4] - 2021-11-14 Sun - Add: different approach for normalize-by-type for words. - Add [#205]: allow genera starting with De-, Eu-, Le-, Ne- (by @tobymarsden). - Add [#203]: allow up to 2 dashes in genera (by @tobymarsden). -## [v1.5.3] +## [v1.5.3] - 2021-11-13 Sat - Add [#202]: add NormalizeMore function for Word. -## [v1.5.2] +## [v1.5.2] - 2021-11-10 Wed - Add [#200]: support for 'div.' rank in uninomial combinations. - Add [#199]: fixes for several names that were not parsed correctly. @@ -69,30 +74,30 @@ - Add [#84]: parse "Muscicapa randi Amadon & duPont, 1970". - Add [#83]: parse authors like 'Laverde-R.'. -## [v1.5.1] +## [v1.5.1] - 2021-11-01 Mon - Add [#191]: support for ambiguous specific epithets -## [v1.5.0] +## [v1.5.0] - 2021-10-22 Fri - Add [#194]: support for cultivars' graft-chymeras (courtesy of @tobymarsden) -## [v1.4.2] +## [v1.4.2] - 2021-10-21 Thu - Add [#196]: parse authors with prefix 'ver' -## [v1.4.1] +## [v1.4.1] - 2021-10-07 Thu - Fix [#195]: parse multinomials where authorshp is not separated by space. -## [v1.4.0] +## [v1.4.0] - 2021-09-4 Sat - Add [#193]: add TSV format for output. - Add [#190]: support prefixes `do` and `de los` for authors. - Add [#187]: support `ter` suffix for authors. - Add [#186]: support non-ASCII apostrophe in authors. -## [v1.3.3] +## [v1.3.3] - 2021-09-11 Wed - Add [#176]: refactoring of hybrid sign treatment (use PEG instead of RegEx for normalizing `x`, `X`, and `×`. @@ -100,17 +105,17 @@ `ms in` as `in` or `ex` for exAuthors. - Add [#182]: support for authors with prefixes `ten`, `delle`, `dos`. -## [v1.3.2] +## [v1.3.2] - 2021-08-02 Mon - Add [#182]: support `Do`, `Oo`, `Nu` 2-letter genera. - Add [#53]: exceptions to annotations (`Bottaria nudum` for example). - Fix: names where sp epithet starts with `cf` can be parsed now. -## [v1.3.1] +## [v1.3.1] - 2021-07-17 Sat - Add [#180]: Zenodo DOI. -## [v1.3.0] +## [v1.3.0] - 2021-06-29 Tue - Add [#179]: cultivars info to README. - Add [#178]: parse cultivars via REST API. @@ -122,24 +127,24 @@ - Fix [#174]: Hybrid character is missed or wrong in details' `Words` section. -## [v1.2.0] +## [v1.2.0] - 2021-04-08 Thu - Add [#169]: option to capitalize first letter of name-strings. - Add [#166]: support 'fm.' as 'forma'. -## [v1.1.0] +## [v1.1.0] - 2021-03-21 Sun - Add [#163]: support bacterial `Candidatus` names. - Add [#162]: show PEG AST tree for debugging. - Add [#161]: add automatic tools dependency. - Add [#160]: use embed feature of Go v1.16. -## [v1.0.13] +## [v1.0.13] - 2021-02-23 Tue - Add: limit nightly builds to master only. - Fix [#159]: POST method contains w18rong URL. -## [v1.0.12] +## [v1.0.12] - 2021-02-21 Sun - Add [#154]: parse names with ambiguous `f.` as forma if there is a space between authr and `f.`. If there is @@ -147,59 +152,59 @@ warning in both cases. - Add: PHP example from @barotto about using pipes with gnparser. -## [v1.0.11] +## [v1.0.11] - 2021-02-20 Sat - Fix [#153]: flags `csv=false` and `with_details=false` trigger opposite behavior. -## [v1.0.10] +## [v1.0.10] - 2021-02-19 Fri - Add [#152]: change auto-prereleases from nightly to on master submit. - Add [#151]: do not parse names with `(endo|ecto)?symbiont`. - Add [#150]: ignore serovar/serotype in bacerital names. - Add [#149]: support abbreviated subgenus (`Aus (B.) cus`). -## [v1.0.9] +## [v1.0.9] - 2021-02-17 Wed - Add [#146]: unordered flag. - Add [#145]: better CI/build actions, add nightly binaries. - Fix [#144]: remove configuration file as it creates more problems than solves. -## [v1.0.8] +## [v1.0.8] - 2021-02-15 Mon - Add: remove config message for CLI app. - Add: ldflags `-s -w` to decrease binary size. - Fix: header does not show in CSV format for stream. -## [v1.0.7] +## [v1.0.7] - 2021-02-14 Sun - Add [#143]: `quiet` flag to suppress showing progress output. - Fix [#142]: stream waits until certain names number is equal the batch size. - Fix [#141]: config file is not created. -## [v1.0.6] +## [v1.0.6] - 2021-02-04 Thu - Add: update version handling, readme. -## [v1.0.5] +## [v1.0.5] - 2021-02-01 Mon - Add: remove gnlib package. - Add [#140]: remove config package. -## [v1.0.4] +## [v1.0.4] - 2021-01-23 Sat - Add: cleanup constructor methods names. -## [v1.0.3] +## [v1.0.3] - 2021-01-23 Sat - Add [#139]: make package names less abstract. -## [v1.0.2] +## [v1.0.2] - 2021-01-22 Fri - Fix [#137]: add correct VerbatimID for HTML-containing names. -## [v1.0.1] +## [v1.0.1] - 2021-01-20 Wed - Add [#136]: Man page - Add [#100]: Switch continuous integration to use GitHub Actions. @@ -207,7 +212,7 @@ - Fix [#135]: Changes: SubGenus->Subgenus, InfraSpecies->Infraspecies -## [v1.0.0] +## [v1.0.0] - 2021-01-19 Tue - Add [#127]: Update documentation to v1.0.0. - Add [#122]: Implement parsing as a stream in addition to batch parsing. @@ -239,58 +244,58 @@ - Add [#99]: Move code to GitHub and change links accordingly. - Add [#95]: Remove dependency on gRPC and protobuf. -## [v0.14.4] +## [v0.14.4] - 2020-12-15 Tue - Add [#96]: Do not parse names starting with "Candidatus". - Add [#93]: Parse 'y' (Spanish '&') as an author separator. -## [v0.14.3] +## [v0.14.3] - 2020-12-13 Sun - Add [#95]: Remove make dependency on gRPC tooling. - Add [#94]: Do not parse names with "bacterium" "epithet. -## [v0.14.2] +## [v0.14.2] - 2020-05-12 Tue - Add [#90]: Allow `ß` in names. - Add [#89]: Support `subspec.` as a rank. - Add [#82]: Support authors with prefix `zu`. -## [v0.14.1] +## [v0.14.1] - 2020-05-07 Thu - Fix: Change web API from default to Compact format to get correct API output. -## [v0.14.0] +## [v0.14.0] - 2020-05-07 Thu - Add [#81]: Add year range in format "1888/89". - Add [#80]: Add Cardinality to parser outputs. - Add [#79]: Make CSV the default format for CLI. - Add [#78]: Take into account `non-virus` names that look like virus names. -## [v0.13.1] +## [v0.13.1] - 2020-03-05 Thu - Fix [#77]: Memory leak when used as clib. - Fix [#76]: Non ASCII apostrophe does not show up in canonical. -## [v0.13.0] +## [v0.13.0] - 2020-02-12 Wed - Add [#74]: Simple format output is now in CSV format. - Add [#73]: Improve speed by using ragel's FSM instead of regex. - Fix [#75]: Normalize subspecies to `subsp.` instead of `ssp.`. - Fix [#72]: Surrogate detection by `gnparser.ParseToObject` method. -## [v0.12.0] +## [v0.12.0] - 2019-11-18 Mon - Add [#71]: do not parse 'Unnamed clade...'. - Add [#69]: gnparser as a shared C library. - Add: Make dynamic version using ldflags. - Fix [#70]: parse 'Remera cvancarai' correctly. -## [v0.11.0] +## [v0.11.0] - 2019-10-24 Thu - Add [#68]: add stemmed version of canonical form to outputs. - Add: benchmarks to gnparser_test.go -## [v0.10.0] +## [v0.10.0] - 2019-09-10 Tue - Add [#67]: field `authorship` of the name for JSON output - Add [#66]: remove HTML tags during parsing instead of a separate step. @@ -298,7 +303,7 @@ - Add [#60]: handle correctly deprecated ranks with Greek letters. - Fix [#62]: parser breaks on `Drepanolejeunea (Spruce) (Steph.)`. -## [v0.9.0] +## [v0.9.0] - 2019-08-16 Fri - Add [#65]: gRPC is able to return a protobuf object now instead of JSON. string (only for ParseArray function so far). The same protobuf object is now @@ -307,14 +312,14 @@ array of names instead of a stream. - Add [#63]: abbreviation for `form` or `forma` is now `f.` instead of `fm.`. -## [v0.8.0] +## [v0.8.0] - 2019-04-10 Wed - Add [#51]: strings like `Aus (Bus)` are parsed differently for ICN and ICZN names. If string inside of parenthesis matches known ICN author name is parsed as `Uninomial (Author)`, otherwise it is parsed as `Aus subgen. Bus`. -## [v0.7.5] +## [v0.7.5] - 2019-03-31 Sun - Add [#59]: method `ParseToObject` to avoid JSON in Go programs. - Add [#58]: parse `Aus (Bus)` as `Uninomial (Author)` to prevent botanical @@ -322,14 +327,14 @@ - Add [#57]: warning in cases of an ambiguous `filius`. - Fix [#56]: bug `Ambrysus-Stål, 1862` breaks parser. -## [v0.7.4] +## [v0.7.4] - 2019-02-12 Tue - Add [#48]: transliteration of diacriticals. - Add [#43]: notho- (hybrids) rank supported. - Add [#52]: genera with hyphens with lower or upper char after hyphen. - Add [#49]: multiple hyphens in specific epithet. -## [v0.7.3] +## [v0.7.3] - 2019-02-04 Mon - Add [#54]: add cleaning functions to gRPC - Add [#46]: add `supg.` rank @@ -337,16 +342,16 @@ - Add [#44]: documentation for canonicalName fields - Add [#42]: tests for command line app -## [v0.7.2] +## [v0.7.2] - 2019-02-01 Fri - Add [#41]: parse/clean multiple names from standard input. -## [v0.7.1] +## [v0.7.1] - 2019-01-24 Thu - Add [#40]: add names with missing parenthesis for combination authors. - Fix: remove typo for Scala parser URL on the parser web-page. -## [v0.7.0] +## [v0.7.0] - 2019-01-23 Wed - Add [#38]: docker image can do gRPC, REST, CLI - Add [#37]: flag for cleanup HTML entities and tags, @@ -357,14 +362,14 @@ - Add [#34]: escape HTML entities, remove common tags. - Add [#33]: Web-based user interface and REST API. -## [v0.6.0] +## [v0.6.0] - 2019-01-16 Wed - Add [#35]: gRPC method to preserve order in output according to input - Add [#30]: write inline and README documentation. - Add [#29]: docker and dockerhub support. - Add [#26]: get all parser rules to CamelCase format. -## [v0.5.1] +## [v0.5.1] - 2019-01-15 Tue - Add: fix Makefile - Add [#28]: non-ASCII apostrophe support. @@ -384,6 +389,8 @@ This document follows [changelog guidelines] +[v1.6.5]: https://github.com/gnames/gnparser/compare/v1.6.4...v1.6.5 +[v1.6.4]: https://github.com/gnames/gnparser/compare/v1.6.3...v1.6.4 [v1.6.3]: https://github.com/gnames/gnparser/compare/v1.6.2...v1.6.3 [v1.6.2]: https://github.com/gnames/gnparser/compare/v1.6.1...v1.6.2 [v1.6.1]: https://github.com/gnames/gnparser/compare/v1.6.0...v1.6.1 diff --git a/Makefile b/Makefile index 54c3c70..555944e 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ peg: cd ent/parser; \ peg grammar.peg; \ goimports -w grammar.peg.go; \ + cd ../internal/preparser; \ + peg grammar.peg; \ + goimports -w grammar.peg.go; ragel: cd ent/internal/preprocess; \ diff --git a/config_test.go b/config_test.go index 7a4fa34..768cef4 100644 --- a/config_test.go +++ b/config_test.go @@ -20,7 +20,7 @@ func TestNew(t *testing.T) { Port: 8080, IsTest: false, } - assert.Equal(t, cfg, deflt) + assert.Equal(t, deflt, cfg) } func TestNewOpts(t *testing.T) { @@ -34,7 +34,7 @@ func TestNewOpts(t *testing.T) { WithDetails: true, Port: 8989, } - assert.Equal(t, cnf, updt) + assert.Equal(t, updt, cnf) } func opts() []gnparser.Option { diff --git a/ent/internal/preparser/grammar.peg b/ent/internal/preparser/grammar.peg new file mode 100644 index 0000000..cffe9dd --- /dev/null +++ b/ent/internal/preparser/grammar.peg @@ -0,0 +1,51 @@ +package preparser + +type PreParser Peg { PreString } + +String <- _? (Head Tail? / TailPhrase .*) SpaceOrEnd + +Head <- Word (CommaSpace Word)* &(Tail / SpaceOrEnd) + +Tail <- { p.tailIndex = int(token.begin) } CommaSpace TailPhrase .* + +Word <- !TailPhrase [^, ]+ / ',' + +TailPhrase <- TailLastWordJunk / TailPhrase4 / TailPhrase3 / + TailStopWords / TailPhrase2 / TailPhrase1 + +TailLastWordJunk <- (("var" / "ined" / "ssp" / "subsp" / "subgen" ) '.'? / + "sensu" / "new" / "non" / "nec" / "hybrid" / "von") '?'? &SpaceOrEnd + +TailPhrase4 <- ("pro" _ "parte" / "nomen") &NotLetterOrEnd / "p." _? "p." / + "nom." / "comb." + +TailPhrase3 <- '('? 's' ('.' _? / _ ) ('s' '.'? &NotLetterOrEnd / 'l.' / 'str.' / + 'lat.') + +TailStopWords <- ("environmental" / "enrichment" / "samples" / + ("species" _)? ("group" / "complex") / "clade" / + "author" / "nec" / "vide" / "fide" / "non" ) &NotLetterOrEnd + +TailPhrase2 <- ("sero" ("var" / "type") / "sensu" / "auct" / "sec" / "near" / + "str") '.'? &NotLetterOrEnd + +TailPhrase1 <- (('('? ('ht' / 'hort')) / 'spec' / + 'nov' '.'? _ 'spec') '.'? &NotLetterOrEnd + +SpaceOrEnd <- CommaSpace? END + +CommaSpace <- (_? ',' _?)+ / _ + +_ <- MultipleSpace / SingleSpace + +NotLetterOrEnd <- NotLetter / END + +NotLetter <- [[^A-Z0-9_\-]] + +MultipleSpace <- SingleSpace SingleSpace+ + +SingleSpace <- ' ' / OtherSpace + +OtherSpace <- [　 \t\r\n\f\v] + +END <- !. diff --git a/ent/internal/preparser/grammar.peg.go b/ent/internal/preparser/grammar.peg.go new file mode 100644 index 0000000..f19109e --- /dev/null +++ b/ent/internal/preparser/grammar.peg.go @@ -0,0 +1,4098 @@ +package preparser + +// Code generated by peg grammar.peg DO NOT EDIT. + +import ( + "fmt" + "io" + "os" + "sort" + "strconv" + "strings" +) + +const endSymbol rune = 1114112 + +/* The rule types inferred from the grammar are below. */ +type pegRule uint8 + +const ( + ruleUnknown pegRule = iota + ruleString + ruleHead + ruleTail + ruleWord + ruleTailPhrase + ruleTailLastWordJunk + ruleTailPhrase4 + ruleTailPhrase3 + ruleTailStopWords + ruleTailPhrase2 + ruleTailPhrase1 + ruleSpaceOrEnd + ruleCommaSpace + rule_ + ruleNotLetterOrEnd + ruleNotLetter + ruleMultipleSpace + ruleSingleSpace + ruleOtherSpace + ruleEND + ruleAction0 +) + +var rul3s = [...]string{ + "Unknown", + "String", + "Head", + "Tail", + "Word", + "TailPhrase", + "TailLastWordJunk", + "TailPhrase4", + "TailPhrase3", + "TailStopWords", + "TailPhrase2", + "TailPhrase1", + "SpaceOrEnd", + "CommaSpace", + "_", + "NotLetterOrEnd", + "NotLetter", + "MultipleSpace", + "SingleSpace", + "OtherSpace", + "END", + "Action0", +} + +type token32 struct { + pegRule + begin, end uint32 +} + +func (t *token32) String() string { + return fmt.Sprintf("\x1B[34m%v\x1B[m %v %v", rul3s[t.pegRule], t.begin, t.end) +} + +type node32 struct { + token32 + up, next *node32 +} + +func (node *node32) print(w io.Writer, pretty bool, buffer string) { + var print func(node *node32, depth int) + print = func(node *node32, depth int) { + for node != nil { + for c := 0; c < depth; c++ { + fmt.Fprintf(w, " ") + } + rule := rul3s[node.pegRule] + quote := strconv.Quote(string(([]rune(buffer)[node.begin:node.end]))) + if !pretty { + fmt.Fprintf(w, "%v %v\n", rule, quote) + } else { + fmt.Fprintf(w, "\x1B[36m%v\x1B[m %v\n", rule, quote) + } + if node.up != nil { + print(node.up, depth+1) + } + node = node.next + } + } + print(node, 0) +} + +func (node *node32) Print(w io.Writer, buffer string) { + node.print(w, false, buffer) +} + +func (node *node32) PrettyPrint(w io.Writer, buffer string) { + node.print(w, true, buffer) +} + +type tokens32 struct { + tree []token32 +} + +func (t *tokens32) Trim(length uint32) { + t.tree = t.tree[:length] +} + +func (t *tokens32) Print() { + for _, token := range t.tree { + fmt.Println(token.String()) + } +} + +func (t *tokens32) AST() *node32 { + type element struct { + node *node32 + down *element + } + tokens := t.Tokens() + var stack *element + for _, token := range tokens { + if token.begin == token.end { + continue + } + node := &node32{token32: token} + for stack != nil && stack.node.begin >= token.begin && stack.node.end <= token.end { + stack.node.next = node.up + node.up = stack.node + stack = stack.down + } + stack = &element{node: node, down: stack} + } + if stack != nil { + return stack.node + } + return nil +} + +func (t *tokens32) PrintSyntaxTree(buffer string) { + t.AST().Print(os.Stdout, buffer) +} + +func (t *tokens32) WriteSyntaxTree(w io.Writer, buffer string) { + t.AST().Print(w, buffer) +} + +func (t *tokens32) PrettyPrintSyntaxTree(buffer string) { + t.AST().PrettyPrint(os.Stdout, buffer) +} + +func (t *tokens32) Add(rule pegRule, begin, end, index uint32) { + tree, i := t.tree, int(index) + if i >= len(tree) { + t.tree = append(tree, token32{pegRule: rule, begin: begin, end: end}) + return + } + tree[i] = token32{pegRule: rule, begin: begin, end: end} +} + +func (t *tokens32) Tokens() []token32 { + return t.tree +} + +type PreParser struct { + PreString + Buffer string + buffer []rune + rules [22]func() bool + parse func(rule ...int) error + reset func() + Pretty bool + tokens32 +} + +func (p *PreParser) Parse(rule ...int) error { + return p.parse(rule...) +} + +func (p *PreParser) Reset() { + p.reset() +} + +type textPosition struct { + line, symbol int +} + +type textPositionMap map[int]textPosition + +func translatePositions(buffer []rune, positions []int) textPositionMap { + length, translations, j, line, symbol := len(positions), make(textPositionMap, len(positions)), 0, 1, 0 + sort.Ints(positions) + +search: + for i, c := range buffer { + if c == '\n' { + line, symbol = line+1, 0 + } else { + symbol++ + } + if i == positions[j] { + translations[positions[j]] = textPosition{line, symbol} + for j++; j < length; j++ { + if i != positions[j] { + continue search + } + } + break search + } + } + + return translations +} + +type parseError struct { + p *PreParser + max token32 +} + +func (e *parseError) Error() string { + tokens, err := []token32{e.max}, "\n" + positions, p := make([]int, 2*len(tokens)), 0 + for _, token := range tokens { + positions[p], p = int(token.begin), p+1 + positions[p], p = int(token.end), p+1 + } + translations := translatePositions(e.p.buffer, positions) + format := "parse error near %v (line %v symbol %v - line %v symbol %v):\n%v\n" + if e.p.Pretty { + format = "parse error near \x1B[34m%v\x1B[m (line %v symbol %v - line %v symbol %v):\n%v\n" + } + for _, token := range tokens { + begin, end := int(token.begin), int(token.end) + err += fmt.Sprintf(format, + rul3s[token.pegRule], + translations[begin].line, translations[begin].symbol, + translations[end].line, translations[end].symbol, + strconv.Quote(string(e.p.buffer[begin:end]))) + } + + return err +} + +func (p *PreParser) PrintSyntaxTree() { + if p.Pretty { + p.tokens32.PrettyPrintSyntaxTree(p.Buffer) + } else { + p.tokens32.PrintSyntaxTree(p.Buffer) + } +} + +func (p *PreParser) WriteSyntaxTree(w io.Writer) { + p.tokens32.WriteSyntaxTree(w, p.Buffer) +} + +func (p *PreParser) SprintSyntaxTree() string { + var bldr strings.Builder + p.WriteSyntaxTree(&bldr) + return bldr.String() +} + +func (p *PreParser) Execute() { + buffer, _buffer, text, begin, end := p.Buffer, p.buffer, "", 0, 0 + for _, token := range p.Tokens() { + switch token.pegRule { + + case ruleAction0: + p.tailIndex = int(token.begin) + + } + } + _, _, _, _, _ = buffer, _buffer, text, begin, end +} + +func Pretty(pretty bool) func(*PreParser) error { + return func(p *PreParser) error { + p.Pretty = pretty + return nil + } +} + +func Size(size int) func(*PreParser) error { + return func(p *PreParser) error { + p.tokens32 = tokens32{tree: make([]token32, 0, size)} + return nil + } +} +func (p *PreParser) Init(options ...func(*PreParser) error) error { + var ( + max token32 + position, tokenIndex uint32 + buffer []rune + ) + for _, option := range options { + err := option(p) + if err != nil { + return err + } + } + p.reset = func() { + max = token32{} + position, tokenIndex = 0, 0 + + p.buffer = []rune(p.Buffer) + if len(p.buffer) == 0 || p.buffer[len(p.buffer)-1] != endSymbol { + p.buffer = append(p.buffer, endSymbol) + } + buffer = p.buffer + } + p.reset() + + _rules := p.rules + tree := p.tokens32 + p.parse = func(rule ...int) error { + r := 1 + if len(rule) > 0 { + r = rule[0] + } + matches := p.rules[r]() + p.tokens32 = tree + if matches { + p.Trim(tokenIndex) + return nil + } + return &parseError{p, max} + } + + add := func(rule pegRule, begin uint32) { + tree.Add(rule, begin, position, tokenIndex) + tokenIndex++ + if begin != position && position > max.end { + max = token32{rule, begin, position} + } + } + + matchDot := func() bool { + if buffer[position] != endSymbol { + position++ + return true + } + return false + } + + /*matchChar := func(c byte) bool { + if buffer[position] == c { + position++ + return true + } + return false + }*/ + + /*matchRange := func(lower byte, upper byte) bool { + if c := buffer[position]; c >= lower && c <= upper { + position++ + return true + } + return false + }*/ + + _rules = [...]func() bool{ + nil, + /* 0 String <- <(_? ((Head Tail?) / (TailPhrase .*)) SpaceOrEnd)> */ + func() bool { + position0, tokenIndex0 := position, tokenIndex + { + position1 := position + { + position2, tokenIndex2 := position, tokenIndex + if !_rules[rule_]() { + goto l2 + } + goto l3 + l2: + position, tokenIndex = position2, tokenIndex2 + } + l3: + { + position4, tokenIndex4 := position, tokenIndex + if !_rules[ruleHead]() { + goto l5 + } + { + position6, tokenIndex6 := position, tokenIndex + if !_rules[ruleTail]() { + goto l6 + } + goto l7 + l6: + position, tokenIndex = position6, tokenIndex6 + } + l7: + goto l4 + l5: + position, tokenIndex = position4, tokenIndex4 + if !_rules[ruleTailPhrase]() { + goto l0 + } + l8: + { + position9, tokenIndex9 := position, tokenIndex + if !matchDot() { + goto l9 + } + goto l8 + l9: + position, tokenIndex = position9, tokenIndex9 + } + } + l4: + if !_rules[ruleSpaceOrEnd]() { + goto l0 + } + add(ruleString, position1) + } + return true + l0: + position, tokenIndex = position0, tokenIndex0 + return false + }, + /* 1 Head <- <(Word (CommaSpace Word)* &(Tail / SpaceOrEnd))> */ + func() bool { + position10, tokenIndex10 := position, tokenIndex + { + position11 := position + if !_rules[ruleWord]() { + goto l10 + } + l12: + { + position13, tokenIndex13 := position, tokenIndex + if !_rules[ruleCommaSpace]() { + goto l13 + } + if !_rules[ruleWord]() { + goto l13 + } + goto l12 + l13: + position, tokenIndex = position13, tokenIndex13 + } + { + position14, tokenIndex14 := position, tokenIndex + { + position15, tokenIndex15 := position, tokenIndex + if !_rules[ruleTail]() { + goto l16 + } + goto l15 + l16: + position, tokenIndex = position15, tokenIndex15 + if !_rules[ruleSpaceOrEnd]() { + goto l10 + } + } + l15: + position, tokenIndex = position14, tokenIndex14 + } + add(ruleHead, position11) + } + return true + l10: + position, tokenIndex = position10, tokenIndex10 + return false + }, + /* 2 Tail <- <(Action0 CommaSpace TailPhrase .*)> */ + func() bool { + position17, tokenIndex17 := position, tokenIndex + { + position18 := position + if !_rules[ruleAction0]() { + goto l17 + } + if !_rules[ruleCommaSpace]() { + goto l17 + } + if !_rules[ruleTailPhrase]() { + goto l17 + } + l19: + { + position20, tokenIndex20 := position, tokenIndex + if !matchDot() { + goto l20 + } + goto l19 + l20: + position, tokenIndex = position20, tokenIndex20 + } + add(ruleTail, position18) + } + return true + l17: + position, tokenIndex = position17, tokenIndex17 + return false + }, + /* 3 Word <- <((!TailPhrase (!(',' / ' ') .)+) / ',')> */ + func() bool { + position21, tokenIndex21 := position, tokenIndex + { + position22 := position + { + position23, tokenIndex23 := position, tokenIndex + { + position25, tokenIndex25 := position, tokenIndex + if !_rules[ruleTailPhrase]() { + goto l25 + } + goto l24 + l25: + position, tokenIndex = position25, tokenIndex25 + } + { + position28, tokenIndex28 := position, tokenIndex + { + position29, tokenIndex29 := position, tokenIndex + if buffer[position] != rune(',') { + goto l30 + } + position++ + goto l29 + l30: + position, tokenIndex = position29, tokenIndex29 + if buffer[position] != rune(' ') { + goto l28 + } + position++ + } + l29: + goto l24 + l28: + position, tokenIndex = position28, tokenIndex28 + } + if !matchDot() { + goto l24 + } + l26: + { + position27, tokenIndex27 := position, tokenIndex + { + position31, tokenIndex31 := position, tokenIndex + { + position32, tokenIndex32 := position, tokenIndex + if buffer[position] != rune(',') { + goto l33 + } + position++ + goto l32 + l33: + position, tokenIndex = position32, tokenIndex32 + if buffer[position] != rune(' ') { + goto l31 + } + position++ + } + l32: + goto l27 + l31: + position, tokenIndex = position31, tokenIndex31 + } + if !matchDot() { + goto l27 + } + goto l26 + l27: + position, tokenIndex = position27, tokenIndex27 + } + goto l23 + l24: + position, tokenIndex = position23, tokenIndex23 + if buffer[position] != rune(',') { + goto l21 + } + position++ + } + l23: + add(ruleWord, position22) + } + return true + l21: + position, tokenIndex = position21, tokenIndex21 + return false + }, + /* 4 TailPhrase <- <(TailLastWordJunk / TailPhrase4 / TailPhrase3 / TailStopWords / TailPhrase2 / TailPhrase1)> */ + func() bool { + position34, tokenIndex34 := position, tokenIndex + { + position35 := position + { + position36, tokenIndex36 := position, tokenIndex + if !_rules[ruleTailLastWordJunk]() { + goto l37 + } + goto l36 + l37: + position, tokenIndex = position36, tokenIndex36 + if !_rules[ruleTailPhrase4]() { + goto l38 + } + goto l36 + l38: + position, tokenIndex = position36, tokenIndex36 + if !_rules[ruleTailPhrase3]() { + goto l39 + } + goto l36 + l39: + position, tokenIndex = position36, tokenIndex36 + if !_rules[ruleTailStopWords]() { + goto l40 + } + goto l36 + l40: + position, tokenIndex = position36, tokenIndex36 + if !_rules[ruleTailPhrase2]() { + goto l41 + } + goto l36 + l41: + position, tokenIndex = position36, tokenIndex36 + if !_rules[ruleTailPhrase1]() { + goto l34 + } + } + l36: + add(ruleTailPhrase, position35) + } + return true + l34: + position, tokenIndex = position34, tokenIndex34 + return false + }, + /* 5 TailLastWordJunk <- <(((((('v' / 'V') ('a' / 'A') ('r' / 'R')) / (('i' / 'I') ('n' / 'N') ('e' / 'E') ('d' / 'D')) / (('s' / 'S') ('s' / 'S') ('p' / 'P')) / (('s' / 'S') ('u' / 'U') ('b' / 'B') ('s' / 'S') ('p' / 'P')) / (('s' / 'S') ('u' / 'U') ('b' / 'B') ('g' / 'G') ('e' / 'E') ('n' / 'N'))) '.'?) / (('s' / 'S') ('e' / 'E') ('n' / 'N') ('s' / 'S') ('u' / 'U')) / (('n' / 'N') ('e' / 'E') ('w' / 'W')) / (('n' / 'N') ('o' / 'O') ('n' / 'N')) / (('n' / 'N') ('e' / 'E') ('c' / 'C')) / (('h' / 'H') ('y' / 'Y') ('b' / 'B') ('r' / 'R') ('i' / 'I') ('d' / 'D')) / (('v' / 'V') ('o' / 'O') ('n' / 'N'))) '?'? &SpaceOrEnd)> */ + func() bool { + position42, tokenIndex42 := position, tokenIndex + { + position43 := position + { + position44, tokenIndex44 := position, tokenIndex + { + position46, tokenIndex46 := position, tokenIndex + { + position48, tokenIndex48 := position, tokenIndex + if buffer[position] != rune('v') { + goto l49 + } + position++ + goto l48 + l49: + position, tokenIndex = position48, tokenIndex48 + if buffer[position] != rune('V') { + goto l47 + } + position++ + } + l48: + { + position50, tokenIndex50 := position, tokenIndex + if buffer[position] != rune('a') { + goto l51 + } + position++ + goto l50 + l51: + position, tokenIndex = position50, tokenIndex50 + if buffer[position] != rune('A') { + goto l47 + } + position++ + } + l50: + { + position52, tokenIndex52 := position, tokenIndex + if buffer[position] != rune('r') { + goto l53 + } + position++ + goto l52 + l53: + position, tokenIndex = position52, tokenIndex52 + if buffer[position] != rune('R') { + goto l47 + } + position++ + } + l52: + goto l46 + l47: + position, tokenIndex = position46, tokenIndex46 + { + position55, tokenIndex55 := position, tokenIndex + if buffer[position] != rune('i') { + goto l56 + } + position++ + goto l55 + l56: + position, tokenIndex = position55, tokenIndex55 + if buffer[position] != rune('I') { + goto l54 + } + position++ + } + l55: + { + position57, tokenIndex57 := position, tokenIndex + if buffer[position] != rune('n') { + goto l58 + } + position++ + goto l57 + l58: + position, tokenIndex = position57, tokenIndex57 + if buffer[position] != rune('N') { + goto l54 + } + position++ + } + l57: + { + position59, tokenIndex59 := position, tokenIndex + if buffer[position] != rune('e') { + goto l60 + } + position++ + goto l59 + l60: + position, tokenIndex = position59, tokenIndex59 + if buffer[position] != rune('E') { + goto l54 + } + position++ + } + l59: + { + position61, tokenIndex61 := position, tokenIndex + if buffer[position] != rune('d') { + goto l62 + } + position++ + goto l61 + l62: + position, tokenIndex = position61, tokenIndex61 + if buffer[position] != rune('D') { + goto l54 + } + position++ + } + l61: + goto l46 + l54: + position, tokenIndex = position46, tokenIndex46 + { + position64, tokenIndex64 := position, tokenIndex + if buffer[position] != rune('s') { + goto l65 + } + position++ + goto l64 + l65: + position, tokenIndex = position64, tokenIndex64 + if buffer[position] != rune('S') { + goto l63 + } + position++ + } + l64: + { + position66, tokenIndex66 := position, tokenIndex + if buffer[position] != rune('s') { + goto l67 + } + position++ + goto l66 + l67: + position, tokenIndex = position66, tokenIndex66 + if buffer[position] != rune('S') { + goto l63 + } + position++ + } + l66: + { + position68, tokenIndex68 := position, tokenIndex + if buffer[position] != rune('p') { + goto l69 + } + position++ + goto l68 + l69: + position, tokenIndex = position68, tokenIndex68 + if buffer[position] != rune('P') { + goto l63 + } + position++ + } + l68: + goto l46 + l63: + position, tokenIndex = position46, tokenIndex46 + { + position71, tokenIndex71 := position, tokenIndex + if buffer[position] != rune('s') { + goto l72 + } + position++ + goto l71 + l72: + position, tokenIndex = position71, tokenIndex71 + if buffer[position] != rune('S') { + goto l70 + } + position++ + } + l71: + { + position73, tokenIndex73 := position, tokenIndex + if buffer[position] != rune('u') { + goto l74 + } + position++ + goto l73 + l74: + position, tokenIndex = position73, tokenIndex73 + if buffer[position] != rune('U') { + goto l70 + } + position++ + } + l73: + { + position75, tokenIndex75 := position, tokenIndex + if buffer[position] != rune('b') { + goto l76 + } + position++ + goto l75 + l76: + position, tokenIndex = position75, tokenIndex75 + if buffer[position] != rune('B') { + goto l70 + } + position++ + } + l75: + { + position77, tokenIndex77 := position, tokenIndex + if buffer[position] != rune('s') { + goto l78 + } + position++ + goto l77 + l78: + position, tokenIndex = position77, tokenIndex77 + if buffer[position] != rune('S') { + goto l70 + } + position++ + } + l77: + { + position79, tokenIndex79 := position, tokenIndex + if buffer[position] != rune('p') { + goto l80 + } + position++ + goto l79 + l80: + position, tokenIndex = position79, tokenIndex79 + if buffer[position] != rune('P') { + goto l70 + } + position++ + } + l79: + goto l46 + l70: + position, tokenIndex = position46, tokenIndex46 + { + position81, tokenIndex81 := position, tokenIndex + if buffer[position] != rune('s') { + goto l82 + } + position++ + goto l81 + l82: + position, tokenIndex = position81, tokenIndex81 + if buffer[position] != rune('S') { + goto l45 + } + position++ + } + l81: + { + position83, tokenIndex83 := position, tokenIndex + if buffer[position] != rune('u') { + goto l84 + } + position++ + goto l83 + l84: + position, tokenIndex = position83, tokenIndex83 + if buffer[position] != rune('U') { + goto l45 + } + position++ + } + l83: + { + position85, tokenIndex85 := position, tokenIndex + if buffer[position] != rune('b') { + goto l86 + } + position++ + goto l85 + l86: + position, tokenIndex = position85, tokenIndex85 + if buffer[position] != rune('B') { + goto l45 + } + position++ + } + l85: + { + position87, tokenIndex87 := position, tokenIndex + if buffer[position] != rune('g') { + goto l88 + } + position++ + goto l87 + l88: + position, tokenIndex = position87, tokenIndex87 + if buffer[position] != rune('G') { + goto l45 + } + position++ + } + l87: + { + position89, tokenIndex89 := position, tokenIndex + if buffer[position] != rune('e') { + goto l90 + } + position++ + goto l89 + l90: + position, tokenIndex = position89, tokenIndex89 + if buffer[position] != rune('E') { + goto l45 + } + position++ + } + l89: + { + position91, tokenIndex91 := position, tokenIndex + if buffer[position] != rune('n') { + goto l92 + } + position++ + goto l91 + l92: + position, tokenIndex = position91, tokenIndex91 + if buffer[position] != rune('N') { + goto l45 + } + position++ + } + l91: + } + l46: + { + position93, tokenIndex93 := position, tokenIndex + if buffer[position] != rune('.') { + goto l93 + } + position++ + goto l94 + l93: + position, tokenIndex = position93, tokenIndex93 + } + l94: + goto l44 + l45: + position, tokenIndex = position44, tokenIndex44 + { + position96, tokenIndex96 := position, tokenIndex + if buffer[position] != rune('s') { + goto l97 + } + position++ + goto l96 + l97: + position, tokenIndex = position96, tokenIndex96 + if buffer[position] != rune('S') { + goto l95 + } + position++ + } + l96: + { + position98, tokenIndex98 := position, tokenIndex + if buffer[position] != rune('e') { + goto l99 + } + position++ + goto l98 + l99: + position, tokenIndex = position98, tokenIndex98 + if buffer[position] != rune('E') { + goto l95 + } + position++ + } + l98: + { + position100, tokenIndex100 := position, tokenIndex + if buffer[position] != rune('n') { + goto l101 + } + position++ + goto l100 + l101: + position, tokenIndex = position100, tokenIndex100 + if buffer[position] != rune('N') { + goto l95 + } + position++ + } + l100: + { + position102, tokenIndex102 := position, tokenIndex + if buffer[position] != rune('s') { + goto l103 + } + position++ + goto l102 + l103: + position, tokenIndex = position102, tokenIndex102 + if buffer[position] != rune('S') { + goto l95 + } + position++ + } + l102: + { + position104, tokenIndex104 := position, tokenIndex + if buffer[position] != rune('u') { + goto l105 + } + position++ + goto l104 + l105: + position, tokenIndex = position104, tokenIndex104 + if buffer[position] != rune('U') { + goto l95 + } + position++ + } + l104: + goto l44 + l95: + position, tokenIndex = position44, tokenIndex44 + { + position107, tokenIndex107 := position, tokenIndex + if buffer[position] != rune('n') { + goto l108 + } + position++ + goto l107 + l108: + position, tokenIndex = position107, tokenIndex107 + if buffer[position] != rune('N') { + goto l106 + } + position++ + } + l107: + { + position109, tokenIndex109 := position, tokenIndex + if buffer[position] != rune('e') { + goto l110 + } + position++ + goto l109 + l110: + position, tokenIndex = position109, tokenIndex109 + if buffer[position] != rune('E') { + goto l106 + } + position++ + } + l109: + { + position111, tokenIndex111 := position, tokenIndex + if buffer[position] != rune('w') { + goto l112 + } + position++ + goto l111 + l112: + position, tokenIndex = position111, tokenIndex111 + if buffer[position] != rune('W') { + goto l106 + } + position++ + } + l111: + goto l44 + l106: + position, tokenIndex = position44, tokenIndex44 + { + position114, tokenIndex114 := position, tokenIndex + if buffer[position] != rune('n') { + goto l115 + } + position++ + goto l114 + l115: + position, tokenIndex = position114, tokenIndex114 + if buffer[position] != rune('N') { + goto l113 + } + position++ + } + l114: + { + position116, tokenIndex116 := position, tokenIndex + if buffer[position] != rune('o') { + goto l117 + } + position++ + goto l116 + l117: + position, tokenIndex = position116, tokenIndex116 + if buffer[position] != rune('O') { + goto l113 + } + position++ + } + l116: + { + position118, tokenIndex118 := position, tokenIndex + if buffer[position] != rune('n') { + goto l119 + } + position++ + goto l118 + l119: + position, tokenIndex = position118, tokenIndex118 + if buffer[position] != rune('N') { + goto l113 + } + position++ + } + l118: + goto l44 + l113: + position, tokenIndex = position44, tokenIndex44 + { + position121, tokenIndex121 := position, tokenIndex + if buffer[position] != rune('n') { + goto l122 + } + position++ + goto l121 + l122: + position, tokenIndex = position121, tokenIndex121 + if buffer[position] != rune('N') { + goto l120 + } + position++ + } + l121: + { + position123, tokenIndex123 := position, tokenIndex + if buffer[position] != rune('e') { + goto l124 + } + position++ + goto l123 + l124: + position, tokenIndex = position123, tokenIndex123 + if buffer[position] != rune('E') { + goto l120 + } + position++ + } + l123: + { + position125, tokenIndex125 := position, tokenIndex + if buffer[position] != rune('c') { + goto l126 + } + position++ + goto l125 + l126: + position, tokenIndex = position125, tokenIndex125 + if buffer[position] != rune('C') { + goto l120 + } + position++ + } + l125: + goto l44 + l120: + position, tokenIndex = position44, tokenIndex44 + { + position128, tokenIndex128 := position, tokenIndex + if buffer[position] != rune('h') { + goto l129 + } + position++ + goto l128 + l129: + position, tokenIndex = position128, tokenIndex128 + if buffer[position] != rune('H') { + goto l127 + } + position++ + } + l128: + { + position130, tokenIndex130 := position, tokenIndex + if buffer[position] != rune('y') { + goto l131 + } + position++ + goto l130 + l131: + position, tokenIndex = position130, tokenIndex130 + if buffer[position] != rune('Y') { + goto l127 + } + position++ + } + l130: + { + position132, tokenIndex132 := position, tokenIndex + if buffer[position] != rune('b') { + goto l133 + } + position++ + goto l132 + l133: + position, tokenIndex = position132, tokenIndex132 + if buffer[position] != rune('B') { + goto l127 + } + position++ + } + l132: + { + position134, tokenIndex134 := position, tokenIndex + if buffer[position] != rune('r') { + goto l135 + } + position++ + goto l134 + l135: + position, tokenIndex = position134, tokenIndex134 + if buffer[position] != rune('R') { + goto l127 + } + position++ + } + l134: + { + position136, tokenIndex136 := position, tokenIndex + if buffer[position] != rune('i') { + goto l137 + } + position++ + goto l136 + l137: + position, tokenIndex = position136, tokenIndex136 + if buffer[position] != rune('I') { + goto l127 + } + position++ + } + l136: + { + position138, tokenIndex138 := position, tokenIndex + if buffer[position] != rune('d') { + goto l139 + } + position++ + goto l138 + l139: + position, tokenIndex = position138, tokenIndex138 + if buffer[position] != rune('D') { + goto l127 + } + position++ + } + l138: + goto l44 + l127: + position, tokenIndex = position44, tokenIndex44 + { + position140, tokenIndex140 := position, tokenIndex + if buffer[position] != rune('v') { + goto l141 + } + position++ + goto l140 + l141: + position, tokenIndex = position140, tokenIndex140 + if buffer[position] != rune('V') { + goto l42 + } + position++ + } + l140: + { + position142, tokenIndex142 := position, tokenIndex + if buffer[position] != rune('o') { + goto l143 + } + position++ + goto l142 + l143: + position, tokenIndex = position142, tokenIndex142 + if buffer[position] != rune('O') { + goto l42 + } + position++ + } + l142: + { + position144, tokenIndex144 := position, tokenIndex + if buffer[position] != rune('n') { + goto l145 + } + position++ + goto l144 + l145: + position, tokenIndex = position144, tokenIndex144 + if buffer[position] != rune('N') { + goto l42 + } + position++ + } + l144: + } + l44: + { + position146, tokenIndex146 := position, tokenIndex + if buffer[position] != rune('?') { + goto l146 + } + position++ + goto l147 + l146: + position, tokenIndex = position146, tokenIndex146 + } + l147: + { + position148, tokenIndex148 := position, tokenIndex + if !_rules[ruleSpaceOrEnd]() { + goto l42 + } + position, tokenIndex = position148, tokenIndex148 + } + add(ruleTailLastWordJunk, position43) + } + return true + l42: + position, tokenIndex = position42, tokenIndex42 + return false + }, + /* 6 TailPhrase4 <- <((((('p' / 'P') ('r' / 'R') ('o' / 'O') _ (('p' / 'P') ('a' / 'A') ('r' / 'R') ('t' / 'T') ('e' / 'E'))) / (('n' / 'N') ('o' / 'O') ('m' / 'M') ('e' / 'E') ('n' / 'N'))) &NotLetterOrEnd) / (('p' / 'P') '.' _? (('p' / 'P') '.')) / (('n' / 'N') ('o' / 'O') ('m' / 'M') '.') / (('c' / 'C') ('o' / 'O') ('m' / 'M') ('b' / 'B') '.'))> */ + func() bool { + position149, tokenIndex149 := position, tokenIndex + { + position150 := position + { + position151, tokenIndex151 := position, tokenIndex + { + position153, tokenIndex153 := position, tokenIndex + { + position155, tokenIndex155 := position, tokenIndex + if buffer[position] != rune('p') { + goto l156 + } + position++ + goto l155 + l156: + position, tokenIndex = position155, tokenIndex155 + if buffer[position] != rune('P') { + goto l154 + } + position++ + } + l155: + { + position157, tokenIndex157 := position, tokenIndex + if buffer[position] != rune('r') { + goto l158 + } + position++ + goto l157 + l158: + position, tokenIndex = position157, tokenIndex157 + if buffer[position] != rune('R') { + goto l154 + } + position++ + } + l157: + { + position159, tokenIndex159 := position, tokenIndex + if buffer[position] != rune('o') { + goto l160 + } + position++ + goto l159 + l160: + position, tokenIndex = position159, tokenIndex159 + if buffer[position] != rune('O') { + goto l154 + } + position++ + } + l159: + if !_rules[rule_]() { + goto l154 + } + { + position161, tokenIndex161 := position, tokenIndex + if buffer[position] != rune('p') { + goto l162 + } + position++ + goto l161 + l162: + position, tokenIndex = position161, tokenIndex161 + if buffer[position] != rune('P') { + goto l154 + } + position++ + } + l161: + { + position163, tokenIndex163 := position, tokenIndex + if buffer[position] != rune('a') { + goto l164 + } + position++ + goto l163 + l164: + position, tokenIndex = position163, tokenIndex163 + if buffer[position] != rune('A') { + goto l154 + } + position++ + } + l163: + { + position165, tokenIndex165 := position, tokenIndex + if buffer[position] != rune('r') { + goto l166 + } + position++ + goto l165 + l166: + position, tokenIndex = position165, tokenIndex165 + if buffer[position] != rune('R') { + goto l154 + } + position++ + } + l165: + { + position167, tokenIndex167 := position, tokenIndex + if buffer[position] != rune('t') { + goto l168 + } + position++ + goto l167 + l168: + position, tokenIndex = position167, tokenIndex167 + if buffer[position] != rune('T') { + goto l154 + } + position++ + } + l167: + { + position169, tokenIndex169 := position, tokenIndex + if buffer[position] != rune('e') { + goto l170 + } + position++ + goto l169 + l170: + position, tokenIndex = position169, tokenIndex169 + if buffer[position] != rune('E') { + goto l154 + } + position++ + } + l169: + goto l153 + l154: + position, tokenIndex = position153, tokenIndex153 + { + position171, tokenIndex171 := position, tokenIndex + if buffer[position] != rune('n') { + goto l172 + } + position++ + goto l171 + l172: + position, tokenIndex = position171, tokenIndex171 + if buffer[position] != rune('N') { + goto l152 + } + position++ + } + l171: + { + position173, tokenIndex173 := position, tokenIndex + if buffer[position] != rune('o') { + goto l174 + } + position++ + goto l173 + l174: + position, tokenIndex = position173, tokenIndex173 + if buffer[position] != rune('O') { + goto l152 + } + position++ + } + l173: + { + position175, tokenIndex175 := position, tokenIndex + if buffer[position] != rune('m') { + goto l176 + } + position++ + goto l175 + l176: + position, tokenIndex = position175, tokenIndex175 + if buffer[position] != rune('M') { + goto l152 + } + position++ + } + l175: + { + position177, tokenIndex177 := position, tokenIndex + if buffer[position] != rune('e') { + goto l178 + } + position++ + goto l177 + l178: + position, tokenIndex = position177, tokenIndex177 + if buffer[position] != rune('E') { + goto l152 + } + position++ + } + l177: + { + position179, tokenIndex179 := position, tokenIndex + if buffer[position] != rune('n') { + goto l180 + } + position++ + goto l179 + l180: + position, tokenIndex = position179, tokenIndex179 + if buffer[position] != rune('N') { + goto l152 + } + position++ + } + l179: + } + l153: + { + position181, tokenIndex181 := position, tokenIndex + if !_rules[ruleNotLetterOrEnd]() { + goto l152 + } + position, tokenIndex = position181, tokenIndex181 + } + goto l151 + l152: + position, tokenIndex = position151, tokenIndex151 + { + position183, tokenIndex183 := position, tokenIndex + if buffer[position] != rune('p') { + goto l184 + } + position++ + goto l183 + l184: + position, tokenIndex = position183, tokenIndex183 + if buffer[position] != rune('P') { + goto l182 + } + position++ + } + l183: + if buffer[position] != rune('.') { + goto l182 + } + position++ + { + position185, tokenIndex185 := position, tokenIndex + if !_rules[rule_]() { + goto l185 + } + goto l186 + l185: + position, tokenIndex = position185, tokenIndex185 + } + l186: + { + position187, tokenIndex187 := position, tokenIndex + if buffer[position] != rune('p') { + goto l188 + } + position++ + goto l187 + l188: + position, tokenIndex = position187, tokenIndex187 + if buffer[position] != rune('P') { + goto l182 + } + position++ + } + l187: + if buffer[position] != rune('.') { + goto l182 + } + position++ + goto l151 + l182: + position, tokenIndex = position151, tokenIndex151 + { + position190, tokenIndex190 := position, tokenIndex + if buffer[position] != rune('n') { + goto l191 + } + position++ + goto l190 + l191: + position, tokenIndex = position190, tokenIndex190 + if buffer[position] != rune('N') { + goto l189 + } + position++ + } + l190: + { + position192, tokenIndex192 := position, tokenIndex + if buffer[position] != rune('o') { + goto l193 + } + position++ + goto l192 + l193: + position, tokenIndex = position192, tokenIndex192 + if buffer[position] != rune('O') { + goto l189 + } + position++ + } + l192: + { + position194, tokenIndex194 := position, tokenIndex + if buffer[position] != rune('m') { + goto l195 + } + position++ + goto l194 + l195: + position, tokenIndex = position194, tokenIndex194 + if buffer[position] != rune('M') { + goto l189 + } + position++ + } + l194: + if buffer[position] != rune('.') { + goto l189 + } + position++ + goto l151 + l189: + position, tokenIndex = position151, tokenIndex151 + { + position196, tokenIndex196 := position, tokenIndex + if buffer[position] != rune('c') { + goto l197 + } + position++ + goto l196 + l197: + position, tokenIndex = position196, tokenIndex196 + if buffer[position] != rune('C') { + goto l149 + } + position++ + } + l196: + { + position198, tokenIndex198 := position, tokenIndex + if buffer[position] != rune('o') { + goto l199 + } + position++ + goto l198 + l199: + position, tokenIndex = position198, tokenIndex198 + if buffer[position] != rune('O') { + goto l149 + } + position++ + } + l198: + { + position200, tokenIndex200 := position, tokenIndex + if buffer[position] != rune('m') { + goto l201 + } + position++ + goto l200 + l201: + position, tokenIndex = position200, tokenIndex200 + if buffer[position] != rune('M') { + goto l149 + } + position++ + } + l200: + { + position202, tokenIndex202 := position, tokenIndex + if buffer[position] != rune('b') { + goto l203 + } + position++ + goto l202 + l203: + position, tokenIndex = position202, tokenIndex202 + if buffer[position] != rune('B') { + goto l149 + } + position++ + } + l202: + if buffer[position] != rune('.') { + goto l149 + } + position++ + } + l151: + add(ruleTailPhrase4, position150) + } + return true + l149: + position, tokenIndex = position149, tokenIndex149 + return false + }, + /* 7 TailPhrase3 <- <('('? 's' (('.' _?) / _) (('s' '.'? &NotLetterOrEnd) / ('l' '.') / ('s' 't' 'r' '.') / ('l' 'a' 't' '.')))> */ + func() bool { + position204, tokenIndex204 := position, tokenIndex + { + position205 := position + { + position206, tokenIndex206 := position, tokenIndex + if buffer[position] != rune('(') { + goto l206 + } + position++ + goto l207 + l206: + position, tokenIndex = position206, tokenIndex206 + } + l207: + if buffer[position] != rune('s') { + goto l204 + } + position++ + { + position208, tokenIndex208 := position, tokenIndex + if buffer[position] != rune('.') { + goto l209 + } + position++ + { + position210, tokenIndex210 := position, tokenIndex + if !_rules[rule_]() { + goto l210 + } + goto l211 + l210: + position, tokenIndex = position210, tokenIndex210 + } + l211: + goto l208 + l209: + position, tokenIndex = position208, tokenIndex208 + if !_rules[rule_]() { + goto l204 + } + } + l208: + { + position212, tokenIndex212 := position, tokenIndex + if buffer[position] != rune('s') { + goto l213 + } + position++ + { + position214, tokenIndex214 := position, tokenIndex + if buffer[position] != rune('.') { + goto l214 + } + position++ + goto l215 + l214: + position, tokenIndex = position214, tokenIndex214 + } + l215: + { + position216, tokenIndex216 := position, tokenIndex + if !_rules[ruleNotLetterOrEnd]() { + goto l213 + } + position, tokenIndex = position216, tokenIndex216 + } + goto l212 + l213: + position, tokenIndex = position212, tokenIndex212 + if buffer[position] != rune('l') { + goto l217 + } + position++ + if buffer[position] != rune('.') { + goto l217 + } + position++ + goto l212 + l217: + position, tokenIndex = position212, tokenIndex212 + if buffer[position] != rune('s') { + goto l218 + } + position++ + if buffer[position] != rune('t') { + goto l218 + } + position++ + if buffer[position] != rune('r') { + goto l218 + } + position++ + if buffer[position] != rune('.') { + goto l218 + } + position++ + goto l212 + l218: + position, tokenIndex = position212, tokenIndex212 + if buffer[position] != rune('l') { + goto l204 + } + position++ + if buffer[position] != rune('a') { + goto l204 + } + position++ + if buffer[position] != rune('t') { + goto l204 + } + position++ + if buffer[position] != rune('.') { + goto l204 + } + position++ + } + l212: + add(ruleTailPhrase3, position205) + } + return true + l204: + position, tokenIndex = position204, tokenIndex204 + return false + }, + /* 8 TailStopWords <- <(((('e' / 'E') ('n' / 'N') ('v' / 'V') ('i' / 'I') ('r' / 'R') ('o' / 'O') ('n' / 'N') ('m' / 'M') ('e' / 'E') ('n' / 'N') ('t' / 'T') ('a' / 'A') ('l' / 'L')) / (('e' / 'E') ('n' / 'N') ('r' / 'R') ('i' / 'I') ('c' / 'C') ('h' / 'H') ('m' / 'M') ('e' / 'E') ('n' / 'N') ('t' / 'T')) / (('s' / 'S') ('a' / 'A') ('m' / 'M') ('p' / 'P') ('l' / 'L') ('e' / 'E') ('s' / 'S')) / ((('s' / 'S') ('p' / 'P') ('e' / 'E') ('c' / 'C') ('i' / 'I') ('e' / 'E') ('s' / 'S') _)? ((('g' / 'G') ('r' / 'R') ('o' / 'O') ('u' / 'U') ('p' / 'P')) / (('c' / 'C') ('o' / 'O') ('m' / 'M') ('p' / 'P') ('l' / 'L') ('e' / 'E') ('x' / 'X')))) / (('c' / 'C') ('l' / 'L') ('a' / 'A') ('d' / 'D') ('e' / 'E')) / (('a' / 'A') ('u' / 'U') ('t' / 'T') ('h' / 'H') ('o' / 'O') ('r' / 'R')) / (('n' / 'N') ('e' / 'E') ('c' / 'C')) / (('v' / 'V') ('i' / 'I') ('d' / 'D') ('e' / 'E')) / (('f' / 'F') ('i' / 'I') ('d' / 'D') ('e' / 'E')) / (('n' / 'N') ('o' / 'O') ('n' / 'N'))) &NotLetterOrEnd)> */ + func() bool { + position219, tokenIndex219 := position, tokenIndex + { + position220 := position + { + position221, tokenIndex221 := position, tokenIndex + { + position223, tokenIndex223 := position, tokenIndex + if buffer[position] != rune('e') { + goto l224 + } + position++ + goto l223 + l224: + position, tokenIndex = position223, tokenIndex223 + if buffer[position] != rune('E') { + goto l222 + } + position++ + } + l223: + { + position225, tokenIndex225 := position, tokenIndex + if buffer[position] != rune('n') { + goto l226 + } + position++ + goto l225 + l226: + position, tokenIndex = position225, tokenIndex225 + if buffer[position] != rune('N') { + goto l222 + } + position++ + } + l225: + { + position227, tokenIndex227 := position, tokenIndex + if buffer[position] != rune('v') { + goto l228 + } + position++ + goto l227 + l228: + position, tokenIndex = position227, tokenIndex227 + if buffer[position] != rune('V') { + goto l222 + } + position++ + } + l227: + { + position229, tokenIndex229 := position, tokenIndex + if buffer[position] != rune('i') { + goto l230 + } + position++ + goto l229 + l230: + position, tokenIndex = position229, tokenIndex229 + if buffer[position] != rune('I') { + goto l222 + } + position++ + } + l229: + { + position231, tokenIndex231 := position, tokenIndex + if buffer[position] != rune('r') { + goto l232 + } + position++ + goto l231 + l232: + position, tokenIndex = position231, tokenIndex231 + if buffer[position] != rune('R') { + goto l222 + } + position++ + } + l231: + { + position233, tokenIndex233 := position, tokenIndex + if buffer[position] != rune('o') { + goto l234 + } + position++ + goto l233 + l234: + position, tokenIndex = position233, tokenIndex233 + if buffer[position] != rune('O') { + goto l222 + } + position++ + } + l233: + { + position235, tokenIndex235 := position, tokenIndex + if buffer[position] != rune('n') { + goto l236 + } + position++ + goto l235 + l236: + position, tokenIndex = position235, tokenIndex235 + if buffer[position] != rune('N') { + goto l222 + } + position++ + } + l235: + { + position237, tokenIndex237 := position, tokenIndex + if buffer[position] != rune('m') { + goto l238 + } + position++ + goto l237 + l238: + position, tokenIndex = position237, tokenIndex237 + if buffer[position] != rune('M') { + goto l222 + } + position++ + } + l237: + { + position239, tokenIndex239 := position, tokenIndex + if buffer[position] != rune('e') { + goto l240 + } + position++ + goto l239 + l240: + position, tokenIndex = position239, tokenIndex239 + if buffer[position] != rune('E') { + goto l222 + } + position++ + } + l239: + { + position241, tokenIndex241 := position, tokenIndex + if buffer[position] != rune('n') { + goto l242 + } + position++ + goto l241 + l242: + position, tokenIndex = position241, tokenIndex241 + if buffer[position] != rune('N') { + goto l222 + } + position++ + } + l241: + { + position243, tokenIndex243 := position, tokenIndex + if buffer[position] != rune('t') { + goto l244 + } + position++ + goto l243 + l244: + position, tokenIndex = position243, tokenIndex243 + if buffer[position] != rune('T') { + goto l222 + } + position++ + } + l243: + { + position245, tokenIndex245 := position, tokenIndex + if buffer[position] != rune('a') { + goto l246 + } + position++ + goto l245 + l246: + position, tokenIndex = position245, tokenIndex245 + if buffer[position] != rune('A') { + goto l222 + } + position++ + } + l245: + { + position247, tokenIndex247 := position, tokenIndex + if buffer[position] != rune('l') { + goto l248 + } + position++ + goto l247 + l248: + position, tokenIndex = position247, tokenIndex247 + if buffer[position] != rune('L') { + goto l222 + } + position++ + } + l247: + goto l221 + l222: + position, tokenIndex = position221, tokenIndex221 + { + position250, tokenIndex250 := position, tokenIndex + if buffer[position] != rune('e') { + goto l251 + } + position++ + goto l250 + l251: + position, tokenIndex = position250, tokenIndex250 + if buffer[position] != rune('E') { + goto l249 + } + position++ + } + l250: + { + position252, tokenIndex252 := position, tokenIndex + if buffer[position] != rune('n') { + goto l253 + } + position++ + goto l252 + l253: + position, tokenIndex = position252, tokenIndex252 + if buffer[position] != rune('N') { + goto l249 + } + position++ + } + l252: + { + position254, tokenIndex254 := position, tokenIndex + if buffer[position] != rune('r') { + goto l255 + } + position++ + goto l254 + l255: + position, tokenIndex = position254, tokenIndex254 + if buffer[position] != rune('R') { + goto l249 + } + position++ + } + l254: + { + position256, tokenIndex256 := position, tokenIndex + if buffer[position] != rune('i') { + goto l257 + } + position++ + goto l256 + l257: + position, tokenIndex = position256, tokenIndex256 + if buffer[position] != rune('I') { + goto l249 + } + position++ + } + l256: + { + position258, tokenIndex258 := position, tokenIndex + if buffer[position] != rune('c') { + goto l259 + } + position++ + goto l258 + l259: + position, tokenIndex = position258, tokenIndex258 + if buffer[position] != rune('C') { + goto l249 + } + position++ + } + l258: + { + position260, tokenIndex260 := position, tokenIndex + if buffer[position] != rune('h') { + goto l261 + } + position++ + goto l260 + l261: + position, tokenIndex = position260, tokenIndex260 + if buffer[position] != rune('H') { + goto l249 + } + position++ + } + l260: + { + position262, tokenIndex262 := position, tokenIndex + if buffer[position] != rune('m') { + goto l263 + } + position++ + goto l262 + l263: + position, tokenIndex = position262, tokenIndex262 + if buffer[position] != rune('M') { + goto l249 + } + position++ + } + l262: + { + position264, tokenIndex264 := position, tokenIndex + if buffer[position] != rune('e') { + goto l265 + } + position++ + goto l264 + l265: + position, tokenIndex = position264, tokenIndex264 + if buffer[position] != rune('E') { + goto l249 + } + position++ + } + l264: + { + position266, tokenIndex266 := position, tokenIndex + if buffer[position] != rune('n') { + goto l267 + } + position++ + goto l266 + l267: + position, tokenIndex = position266, tokenIndex266 + if buffer[position] != rune('N') { + goto l249 + } + position++ + } + l266: + { + position268, tokenIndex268 := position, tokenIndex + if buffer[position] != rune('t') { + goto l269 + } + position++ + goto l268 + l269: + position, tokenIndex = position268, tokenIndex268 + if buffer[position] != rune('T') { + goto l249 + } + position++ + } + l268: + goto l221 + l249: + position, tokenIndex = position221, tokenIndex221 + { + position271, tokenIndex271 := position, tokenIndex + if buffer[position] != rune('s') { + goto l272 + } + position++ + goto l271 + l272: + position, tokenIndex = position271, tokenIndex271 + if buffer[position] != rune('S') { + goto l270 + } + position++ + } + l271: + { + position273, tokenIndex273 := position, tokenIndex + if buffer[position] != rune('a') { + goto l274 + } + position++ + goto l273 + l274: + position, tokenIndex = position273, tokenIndex273 + if buffer[position] != rune('A') { + goto l270 + } + position++ + } + l273: + { + position275, tokenIndex275 := position, tokenIndex + if buffer[position] != rune('m') { + goto l276 + } + position++ + goto l275 + l276: + position, tokenIndex = position275, tokenIndex275 + if buffer[position] != rune('M') { + goto l270 + } + position++ + } + l275: + { + position277, tokenIndex277 := position, tokenIndex + if buffer[position] != rune('p') { + goto l278 + } + position++ + goto l277 + l278: + position, tokenIndex = position277, tokenIndex277 + if buffer[position] != rune('P') { + goto l270 + } + position++ + } + l277: + { + position279, tokenIndex279 := position, tokenIndex + if buffer[position] != rune('l') { + goto l280 + } + position++ + goto l279 + l280: + position, tokenIndex = position279, tokenIndex279 + if buffer[position] != rune('L') { + goto l270 + } + position++ + } + l279: + { + position281, tokenIndex281 := position, tokenIndex + if buffer[position] != rune('e') { + goto l282 + } + position++ + goto l281 + l282: + position, tokenIndex = position281, tokenIndex281 + if buffer[position] != rune('E') { + goto l270 + } + position++ + } + l281: + { + position283, tokenIndex283 := position, tokenIndex + if buffer[position] != rune('s') { + goto l284 + } + position++ + goto l283 + l284: + position, tokenIndex = position283, tokenIndex283 + if buffer[position] != rune('S') { + goto l270 + } + position++ + } + l283: + goto l221 + l270: + position, tokenIndex = position221, tokenIndex221 + { + position286, tokenIndex286 := position, tokenIndex + { + position288, tokenIndex288 := position, tokenIndex + if buffer[position] != rune('s') { + goto l289 + } + position++ + goto l288 + l289: + position, tokenIndex = position288, tokenIndex288 + if buffer[position] != rune('S') { + goto l286 + } + position++ + } + l288: + { + position290, tokenIndex290 := position, tokenIndex + if buffer[position] != rune('p') { + goto l291 + } + position++ + goto l290 + l291: + position, tokenIndex = position290, tokenIndex290 + if buffer[position] != rune('P') { + goto l286 + } + position++ + } + l290: + { + position292, tokenIndex292 := position, tokenIndex + if buffer[position] != rune('e') { + goto l293 + } + position++ + goto l292 + l293: + position, tokenIndex = position292, tokenIndex292 + if buffer[position] != rune('E') { + goto l286 + } + position++ + } + l292: + { + position294, tokenIndex294 := position, tokenIndex + if buffer[position] != rune('c') { + goto l295 + } + position++ + goto l294 + l295: + position, tokenIndex = position294, tokenIndex294 + if buffer[position] != rune('C') { + goto l286 + } + position++ + } + l294: + { + position296, tokenIndex296 := position, tokenIndex + if buffer[position] != rune('i') { + goto l297 + } + position++ + goto l296 + l297: + position, tokenIndex = position296, tokenIndex296 + if buffer[position] != rune('I') { + goto l286 + } + position++ + } + l296: + { + position298, tokenIndex298 := position, tokenIndex + if buffer[position] != rune('e') { + goto l299 + } + position++ + goto l298 + l299: + position, tokenIndex = position298, tokenIndex298 + if buffer[position] != rune('E') { + goto l286 + } + position++ + } + l298: + { + position300, tokenIndex300 := position, tokenIndex + if buffer[position] != rune('s') { + goto l301 + } + position++ + goto l300 + l301: + position, tokenIndex = position300, tokenIndex300 + if buffer[position] != rune('S') { + goto l286 + } + position++ + } + l300: + if !_rules[rule_]() { + goto l286 + } + goto l287 + l286: + position, tokenIndex = position286, tokenIndex286 + } + l287: + { + position302, tokenIndex302 := position, tokenIndex + { + position304, tokenIndex304 := position, tokenIndex + if buffer[position] != rune('g') { + goto l305 + } + position++ + goto l304 + l305: + position, tokenIndex = position304, tokenIndex304 + if buffer[position] != rune('G') { + goto l303 + } + position++ + } + l304: + { + position306, tokenIndex306 := position, tokenIndex + if buffer[position] != rune('r') { + goto l307 + } + position++ + goto l306 + l307: + position, tokenIndex = position306, tokenIndex306 + if buffer[position] != rune('R') { + goto l303 + } + position++ + } + l306: + { + position308, tokenIndex308 := position, tokenIndex + if buffer[position] != rune('o') { + goto l309 + } + position++ + goto l308 + l309: + position, tokenIndex = position308, tokenIndex308 + if buffer[position] != rune('O') { + goto l303 + } + position++ + } + l308: + { + position310, tokenIndex310 := position, tokenIndex + if buffer[position] != rune('u') { + goto l311 + } + position++ + goto l310 + l311: + position, tokenIndex = position310, tokenIndex310 + if buffer[position] != rune('U') { + goto l303 + } + position++ + } + l310: + { + position312, tokenIndex312 := position, tokenIndex + if buffer[position] != rune('p') { + goto l313 + } + position++ + goto l312 + l313: + position, tokenIndex = position312, tokenIndex312 + if buffer[position] != rune('P') { + goto l303 + } + position++ + } + l312: + goto l302 + l303: + position, tokenIndex = position302, tokenIndex302 + { + position314, tokenIndex314 := position, tokenIndex + if buffer[position] != rune('c') { + goto l315 + } + position++ + goto l314 + l315: + position, tokenIndex = position314, tokenIndex314 + if buffer[position] != rune('C') { + goto l285 + } + position++ + } + l314: + { + position316, tokenIndex316 := position, tokenIndex + if buffer[position] != rune('o') { + goto l317 + } + position++ + goto l316 + l317: + position, tokenIndex = position316, tokenIndex316 + if buffer[position] != rune('O') { + goto l285 + } + position++ + } + l316: + { + position318, tokenIndex318 := position, tokenIndex + if buffer[position] != rune('m') { + goto l319 + } + position++ + goto l318 + l319: + position, tokenIndex = position318, tokenIndex318 + if buffer[position] != rune('M') { + goto l285 + } + position++ + } + l318: + { + position320, tokenIndex320 := position, tokenIndex + if buffer[position] != rune('p') { + goto l321 + } + position++ + goto l320 + l321: + position, tokenIndex = position320, tokenIndex320 + if buffer[position] != rune('P') { + goto l285 + } + position++ + } + l320: + { + position322, tokenIndex322 := position, tokenIndex + if buffer[position] != rune('l') { + goto l323 + } + position++ + goto l322 + l323: + position, tokenIndex = position322, tokenIndex322 + if buffer[position] != rune('L') { + goto l285 + } + position++ + } + l322: + { + position324, tokenIndex324 := position, tokenIndex + if buffer[position] != rune('e') { + goto l325 + } + position++ + goto l324 + l325: + position, tokenIndex = position324, tokenIndex324 + if buffer[position] != rune('E') { + goto l285 + } + position++ + } + l324: + { + position326, tokenIndex326 := position, tokenIndex + if buffer[position] != rune('x') { + goto l327 + } + position++ + goto l326 + l327: + position, tokenIndex = position326, tokenIndex326 + if buffer[position] != rune('X') { + goto l285 + } + position++ + } + l326: + } + l302: + goto l221 + l285: + position, tokenIndex = position221, tokenIndex221 + { + position329, tokenIndex329 := position, tokenIndex + if buffer[position] != rune('c') { + goto l330 + } + position++ + goto l329 + l330: + position, tokenIndex = position329, tokenIndex329 + if buffer[position] != rune('C') { + goto l328 + } + position++ + } + l329: + { + position331, tokenIndex331 := position, tokenIndex + if buffer[position] != rune('l') { + goto l332 + } + position++ + goto l331 + l332: + position, tokenIndex = position331, tokenIndex331 + if buffer[position] != rune('L') { + goto l328 + } + position++ + } + l331: + { + position333, tokenIndex333 := position, tokenIndex + if buffer[position] != rune('a') { + goto l334 + } + position++ + goto l333 + l334: + position, tokenIndex = position333, tokenIndex333 + if buffer[position] != rune('A') { + goto l328 + } + position++ + } + l333: + { + position335, tokenIndex335 := position, tokenIndex + if buffer[position] != rune('d') { + goto l336 + } + position++ + goto l335 + l336: + position, tokenIndex = position335, tokenIndex335 + if buffer[position] != rune('D') { + goto l328 + } + position++ + } + l335: + { + position337, tokenIndex337 := position, tokenIndex + if buffer[position] != rune('e') { + goto l338 + } + position++ + goto l337 + l338: + position, tokenIndex = position337, tokenIndex337 + if buffer[position] != rune('E') { + goto l328 + } + position++ + } + l337: + goto l221 + l328: + position, tokenIndex = position221, tokenIndex221 + { + position340, tokenIndex340 := position, tokenIndex + if buffer[position] != rune('a') { + goto l341 + } + position++ + goto l340 + l341: + position, tokenIndex = position340, tokenIndex340 + if buffer[position] != rune('A') { + goto l339 + } + position++ + } + l340: + { + position342, tokenIndex342 := position, tokenIndex + if buffer[position] != rune('u') { + goto l343 + } + position++ + goto l342 + l343: + position, tokenIndex = position342, tokenIndex342 + if buffer[position] != rune('U') { + goto l339 + } + position++ + } + l342: + { + position344, tokenIndex344 := position, tokenIndex + if buffer[position] != rune('t') { + goto l345 + } + position++ + goto l344 + l345: + position, tokenIndex = position344, tokenIndex344 + if buffer[position] != rune('T') { + goto l339 + } + position++ + } + l344: + { + position346, tokenIndex346 := position, tokenIndex + if buffer[position] != rune('h') { + goto l347 + } + position++ + goto l346 + l347: + position, tokenIndex = position346, tokenIndex346 + if buffer[position] != rune('H') { + goto l339 + } + position++ + } + l346: + { + position348, tokenIndex348 := position, tokenIndex + if buffer[position] != rune('o') { + goto l349 + } + position++ + goto l348 + l349: + position, tokenIndex = position348, tokenIndex348 + if buffer[position] != rune('O') { + goto l339 + } + position++ + } + l348: + { + position350, tokenIndex350 := position, tokenIndex + if buffer[position] != rune('r') { + goto l351 + } + position++ + goto l350 + l351: + position, tokenIndex = position350, tokenIndex350 + if buffer[position] != rune('R') { + goto l339 + } + position++ + } + l350: + goto l221 + l339: + position, tokenIndex = position221, tokenIndex221 + { + position353, tokenIndex353 := position, tokenIndex + if buffer[position] != rune('n') { + goto l354 + } + position++ + goto l353 + l354: + position, tokenIndex = position353, tokenIndex353 + if buffer[position] != rune('N') { + goto l352 + } + position++ + } + l353: + { + position355, tokenIndex355 := position, tokenIndex + if buffer[position] != rune('e') { + goto l356 + } + position++ + goto l355 + l356: + position, tokenIndex = position355, tokenIndex355 + if buffer[position] != rune('E') { + goto l352 + } + position++ + } + l355: + { + position357, tokenIndex357 := position, tokenIndex + if buffer[position] != rune('c') { + goto l358 + } + position++ + goto l357 + l358: + position, tokenIndex = position357, tokenIndex357 + if buffer[position] != rune('C') { + goto l352 + } + position++ + } + l357: + goto l221 + l352: + position, tokenIndex = position221, tokenIndex221 + { + position360, tokenIndex360 := position, tokenIndex + if buffer[position] != rune('v') { + goto l361 + } + position++ + goto l360 + l361: + position, tokenIndex = position360, tokenIndex360 + if buffer[position] != rune('V') { + goto l359 + } + position++ + } + l360: + { + position362, tokenIndex362 := position, tokenIndex + if buffer[position] != rune('i') { + goto l363 + } + position++ + goto l362 + l363: + position, tokenIndex = position362, tokenIndex362 + if buffer[position] != rune('I') { + goto l359 + } + position++ + } + l362: + { + position364, tokenIndex364 := position, tokenIndex + if buffer[position] != rune('d') { + goto l365 + } + position++ + goto l364 + l365: + position, tokenIndex = position364, tokenIndex364 + if buffer[position] != rune('D') { + goto l359 + } + position++ + } + l364: + { + position366, tokenIndex366 := position, tokenIndex + if buffer[position] != rune('e') { + goto l367 + } + position++ + goto l366 + l367: + position, tokenIndex = position366, tokenIndex366 + if buffer[position] != rune('E') { + goto l359 + } + position++ + } + l366: + goto l221 + l359: + position, tokenIndex = position221, tokenIndex221 + { + position369, tokenIndex369 := position, tokenIndex + if buffer[position] != rune('f') { + goto l370 + } + position++ + goto l369 + l370: + position, tokenIndex = position369, tokenIndex369 + if buffer[position] != rune('F') { + goto l368 + } + position++ + } + l369: + { + position371, tokenIndex371 := position, tokenIndex + if buffer[position] != rune('i') { + goto l372 + } + position++ + goto l371 + l372: + position, tokenIndex = position371, tokenIndex371 + if buffer[position] != rune('I') { + goto l368 + } + position++ + } + l371: + { + position373, tokenIndex373 := position, tokenIndex + if buffer[position] != rune('d') { + goto l374 + } + position++ + goto l373 + l374: + position, tokenIndex = position373, tokenIndex373 + if buffer[position] != rune('D') { + goto l368 + } + position++ + } + l373: + { + position375, tokenIndex375 := position, tokenIndex + if buffer[position] != rune('e') { + goto l376 + } + position++ + goto l375 + l376: + position, tokenIndex = position375, tokenIndex375 + if buffer[position] != rune('E') { + goto l368 + } + position++ + } + l375: + goto l221 + l368: + position, tokenIndex = position221, tokenIndex221 + { + position377, tokenIndex377 := position, tokenIndex + if buffer[position] != rune('n') { + goto l378 + } + position++ + goto l377 + l378: + position, tokenIndex = position377, tokenIndex377 + if buffer[position] != rune('N') { + goto l219 + } + position++ + } + l377: + { + position379, tokenIndex379 := position, tokenIndex + if buffer[position] != rune('o') { + goto l380 + } + position++ + goto l379 + l380: + position, tokenIndex = position379, tokenIndex379 + if buffer[position] != rune('O') { + goto l219 + } + position++ + } + l379: + { + position381, tokenIndex381 := position, tokenIndex + if buffer[position] != rune('n') { + goto l382 + } + position++ + goto l381 + l382: + position, tokenIndex = position381, tokenIndex381 + if buffer[position] != rune('N') { + goto l219 + } + position++ + } + l381: + } + l221: + { + position383, tokenIndex383 := position, tokenIndex + if !_rules[ruleNotLetterOrEnd]() { + goto l219 + } + position, tokenIndex = position383, tokenIndex383 + } + add(ruleTailStopWords, position220) + } + return true + l219: + position, tokenIndex = position219, tokenIndex219 + return false + }, + /* 9 TailPhrase2 <- <(((('s' / 'S') ('e' / 'E') ('r' / 'R') ('o' / 'O') ((('v' / 'V') ('a' / 'A') ('r' / 'R')) / (('t' / 'T') ('y' / 'Y') ('p' / 'P') ('e' / 'E')))) / (('s' / 'S') ('e' / 'E') ('n' / 'N') ('s' / 'S') ('u' / 'U')) / (('a' / 'A') ('u' / 'U') ('c' / 'C') ('t' / 'T')) / (('s' / 'S') ('e' / 'E') ('c' / 'C')) / (('n' / 'N') ('e' / 'E') ('a' / 'A') ('r' / 'R')) / (('s' / 'S') ('t' / 'T') ('r' / 'R'))) '.'? &NotLetterOrEnd)> */ + func() bool { + position384, tokenIndex384 := position, tokenIndex + { + position385 := position + { + position386, tokenIndex386 := position, tokenIndex + { + position388, tokenIndex388 := position, tokenIndex + if buffer[position] != rune('s') { + goto l389 + } + position++ + goto l388 + l389: + position, tokenIndex = position388, tokenIndex388 + if buffer[position] != rune('S') { + goto l387 + } + position++ + } + l388: + { + position390, tokenIndex390 := position, tokenIndex + if buffer[position] != rune('e') { + goto l391 + } + position++ + goto l390 + l391: + position, tokenIndex = position390, tokenIndex390 + if buffer[position] != rune('E') { + goto l387 + } + position++ + } + l390: + { + position392, tokenIndex392 := position, tokenIndex + if buffer[position] != rune('r') { + goto l393 + } + position++ + goto l392 + l393: + position, tokenIndex = position392, tokenIndex392 + if buffer[position] != rune('R') { + goto l387 + } + position++ + } + l392: + { + position394, tokenIndex394 := position, tokenIndex + if buffer[position] != rune('o') { + goto l395 + } + position++ + goto l394 + l395: + position, tokenIndex = position394, tokenIndex394 + if buffer[position] != rune('O') { + goto l387 + } + position++ + } + l394: + { + position396, tokenIndex396 := position, tokenIndex + { + position398, tokenIndex398 := position, tokenIndex + if buffer[position] != rune('v') { + goto l399 + } + position++ + goto l398 + l399: + position, tokenIndex = position398, tokenIndex398 + if buffer[position] != rune('V') { + goto l397 + } + position++ + } + l398: + { + position400, tokenIndex400 := position, tokenIndex + if buffer[position] != rune('a') { + goto l401 + } + position++ + goto l400 + l401: + position, tokenIndex = position400, tokenIndex400 + if buffer[position] != rune('A') { + goto l397 + } + position++ + } + l400: + { + position402, tokenIndex402 := position, tokenIndex + if buffer[position] != rune('r') { + goto l403 + } + position++ + goto l402 + l403: + position, tokenIndex = position402, tokenIndex402 + if buffer[position] != rune('R') { + goto l397 + } + position++ + } + l402: + goto l396 + l397: + position, tokenIndex = position396, tokenIndex396 + { + position404, tokenIndex404 := position, tokenIndex + if buffer[position] != rune('t') { + goto l405 + } + position++ + goto l404 + l405: + position, tokenIndex = position404, tokenIndex404 + if buffer[position] != rune('T') { + goto l387 + } + position++ + } + l404: + { + position406, tokenIndex406 := position, tokenIndex + if buffer[position] != rune('y') { + goto l407 + } + position++ + goto l406 + l407: + position, tokenIndex = position406, tokenIndex406 + if buffer[position] != rune('Y') { + goto l387 + } + position++ + } + l406: + { + position408, tokenIndex408 := position, tokenIndex + if buffer[position] != rune('p') { + goto l409 + } + position++ + goto l408 + l409: + position, tokenIndex = position408, tokenIndex408 + if buffer[position] != rune('P') { + goto l387 + } + position++ + } + l408: + { + position410, tokenIndex410 := position, tokenIndex + if buffer[position] != rune('e') { + goto l411 + } + position++ + goto l410 + l411: + position, tokenIndex = position410, tokenIndex410 + if buffer[position] != rune('E') { + goto l387 + } + position++ + } + l410: + } + l396: + goto l386 + l387: + position, tokenIndex = position386, tokenIndex386 + { + position413, tokenIndex413 := position, tokenIndex + if buffer[position] != rune('s') { + goto l414 + } + position++ + goto l413 + l414: + position, tokenIndex = position413, tokenIndex413 + if buffer[position] != rune('S') { + goto l412 + } + position++ + } + l413: + { + position415, tokenIndex415 := position, tokenIndex + if buffer[position] != rune('e') { + goto l416 + } + position++ + goto l415 + l416: + position, tokenIndex = position415, tokenIndex415 + if buffer[position] != rune('E') { + goto l412 + } + position++ + } + l415: + { + position417, tokenIndex417 := position, tokenIndex + if buffer[position] != rune('n') { + goto l418 + } + position++ + goto l417 + l418: + position, tokenIndex = position417, tokenIndex417 + if buffer[position] != rune('N') { + goto l412 + } + position++ + } + l417: + { + position419, tokenIndex419 := position, tokenIndex + if buffer[position] != rune('s') { + goto l420 + } + position++ + goto l419 + l420: + position, tokenIndex = position419, tokenIndex419 + if buffer[position] != rune('S') { + goto l412 + } + position++ + } + l419: + { + position421, tokenIndex421 := position, tokenIndex + if buffer[position] != rune('u') { + goto l422 + } + position++ + goto l421 + l422: + position, tokenIndex = position421, tokenIndex421 + if buffer[position] != rune('U') { + goto l412 + } + position++ + } + l421: + goto l386 + l412: + position, tokenIndex = position386, tokenIndex386 + { + position424, tokenIndex424 := position, tokenIndex + if buffer[position] != rune('a') { + goto l425 + } + position++ + goto l424 + l425: + position, tokenIndex = position424, tokenIndex424 + if buffer[position] != rune('A') { + goto l423 + } + position++ + } + l424: + { + position426, tokenIndex426 := position, tokenIndex + if buffer[position] != rune('u') { + goto l427 + } + position++ + goto l426 + l427: + position, tokenIndex = position426, tokenIndex426 + if buffer[position] != rune('U') { + goto l423 + } + position++ + } + l426: + { + position428, tokenIndex428 := position, tokenIndex + if buffer[position] != rune('c') { + goto l429 + } + position++ + goto l428 + l429: + position, tokenIndex = position428, tokenIndex428 + if buffer[position] != rune('C') { + goto l423 + } + position++ + } + l428: + { + position430, tokenIndex430 := position, tokenIndex + if buffer[position] != rune('t') { + goto l431 + } + position++ + goto l430 + l431: + position, tokenIndex = position430, tokenIndex430 + if buffer[position] != rune('T') { + goto l423 + } + position++ + } + l430: + goto l386 + l423: + position, tokenIndex = position386, tokenIndex386 + { + position433, tokenIndex433 := position, tokenIndex + if buffer[position] != rune('s') { + goto l434 + } + position++ + goto l433 + l434: + position, tokenIndex = position433, tokenIndex433 + if buffer[position] != rune('S') { + goto l432 + } + position++ + } + l433: + { + position435, tokenIndex435 := position, tokenIndex + if buffer[position] != rune('e') { + goto l436 + } + position++ + goto l435 + l436: + position, tokenIndex = position435, tokenIndex435 + if buffer[position] != rune('E') { + goto l432 + } + position++ + } + l435: + { + position437, tokenIndex437 := position, tokenIndex + if buffer[position] != rune('c') { + goto l438 + } + position++ + goto l437 + l438: + position, tokenIndex = position437, tokenIndex437 + if buffer[position] != rune('C') { + goto l432 + } + position++ + } + l437: + goto l386 + l432: + position, tokenIndex = position386, tokenIndex386 + { + position440, tokenIndex440 := position, tokenIndex + if buffer[position] != rune('n') { + goto l441 + } + position++ + goto l440 + l441: + position, tokenIndex = position440, tokenIndex440 + if buffer[position] != rune('N') { + goto l439 + } + position++ + } + l440: + { + position442, tokenIndex442 := position, tokenIndex + if buffer[position] != rune('e') { + goto l443 + } + position++ + goto l442 + l443: + position, tokenIndex = position442, tokenIndex442 + if buffer[position] != rune('E') { + goto l439 + } + position++ + } + l442: + { + position444, tokenIndex444 := position, tokenIndex + if buffer[position] != rune('a') { + goto l445 + } + position++ + goto l444 + l445: + position, tokenIndex = position444, tokenIndex444 + if buffer[position] != rune('A') { + goto l439 + } + position++ + } + l444: + { + position446, tokenIndex446 := position, tokenIndex + if buffer[position] != rune('r') { + goto l447 + } + position++ + goto l446 + l447: + position, tokenIndex = position446, tokenIndex446 + if buffer[position] != rune('R') { + goto l439 + } + position++ + } + l446: + goto l386 + l439: + position, tokenIndex = position386, tokenIndex386 + { + position448, tokenIndex448 := position, tokenIndex + if buffer[position] != rune('s') { + goto l449 + } + position++ + goto l448 + l449: + position, tokenIndex = position448, tokenIndex448 + if buffer[position] != rune('S') { + goto l384 + } + position++ + } + l448: + { + position450, tokenIndex450 := position, tokenIndex + if buffer[position] != rune('t') { + goto l451 + } + position++ + goto l450 + l451: + position, tokenIndex = position450, tokenIndex450 + if buffer[position] != rune('T') { + goto l384 + } + position++ + } + l450: + { + position452, tokenIndex452 := position, tokenIndex + if buffer[position] != rune('r') { + goto l453 + } + position++ + goto l452 + l453: + position, tokenIndex = position452, tokenIndex452 + if buffer[position] != rune('R') { + goto l384 + } + position++ + } + l452: + } + l386: + { + position454, tokenIndex454 := position, tokenIndex + if buffer[position] != rune('.') { + goto l454 + } + position++ + goto l455 + l454: + position, tokenIndex = position454, tokenIndex454 + } + l455: + { + position456, tokenIndex456 := position, tokenIndex + if !_rules[ruleNotLetterOrEnd]() { + goto l384 + } + position, tokenIndex = position456, tokenIndex456 + } + add(ruleTailPhrase2, position385) + } + return true + l384: + position, tokenIndex = position384, tokenIndex384 + return false + }, + /* 10 TailPhrase1 <- <((('('? (('h' 't') / ('h' 'o' 'r' 't'))) / ('s' 'p' 'e' 'c') / ('n' 'o' 'v' '.'? _ ('s' 'p' 'e' 'c'))) '.'? &NotLetterOrEnd)> */ + func() bool { + position457, tokenIndex457 := position, tokenIndex + { + position458 := position + { + position459, tokenIndex459 := position, tokenIndex + { + position461, tokenIndex461 := position, tokenIndex + if buffer[position] != rune('(') { + goto l461 + } + position++ + goto l462 + l461: + position, tokenIndex = position461, tokenIndex461 + } + l462: + { + position463, tokenIndex463 := position, tokenIndex + if buffer[position] != rune('h') { + goto l464 + } + position++ + if buffer[position] != rune('t') { + goto l464 + } + position++ + goto l463 + l464: + position, tokenIndex = position463, tokenIndex463 + if buffer[position] != rune('h') { + goto l460 + } + position++ + if buffer[position] != rune('o') { + goto l460 + } + position++ + if buffer[position] != rune('r') { + goto l460 + } + position++ + if buffer[position] != rune('t') { + goto l460 + } + position++ + } + l463: + goto l459 + l460: + position, tokenIndex = position459, tokenIndex459 + if buffer[position] != rune('s') { + goto l465 + } + position++ + if buffer[position] != rune('p') { + goto l465 + } + position++ + if buffer[position] != rune('e') { + goto l465 + } + position++ + if buffer[position] != rune('c') { + goto l465 + } + position++ + goto l459 + l465: + position, tokenIndex = position459, tokenIndex459 + if buffer[position] != rune('n') { + goto l457 + } + position++ + if buffer[position] != rune('o') { + goto l457 + } + position++ + if buffer[position] != rune('v') { + goto l457 + } + position++ + { + position466, tokenIndex466 := position, tokenIndex + if buffer[position] != rune('.') { + goto l466 + } + position++ + goto l467 + l466: + position, tokenIndex = position466, tokenIndex466 + } + l467: + if !_rules[rule_]() { + goto l457 + } + if buffer[position] != rune('s') { + goto l457 + } + position++ + if buffer[position] != rune('p') { + goto l457 + } + position++ + if buffer[position] != rune('e') { + goto l457 + } + position++ + if buffer[position] != rune('c') { + goto l457 + } + position++ + } + l459: + { + position468, tokenIndex468 := position, tokenIndex + if buffer[position] != rune('.') { + goto l468 + } + position++ + goto l469 + l468: + position, tokenIndex = position468, tokenIndex468 + } + l469: + { + position470, tokenIndex470 := position, tokenIndex + if !_rules[ruleNotLetterOrEnd]() { + goto l457 + } + position, tokenIndex = position470, tokenIndex470 + } + add(ruleTailPhrase1, position458) + } + return true + l457: + position, tokenIndex = position457, tokenIndex457 + return false + }, + /* 11 SpaceOrEnd <- <(CommaSpace? END)> */ + func() bool { + position471, tokenIndex471 := position, tokenIndex + { + position472 := position + { + position473, tokenIndex473 := position, tokenIndex + if !_rules[ruleCommaSpace]() { + goto l473 + } + goto l474 + l473: + position, tokenIndex = position473, tokenIndex473 + } + l474: + if !_rules[ruleEND]() { + goto l471 + } + add(ruleSpaceOrEnd, position472) + } + return true + l471: + position, tokenIndex = position471, tokenIndex471 + return false + }, + /* 12 CommaSpace <- <((_? ',' _?)+ / _)> */ + func() bool { + position475, tokenIndex475 := position, tokenIndex + { + position476 := position + { + position477, tokenIndex477 := position, tokenIndex + { + position481, tokenIndex481 := position, tokenIndex + if !_rules[rule_]() { + goto l481 + } + goto l482 + l481: + position, tokenIndex = position481, tokenIndex481 + } + l482: + if buffer[position] != rune(',') { + goto l478 + } + position++ + { + position483, tokenIndex483 := position, tokenIndex + if !_rules[rule_]() { + goto l483 + } + goto l484 + l483: + position, tokenIndex = position483, tokenIndex483 + } + l484: + l479: + { + position480, tokenIndex480 := position, tokenIndex + { + position485, tokenIndex485 := position, tokenIndex + if !_rules[rule_]() { + goto l485 + } + goto l486 + l485: + position, tokenIndex = position485, tokenIndex485 + } + l486: + if buffer[position] != rune(',') { + goto l480 + } + position++ + { + position487, tokenIndex487 := position, tokenIndex + if !_rules[rule_]() { + goto l487 + } + goto l488 + l487: + position, tokenIndex = position487, tokenIndex487 + } + l488: + goto l479 + l480: + position, tokenIndex = position480, tokenIndex480 + } + goto l477 + l478: + position, tokenIndex = position477, tokenIndex477 + if !_rules[rule_]() { + goto l475 + } + } + l477: + add(ruleCommaSpace, position476) + } + return true + l475: + position, tokenIndex = position475, tokenIndex475 + return false + }, + /* 13 _ <- <(MultipleSpace / SingleSpace)> */ + func() bool { + position489, tokenIndex489 := position, tokenIndex + { + position490 := position + { + position491, tokenIndex491 := position, tokenIndex + if !_rules[ruleMultipleSpace]() { + goto l492 + } + goto l491 + l492: + position, tokenIndex = position491, tokenIndex491 + if !_rules[ruleSingleSpace]() { + goto l489 + } + } + l491: + add(rule_, position490) + } + return true + l489: + position, tokenIndex = position489, tokenIndex489 + return false + }, + /* 14 NotLetterOrEnd <- <(NotLetter / END)> */ + func() bool { + position493, tokenIndex493 := position, tokenIndex + { + position494 := position + { + position495, tokenIndex495 := position, tokenIndex + if !_rules[ruleNotLetter]() { + goto l496 + } + goto l495 + l496: + position, tokenIndex = position495, tokenIndex495 + if !_rules[ruleEND]() { + goto l493 + } + } + l495: + add(ruleNotLetterOrEnd, position494) + } + return true + l493: + position, tokenIndex = position493, tokenIndex493 + return false + }, + /* 15 NotLetter <- <(!([a-z] / [A-Z] / ([0-9] / [0-9]) / '_' / '-') .)> */ + func() bool { + position497, tokenIndex497 := position, tokenIndex + { + position498 := position + { + position499, tokenIndex499 := position, tokenIndex + { + position500, tokenIndex500 := position, tokenIndex + if c := buffer[position]; c < rune('a') || c > rune('z') { + goto l501 + } + position++ + goto l500 + l501: + position, tokenIndex = position500, tokenIndex500 + if c := buffer[position]; c < rune('A') || c > rune('Z') { + goto l502 + } + position++ + goto l500 + l502: + position, tokenIndex = position500, tokenIndex500 + { + position504, tokenIndex504 := position, tokenIndex + if c := buffer[position]; c < rune('0') || c > rune('9') { + goto l505 + } + position++ + goto l504 + l505: + position, tokenIndex = position504, tokenIndex504 + if c := buffer[position]; c < rune('0') || c > rune('9') { + goto l503 + } + position++ + } + l504: + goto l500 + l503: + position, tokenIndex = position500, tokenIndex500 + if buffer[position] != rune('_') { + goto l506 + } + position++ + goto l500 + l506: + position, tokenIndex = position500, tokenIndex500 + if buffer[position] != rune('-') { + goto l499 + } + position++ + } + l500: + goto l497 + l499: + position, tokenIndex = position499, tokenIndex499 + } + if !matchDot() { + goto l497 + } + add(ruleNotLetter, position498) + } + return true + l497: + position, tokenIndex = position497, tokenIndex497 + return false + }, + /* 16 MultipleSpace <- <(SingleSpace SingleSpace+)> */ + func() bool { + position507, tokenIndex507 := position, tokenIndex + { + position508 := position + if !_rules[ruleSingleSpace]() { + goto l507 + } + if !_rules[ruleSingleSpace]() { + goto l507 + } + l509: + { + position510, tokenIndex510 := position, tokenIndex + if !_rules[ruleSingleSpace]() { + goto l510 + } + goto l509 + l510: + position, tokenIndex = position510, tokenIndex510 + } + add(ruleMultipleSpace, position508) + } + return true + l507: + position, tokenIndex = position507, tokenIndex507 + return false + }, + /* 17 SingleSpace <- <(' ' / OtherSpace)> */ + func() bool { + position511, tokenIndex511 := position, tokenIndex + { + position512 := position + { + position513, tokenIndex513 := position, tokenIndex + if buffer[position] != rune(' ') { + goto l514 + } + position++ + goto l513 + l514: + position, tokenIndex = position513, tokenIndex513 + if !_rules[ruleOtherSpace]() { + goto l511 + } + } + l513: + add(ruleSingleSpace, position512) + } + return true + l511: + position, tokenIndex = position511, tokenIndex511 + return false + }, + /* 18 OtherSpace <- <('\u3000' / '\u00a0' / '\t' / '\r' / '\n' / '\f' / '\v')> */ + func() bool { + position515, tokenIndex515 := position, tokenIndex + { + position516 := position + { + position517, tokenIndex517 := position, tokenIndex + if buffer[position] != rune('\u3000') { + goto l518 + } + position++ + goto l517 + l518: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\u00a0') { + goto l519 + } + position++ + goto l517 + l519: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\t') { + goto l520 + } + position++ + goto l517 + l520: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\r') { + goto l521 + } + position++ + goto l517 + l521: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\n') { + goto l522 + } + position++ + goto l517 + l522: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\f') { + goto l523 + } + position++ + goto l517 + l523: + position, tokenIndex = position517, tokenIndex517 + if buffer[position] != rune('\v') { + goto l515 + } + position++ + } + l517: + add(ruleOtherSpace, position516) + } + return true + l515: + position, tokenIndex = position515, tokenIndex515 + return false + }, + /* 19 END <- */ + func() bool { + position524, tokenIndex524 := position, tokenIndex + { + position525 := position + { + position526, tokenIndex526 := position, tokenIndex + if !matchDot() { + goto l526 + } + goto l524 + l526: + position, tokenIndex = position526, tokenIndex526 + } + add(ruleEND, position525) + } + return true + l524: + position, tokenIndex = position524, tokenIndex524 + return false + }, + /* 21 Action0 <- <{ p.tailIndex = int(token.begin) }> */ + func() bool { + { + add(ruleAction0, position) + } + return true + }, + } + p.rules = _rules + return nil +} diff --git a/ent/internal/preparser/preparser.go b/ent/internal/preparser/preparser.go new file mode 100644 index 0000000..ce1f0e2 --- /dev/null +++ b/ent/internal/preparser/preparser.go @@ -0,0 +1,46 @@ +package preparser + +import "github.com/rs/zerolog/log" + +func New() *PreParser { + res := &PreParser{} + res.Init() + return res +} + +type PreString struct { + tailIndex int +} + +// ParseString returns index of the Tail +func (ppr *PreParser) NewString(s string) { + ppr.tailIndex = -1 + ppr.Buffer = s + ppr.Reset() +} + +func (ppr *PreParser) TailIndex(s string) int { + ppr.NewString(s) + if err := ppr.Parse(); err != nil { + log.Warn().Err(err).Msgf("Preparsing broke for string '%s'", s) + return -1 + } + ppr.Execute() + if ppr.tailIndex >= 0 { + rs := []rune(s) + head := rs[0:ppr.tailIndex] + return len([]byte(string(head))) + } + return ppr.tailIndex +} + +// Debug takes a string, parses it, and prints its AST. +func (ppr *PreParser) Debug(q string) error { + ppr.NewString(q) + err := ppr.Parse() + if err != nil { + return err + } + ppr.PrettyPrintSyntaxTree(q) + return nil +} diff --git a/ent/internal/preparser/preparser_test.go b/ent/internal/preparser/preparser_test.go new file mode 100644 index 0000000..a63cbaf --- /dev/null +++ b/ent/internal/preparser/preparser_test.go @@ -0,0 +1,117 @@ +package preparser_test + +import ( + "testing" + + "github.com/gnames/gnparser/ent/internal/preparser" + "github.com/stretchr/testify/assert" +) + +func TestDebug(t *testing.T) { + debug := true + q := "The annulignatha group" + assert := assert.New(t) + ppr := preparser.New() + if debug { + err := ppr.Debug(q) + assert.Nil(err) + } +} + +func TestPreParsed(t *testing.T) { + tests := []struct { + msg, str, tail string + }{ + // Last 'junk' words/ annotations + {"var", "Musca domeſtica Linnaeus 1758 var? ", " var? "}, + {"ined", " Oxalis_barrelieri ined.?", " ined.?"}, + {"ssp.", "Peperomia non-alata Trel. ssp.", " ssp."}, + {"subsp.", "Sanogasta x-signata (Keyserling,1891) subsp.", + " subsp."}, + {"subgen", "Sanogasta x-signata (Keyserling,1891) subgen? ", + " subgen? "}, + {"sensu", "Pseudomonas methanica (Söhngen 1906) sensu. Dworkin and Foster 1956", + " sensu. Dworkin and Foster 1956"}, + {"new", "Hegeter (Hegeter) intercedens Lindberg H 1950 new", " new"}, + {"non", "Anthoscopus Cabanis [1851?] non", " non"}, + {"nec", "Hegeter (Hegeter) intercedens Lindberg H 1950 nec", " nec"}, + {"hybrid", " Arthopyrenia hyalospora x hybrid?", " hybrid?"}, + {"von$", "Nautilus asterizans von", " von"}, + + // Pro Parte + {"Pro Parte", "Abarema clypearia (Jack) Kosterm., Pro Parte", + ", Pro Parte"}, + {"nomen", "Akeratidae Nomen Nudum", " Nomen Nudum"}, + {"nom.", "Akeratidae nom. nudum", " nom. nudum"}, + {"nom illeg", "Abutilon avicennae Gaertn., nom. illeg.", ", nom. illeg."}, + {"comb", "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov.", + " comb. nov."}, + {"p. p.", "Abarema clypearia (Jack) Kosterm., p. p.", ", p. p."}, + {"P. P.", "Abarema clypearia (Jack) Kosterm., P. P.", ", P. P."}, + + // s.s. + {", s. s.", "Bubo bubo, s. s. nov spec something", + ", s. s. nov spec something"}, + {"s.s.", "Bubo bubo s.s. nov spec something", + " s.s. nov spec something"}, + {"s.l.", "Bubo bubo s.l. something", + " s.l. something"}, + {"s. lat.", "Bubo bubo s. lat. something", + " s. lat. something"}, + {"s. str.", "Bubo bubo s. str. something", + " s. str. something"}, + {"no break space", " Canadensis Erxleben, 1777 s.str.", " s.str."}, + + // Stop words + {"env", "Ge Nicéville 1895 Environmental sample", + " Environmental sample"}, + {"env samples", "Candidatus Anammoxoglobus environmental samples", + " environmental samples"}, + {"enrichment", "Crenarchaeote enrichment culture clone OREC-B1022", + " enrichment culture clone OREC-B1022"}, + {"samples", "Candidatus Anammoxoglobus samples", + " samples"}, + + {"sec", "Ataladoris Iredale & O'Donoghue 1923 sec Eschmeyer", + " sec Eschmeyer"}, + {"sec.", "Ataladoris Iredale & O'Donoghue 1923 sec. Eschmeyer", + " sec. Eschmeyer"}, + {"sp compl", "Acarospora cratericola cratericola Shenk 1974 species complex", + " species complex"}, + {"utf8", "× Dialaeliopsis hort.", " hort."}, + } + + assert := assert.New(t) + ppr := preparser.New() + + for _, v := range tests { + idx := ppr.TailIndex(v.str) + assert.True(idx >= 0, v.msg) + assert.Equal(v.tail, string([]byte(v.str)[idx:]), v.msg) + } +} + +func TestNotPreParsed(t *testing.T) { + tests := []struct { + msg, str string + }{ + {"no tail1", "Lachenalia tricolor var. nelsonii (anon.) Baker"}, + {"S. S.", "Bubo bubo, S. S. something"}, + {"dagger", "Heteralocha acutirostris (Gould, 1837) Huia N E†"}, + {"spaces", "Heteralocha acutirostris (Gould, 1837) Huia N E "}, + {"comma", "Abantiadinus pusillus Broun, T. , 1914"}, + {"last comma", "Acalles foveopunctatus Fiedler,"}, + {"space comma", "Calamagrostis neglecta G.Gaertn. ,B.Mey. & Scherb."}, + {"all tail", "Non splenectomized mulatta"}, + {"several commas", "Naupliicola cystifingens Michajlow, ,1968"}, + {"spp", "Crataegus curvisepala nvar. naviculiformis T. Petauer Alaria spp."}, + } + + assert := assert.New(t) + ppr := preparser.New() + + for _, v := range tests { + idx := ppr.TailIndex(v.str) + assert.Equal(-1, idx) + } +} diff --git a/ent/internal/preprocess/preprocess.go b/ent/internal/preprocess/preprocess.go index aae16e5..29c7a5f 100644 --- a/ent/internal/preprocess/preprocess.go +++ b/ent/internal/preprocess/preprocess.go @@ -8,6 +8,8 @@ import ( "regexp" "strings" "unicode" + + "github.com/gnames/gnparser/ent/internal/preparser" ) var VirusException = map[string]string{ @@ -43,7 +45,9 @@ var AmbiguousException = map[string][]string{ "Dicentria": {"dela"}, "Eulaira": {"dela"}, "Gnathopleustes": {"den"}, + "Gobiosoma": {"spec"}, "Helophorus": {"ser"}, + "Lampona": {"spec"}, "Leptonetela": {"la"}, "Malamatidia": {"zu"}, "Meteorus": {"dos"}, @@ -64,32 +68,6 @@ var NoParseException = map[string]string{ "Navicula": "bacterium", } -var notesRe = regexp.MustCompile( - `(?i)\s+((environmental|enrichment|samples|species\s+group|(species\s+)?complex|clade|group|author|nec|vide|fide)\b|non[^a-zA-Z-]).*$`, -) -var taxonConceptsRe1 = regexp.MustCompile( - `(?i)\s+(sero(var|type)|sensu|auct|sec|near|str)\.?\b.*$`, -) -var taxonConceptsRe2 = regexp.MustCompile( - `(,\s*|\s+)(\(?s\.\s?s\.|\(?s\.\s?l\.|\(?s\.\s?str\.|\(?s\.\s?lat\.).*$`, -) -var taxonConceptsRe3 = regexp.MustCompile( - `(?i)(,\s*|\s+)(pro parte|p\.\s?p\.)\s*$`, -) -var nomenConceptsRe = regexp.MustCompile( - `(?i)(,\s*|\s+)(\(?(nomen|nom\.|comb\.)(\s.*)?)$`, -) -var lastWordJunkRe = regexp.MustCompile( - `(?i)(,\s*|\s+)` + - `(var\.?|von|van|ined\.?` + - `|sensu|new|non|nec|ssp\.?` + - `|subsp|subgen|hybrid)\??\s*$`, -) - -var stopWordsRe = regexp.MustCompile( - `\s+(\(?ht\.?\W|\(?hort\.?\W|spec\.|nov\s+spec).*$`, -) - var cultivarRankRe = regexp.MustCompile( `\s+(cultivar\.?[\W_]|cv\.?[\W_]|['"‘’“”]).*$`, ) @@ -120,11 +98,11 @@ type ambiguous struct { // Preprocess runs a series of regular expressions over the input to determine // features of the input before parsing. -func Preprocess(bs []byte) *Preprocessor { +func Preprocess(ppr *preparser.PreParser, bs []byte) *Preprocessor { pr := &Preprocessor{} // check for empty string - if len(bs) == 0 { + if len(bs) == 0 || strings.TrimSpace(string(bs)) == "" { pr.NoParse = true return pr } @@ -155,7 +133,7 @@ func Preprocess(bs []byte) *Preprocessor { pr.ambiguous(words[0], bs) } - j := procAnnot(bs[0:i]) + j := procAnnot(ppr, bs[0:i]) if j < i { pr.Annotation = true i = j @@ -215,17 +193,10 @@ func (p *Preprocessor) ambiguous(firstWord string, bs []byte) { // procAnnot returns index where unparsed part starts. In case if // the full string can be parsed, returns returns the index of the end of the // input. -func procAnnot(bs []byte) int { +func procAnnot(ppr *preparser.PreParser, bs []byte) int { i := len(bs) - regexps := []*regexp.Regexp{ - notesRe, taxonConceptsRe1, taxonConceptsRe2, taxonConceptsRe3, - nomenConceptsRe, lastWordJunkRe, stopWordsRe, - } - for _, r := range regexps { - loc := r.FindIndex(bs[0:i]) - if len(loc) > 0 { - i = loc[0] - } + if idx := ppr.TailIndex(string(bs)); idx >= 0 { + i = idx } // If ` of ` is in the string, before the start of the already-calculated diff --git a/ent/internal/preprocess/preprocess_test.go b/ent/internal/preprocess/preprocess_test.go index f6ce3f8..f042b7e 100644 --- a/ent/internal/preprocess/preprocess_test.go +++ b/ent/internal/preprocess/preprocess_test.go @@ -4,6 +4,7 @@ import ( "strings" "testing" + "github.com/gnames/gnparser/ent/internal/preparser" "github.com/stretchr/testify/assert" ) @@ -29,7 +30,7 @@ func TestCleanup(t *testing.T) { {"entities", "Hello & you", "Hello & you"}, } for _, v := range data { - assert.Equal(t, StripTags(v.tags), v.notags, v.msg) + assert.Equal(t, v.notags, StripTags(v.tags), v.msg) } }) t.Run("does not return nil", func(t *testing.T) { @@ -49,7 +50,7 @@ func TestPreprocess(t *testing.T) { } for _, v := range data { words := strings.Split(v.name, " ") - assert.Equal(t, isException(words, NoParseException), v.likeAnnotation, v.msg) + assert.Equal(t, v.likeAnnotation, isException(words, NoParseException), v.msg) } }) @@ -79,7 +80,7 @@ func TestPreprocess(t *testing.T) { } for _, v := range data { words := strings.Split(v.name, " ") - assert.Equal(t, isException(words, VirusException), v.likeVirus, v.msg) + assert.Equal(t, v.likeVirus, isException(words, VirusException), v.msg) } }) @@ -110,7 +111,7 @@ func TestPreprocess(t *testing.T) { } for _, v := range data { res := IsVirus([]byte(v.name)) - assert.Equal(t, res, v.isVirus, v.msg) + assert.Equal(t, v.isVirus, res, v.msg) } }) @@ -144,12 +145,12 @@ func TestPreprocess(t *testing.T) { } for _, v := range data { res := NoParse([]byte(v.name)) - assert.Equal(t, res, v.parsed, v.msg) + assert.Equal(t, v.parsed, res, v.msg) } }) t.Run("Annotations", func(t *testing.T) { - data := []struct { + tests := []struct { msg string in string out string @@ -157,16 +158,18 @@ func TestPreprocess(t *testing.T) { }{ {"No tail", "Homo sapiens", "Homo sapiens", ""}, - {"No tail", "Homo sapiens S. S.", "Homo sapiens S. S.", ""}, - {"No tail", "Homo sapiens s. s.", "Homo sapiens", " s. s."}, - {"No tail", "Homo sapiens sensu Linn.", "Homo sapiens", " sensu Linn."}, - {"No tail", "Homo sapiens nomen nudum", "Homo sapiens", " nomen nudum"}, + {"S. S.", "Homo sapiens S. S.", "Homo sapiens S. S.", ""}, + {"s. s.", "Homo sapiens s. s.", "Homo sapiens", " s. s."}, + {"sensu", "Homo sapiens sensu Linn.", "Homo sapiens", " sensu Linn."}, + {"nomen", "Homo sapiens nomen nudum", "Homo sapiens", " nomen nudum"}, } - for _, v := range data { + ppr := preparser.New() + + for _, v := range tests { bs := []byte(v.in) - i := procAnnot(bs) - assert.Equal(t, string(bs[0:i]), v.out, v.msg) - assert.Equal(t, string(bs[i:]), v.tail, v.msg) + i := procAnnot(ppr, bs) + assert.Equal(t, v.out, string(bs[0:i]), v.msg) + assert.Equal(t, v.tail, string(bs[i:]), v.msg) } }) @@ -185,14 +188,15 @@ func TestPreprocess(t *testing.T) { for _, v := range data { bs := []byte(v.in) changed2, _ := UnderscoreToSpace(bs) - assert.Equal(t, string(bs), v.out, v.msg) - assert.Equal(t, changed2, v.changed) + assert.Equal(t, v.out, string(bs), v.msg) + assert.Equal(t, v.changed, changed2) } }) t.Run("does not remove spaces", func(t *testing.T) { name := " Asplenium × inexpectatum(E. L. Braun ex Friesner )Morton" - res := Preprocess([]byte(name)) - assert.Equal(t, string(res.Body), name) + ppr := preparser.New() + res := Preprocess(ppr, []byte(name)) + assert.Equal(t, name, string(res.Body)) }) } diff --git a/ent/parsed/annotation_test.go b/ent/parsed/annotation_test.go index 89d597c..fd8e2ab 100644 --- a/ent/parsed/annotation_test.go +++ b/ent/parsed/annotation_test.go @@ -20,7 +20,7 @@ func TestStringAnnot(t *testing.T) { } for i := range data { - assert.Equal(t, data[i].annot.String(), data[i].res) + assert.Equal(t, data[i].res, data[i].annot.String()) } } @@ -44,9 +44,9 @@ func TestJSONAnnot(t *testing.T) { for i := range data { res, err := enc.Encode(data[i].dob) assert.Nil(t, err) - assert.Equal(t, string(res), data[i].res) + assert.Equal(t, data[i].res, string(res)) err = enc.Decode(res, &dob) assert.Nil(t, err) - assert.Equal(t, dob.Annot, data[i].dob.Annot) + assert.Equal(t, data[i].dob.Annot, dob.Annot) } } diff --git a/ent/parsed/warning_test.go b/ent/parsed/warning_test.go index 3117b2a..ddb8bdc 100644 --- a/ent/parsed/warning_test.go +++ b/ent/parsed/warning_test.go @@ -17,7 +17,7 @@ func TestStringWarn(t *testing.T) { } for i := range data { - assert.Equal(t, data[i].annot.String(), data[i].res) + assert.Equal(t, data[i].res, data[i].annot.String()) } } @@ -41,9 +41,9 @@ func TestJSONWarn(t *testing.T) { for i := range data { res, err := enc.Encode(data[i].dob) assert.Nil(t, err) - assert.Equal(t, string(res), data[i].res) + assert.Equal(t, data[i].res, string(res)) err = enc.Decode(res, &dob) assert.Nil(t, err) - assert.Equal(t, dob.Warn, data[i].dob.Warn) + assert.Equal(t, data[i].dob.Warn, dob.Warn) } } diff --git a/ent/parser/engine.go b/ent/parser/engine.go index 7647c22..c12f165 100644 --- a/ent/parser/engine.go +++ b/ent/parser/engine.go @@ -1,242 +1,245 @@ package parser import ( - "io" + "io" - "github.com/gnames/gnparser/ent/parsed" - "github.com/gnames/gnparser/io/dict" - "github.com/gnames/tribool" + "github.com/gnames/gnparser/ent/internal/preparser" + "github.com/gnames/gnparser/ent/parsed" + "github.com/gnames/gnparser/io/dict" + "github.com/gnames/tribool" ) type baseEngine struct { - sn *scientificNameNode - root *node32 - cardinality int - error error - hybrid *parsed.Annotation - graftChimera *parsed.Annotation - surrogate *parsed.Annotation - bacteria *tribool.Tribool - warnings map[parsed.Warning]struct{} - tail string - enableCultivars bool - preserveDiaereses bool + preParser *preparser.PreParser + sn *scientificNameNode + root *node32 + cardinality int + error error + hybrid *parsed.Annotation + graftChimera *parsed.Annotation + surrogate *parsed.Annotation + bacteria *tribool.Tribool + warnings map[parsed.Warning]struct{} + tail string + enableCultivars bool + preserveDiaereses bool } // New creates implementation of Parser interface. func New() Parser { - p := Engine{} - p.Init() - return &p + p := Engine{} + p.Init() + p.preParser = preparser.New() + return &p } func (p *Engine) fullReset() { - p.cardinality = 0 - p.error = nil - p.hybrid = nil - p.graftChimera = nil - p.surrogate = nil - p.bacteria = nil - var warnReset map[parsed.Warning]struct{} - p.warnings = warnReset - p.tail = "" - p.Reset() + p.cardinality = 0 + p.error = nil + p.hybrid = nil + p.graftChimera = nil + p.surrogate = nil + p.bacteria = nil + var warnReset map[parsed.Warning]struct{} + p.warnings = warnReset + p.tail = "" + p.Reset() } func (p *Engine) addWarn(w parsed.Warning) { - if p.warnings == nil { - p.warnings = make(map[parsed.Warning]struct{}) - } - if _, ok := p.warnings[w]; !ok { - p.warnings[w] = struct{}{} - } + if p.warnings == nil { + p.warnings = make(map[parsed.Warning]struct{}) + } + if _, ok := p.warnings[w]; !ok { + p.warnings[w] = struct{}{} + } } func (p *Engine) isBacteria(gen string) { - if hom, ok := dict.Dict.Bacteria[gen]; ok { - if hom { - p.addWarn(parsed.BacteriaMaybeWarn) - bac := tribool.New(0) - p.bacteria = &bac - } else { - bac := tribool.New(1) - p.bacteria = &bac - } - } + if hom, ok := dict.Dict.Bacteria[gen]; ok { + if hom { + p.addWarn(parsed.BacteriaMaybeWarn) + bac := tribool.New(0) + p.bacteria = &bac + } else { + bac := tribool.New(1) + p.bacteria = &bac + } + } } -// outputAST assembles PEG nodes AST structure. +// outputAST assembles PEG nodes' AST structure. func (p *Engine) outputAST() { - type element struct { - node *node32 - down *element - } - var node *node32 - var skip bool - var stack *element - for _, token := range p.Tokens() { - if node, skip = p.newNode(token); skip { - continue - } - for stack != nil && stackNodeIsWithin(stack.node, token) { - stack.node.next = node.up - node.up = stack.node - stack = stack.down - } - stack = &element{node: node, down: stack} - } - if stack != nil { - p.root = stack.node - } + type element struct { + node *node32 + down *element + } + var node *node32 + var skip bool + var stack *element + for _, token := range p.Tokens() { + if node, skip = p.newNode(token); skip { + continue + } + for stack != nil && stackNodeIsWithin(stack.node, token) { + stack.node.next = node.up + node.up = stack.node + stack = stack.down + } + stack = &element{node: node, down: stack} + } + if stack != nil { + p.root = stack.node + } } func stackNodeIsWithin(n *node32, t token32) bool { - return n.begin >= t.begin && n.end <= t.end + return n.begin >= t.begin && n.end <= t.end } // PrintOutputSyntaxTree outputs a simplified version of a nodes // Abstract Syntax Tree. This method can be used for debugging purposes. func (p *Engine) PrintOutputSyntaxTree(w io.Writer) { - if p.root == nil || p.root.pegRule != ruleSciName { - return - } - p.root.print(w, true, p.Buffer) + if p.root == nil || p.root.pegRule != ruleSciName { + return + } + p.root.print(w, true, p.Buffer) } func (p *Engine) newNode(t token32) (*node32, bool) { - var node *node32 - var annot parsed.Annotation - switch t.pegRule { - case ruleHybridChar: - annot = parsed.HybridAnnot - p.hybrid = &annot - case ruleGraftChimeraChar: - annot = parsed.GraftChimeraAnnot - p.hybrid = &annot - case ruleRankNotho, ruleRankUninomialNotho: - annot = parsed.NothoHybridAnnot - p.hybrid = &annot - p.addWarn(parsed.HybridNamedWarn) - case ruleOtherSpace: - p.addWarn(parsed.SpaceNonStandardWarn) - case ruleMiscodedChar: - p.addWarn(parsed.UTF8ConvBadWarn) - case ruleAbbrSubgenus: - p.addWarn(parsed.SubgenusAbbrWarn) - case ruleBasionymAuthorship2Parens: - p.addWarn(parsed.AuthDoubleParensWarn) - case ruleBasionymAuthorshipMissingParens: - p.addWarn(parsed.AuthMissingOneParensWarn) - case ruleUpperAfterDash: - p.addWarn(parsed.GenusUpperCharAfterDash) - case ruleLowerGreek: - p.addWarn(parsed.GreekLetterInRank) - case ruleAuthorSepSpanish: - p.addWarn(parsed.SpanishAndAsSeparator) - } - if _, ok := nodeRules[t.pegRule]; ok { - node = &node32{token32: t} - return node, false - } + var node *node32 + var annot parsed.Annotation + switch t.pegRule { + case ruleHybridChar: + annot = parsed.HybridAnnot + p.hybrid = &annot + case ruleGraftChimeraChar: + annot = parsed.GraftChimeraAnnot + p.hybrid = &annot + case ruleRankNotho, ruleRankUninomialNotho: + annot = parsed.NothoHybridAnnot + p.hybrid = &annot + p.addWarn(parsed.HybridNamedWarn) + case ruleOtherSpace: + p.addWarn(parsed.SpaceNonStandardWarn) + case ruleMiscodedChar: + p.addWarn(parsed.UTF8ConvBadWarn) + case ruleAbbrSubgenus: + p.addWarn(parsed.SubgenusAbbrWarn) + case ruleBasionymAuthorship2Parens: + p.addWarn(parsed.AuthDoubleParensWarn) + case ruleBasionymAuthorshipMissingParens: + p.addWarn(parsed.AuthMissingOneParensWarn) + case ruleUpperAfterDash: + p.addWarn(parsed.GenusUpperCharAfterDash) + case ruleLowerGreek: + p.addWarn(parsed.GreekLetterInRank) + case ruleAuthorSepSpanish: + p.addWarn(parsed.SpanishAndAsSeparator) + } + if _, ok := nodeRules[t.pegRule]; ok { + node = &node32{token32: t} + return node, false + } - return node, true + return node, true } func (p *Engine) nodeValue(n *node32) string { - t := n.token32 - v := string([]rune(p.Buffer)[t.begin:t.end]) - return v + t := n.token32 + v := string([]rune(p.Buffer)[t.begin:t.end]) + return v } // ParseName returns the name the nodes. In case of parsing errors // returns string 'noparse'. func (p *Engine) ParsedName() string { - if p.error != nil { - return "noparse" - } - for i := len(p.tree) - 1; i >= 0; i-- { - t := p.tree[i] - if t.pegRule == ruleName { - return string(p.buffer[t.begin:t.end]) - } - } - return "noparse" + if p.error != nil { + return "noparse" + } + for i := len(p.tree) - 1; i >= 0; i-- { + t := p.tree[i] + if t.pegRule == ruleName { + return string(p.buffer[t.begin:t.end]) + } + } + return "noparse" } var nodeRules = map[pegRule]struct{}{ - ruleAbbrGenus: {}, - ruleAbbrSubgenus: {}, - ruleAllCapsAuthorWord: {}, - ruleApostrOther: {}, - ruleApproxNameIgnored: {}, - ruleApproximation: {}, - ruleAuthor: {}, - ruleAuthorEmend: {}, - ruleAuthorEtAl: {}, - ruleAuthorEx: {}, - ruleAuthorPrefix: {}, - ruleAuthorSep: {}, - ruleAuthorSuffix: {}, - ruleAuthorWord: {}, - ruleAuthorsGroup: {}, - ruleAuthorsTeam: {}, - ruleAuthorship: {}, - ruleBasionymAuthorship: {}, - ruleBasionymAuthorshipMissingParens: {}, - ruleBasionymAuthorshipYearMisformed: {}, - ruleCandidatus: {}, - ruleCandidatusName: {}, - ruleCombinationAuthorship: {}, - ruleComparison: {}, - ruleCultivar: {}, - ruleCultivarRecursive: {}, - ruleDotPrefix: {}, - ruleFilius: {}, - ruleFiliusFNoSpace: {}, - ruleGenusWord: {}, - ruleGraftChimeraChar: {}, - ruleGraftChimeraFormula: {}, - ruleHybridChar: {}, - ruleHybridFormula: {}, - ruleInfraspEpithet: {}, - ruleInfraspGroup: {}, - ruleLowerCharExtended: {}, - ruleName: {}, - ruleNameApprox: {}, - ruleNameComp: {}, - ruleNameSpecies: {}, - ruleNamedGenusGraftChimera: {}, - ruleNamedGenusHybrid: {}, - ruleNamedSpeciesHybrid: {}, - ruleOriginalAuthorship: {}, - ruleOriginalAuthorshipComb: {}, - ruleRank: {}, - ruleRankCultivar: {}, - ruleRankForma: {}, - ruleRankOtherUncommon: {}, - ruleRankSsp: {}, - ruleRankUninomial: {}, - ruleRankVar: {}, - ruleSciName: {}, - ruleSingleName: {}, - ruleSpeciesEpithet: {}, - ruleSubgenus: {}, - ruleSubgenusOrSuperspecies: {}, - ruleTail: {}, - ruleUninomial: {}, - ruleUninomialCombo: {}, - ruleUninomialWord: {}, - ruleUnknownAuthor: {}, - ruleUpperCharExtended: {}, - ruleWord: {}, - ruleWordApostr: {}, - ruleWordStartsWithDigit: {}, - ruleYear: {}, - ruleYearApprox: {}, - ruleYearNum: {}, - ruleYearRange: {}, - ruleYearWithChar: {}, - ruleYearWithDot: {}, - ruleYearWithPage: {}, - ruleYearWithParens: {}, + ruleAbbrGenus: {}, + ruleAbbrSubgenus: {}, + ruleAllCapsAuthorWord: {}, + ruleApostrOther: {}, + ruleApproxNameIgnored: {}, + ruleApproximation: {}, + ruleAuthor: {}, + ruleAuthorEmend: {}, + ruleAuthorEtAl: {}, + ruleAuthorEx: {}, + ruleAuthorPrefix: {}, + ruleAuthorSep: {}, + ruleAuthorSuffix: {}, + ruleAuthorWord: {}, + ruleAuthorsGroup: {}, + ruleAuthorsTeam: {}, + ruleAuthorship: {}, + ruleBasionymAuthorship: {}, + ruleBasionymAuthorshipMissingParens: {}, + ruleBasionymAuthorshipYearMisformed: {}, + ruleCandidatus: {}, + ruleCandidatusName: {}, + ruleCombinationAuthorship: {}, + ruleComparison: {}, + ruleCultivar: {}, + ruleCultivarRecursive: {}, + ruleDotPrefix: {}, + ruleFilius: {}, + ruleFiliusFNoSpace: {}, + ruleGenusWord: {}, + ruleGraftChimeraChar: {}, + ruleGraftChimeraFormula: {}, + ruleHybridChar: {}, + ruleHybridFormula: {}, + ruleInfraspEpithet: {}, + ruleInfraspGroup: {}, + ruleLowerCharExtended: {}, + ruleName: {}, + ruleNameApprox: {}, + ruleNameComp: {}, + ruleNameSpecies: {}, + ruleNamedGenusGraftChimera: {}, + ruleNamedGenusHybrid: {}, + ruleNamedSpeciesHybrid: {}, + ruleOriginalAuthorship: {}, + ruleOriginalAuthorshipComb: {}, + ruleRank: {}, + ruleRankCultivar: {}, + ruleRankForma: {}, + ruleRankOtherUncommon: {}, + ruleRankSsp: {}, + ruleRankUninomial: {}, + ruleRankVar: {}, + ruleSciName: {}, + ruleSingleName: {}, + ruleSpeciesEpithet: {}, + ruleSubgenus: {}, + ruleSubgenusOrSuperspecies: {}, + ruleTail: {}, + ruleUninomial: {}, + ruleUninomialCombo: {}, + ruleUninomialWord: {}, + ruleUnknownAuthor: {}, + ruleUpperCharExtended: {}, + ruleWord: {}, + ruleWordApostr: {}, + ruleWordStartsWithDigit: {}, + ruleYear: {}, + ruleYearApprox: {}, + ruleYearNum: {}, + ruleYearRange: {}, + ruleYearWithChar: {}, + ruleYearWithDot: {}, + ruleYearWithPage: {}, + ruleYearWithParens: {}, } diff --git a/ent/parser/parser.go b/ent/parser/parser.go index daae039..1804d22 100644 --- a/ent/parser/parser.go +++ b/ent/parser/parser.go @@ -14,7 +14,7 @@ import ( // Debug takes a string, parsers it, and returns a byte representation of // the node tree func (p *Engine) Debug(s string) []byte { - ppr := preprocess.Preprocess([]byte(s)) + ppr := preprocess.Preprocess(p.preParser, []byte(s)) var b bytes.Buffer if ppr.NoParse || ppr.Virus { b.WriteString("\n*** Preprocessing: NO PARSE ***\n") @@ -63,7 +63,7 @@ func (p *Engine) PreprocessAndParse( } } - preproc := preprocess.Preprocess([]byte(s)) + preproc := preprocess.Preprocess(p.preParser, []byte(s)) defer func() { p.sn.daggerChar = preproc.DaggerChar diff --git a/ent/parser/parser_test.go b/ent/parser/parser_test.go index 0be544b..c441377 100644 --- a/ent/parser/parser_test.go +++ b/ent/parser/parser_test.go @@ -9,8 +9,7 @@ import ( // TTestPreNParse tests PreprocessAndParse method func TestPreNParse(t *testing.T) { - p := &parser.Engine{Buffer: ""} - p.Init() + p := parser.New() testData := []struct { name, can string }{ @@ -26,14 +25,13 @@ func TestPreNParse(t *testing.T) { assert.Nil(t, can, msg) continue } - assert.Equal(t, can.Simple, v.can, msg) + assert.Equal(t, v.can, can.Simple, msg) } } // TTestToOutput tests ToOutput method of ScientificNameNode func TestToOutput(t *testing.T) { - p := &parser.Engine{Buffer: ""} - p.Init() + p := parser.New() testData := []struct { name, can, au string det, parsed bool @@ -61,7 +59,7 @@ func TestToOutput(t *testing.T) { assert.Nil(t, out.Canonical, msg) continue } - assert.Equal(t, out.Canonical.Simple, v.can, msg) - assert.Equal(t, out.Authorship.Normalized, v.au, msg) + assert.Equal(t, v.can, out.Canonical.Simple, msg) + assert.Equal(t, v.au, out.Authorship.Normalized, msg) } } diff --git a/ent/stemmer/stemmer_test.go b/ent/stemmer/stemmer_test.go index 504f2f3..997204a 100644 --- a/ent/stemmer/stemmer_test.go +++ b/ent/stemmer/stemmer_test.go @@ -15,12 +15,12 @@ import ( func TestStemmer(t *testing.T) { stemsDict := stemData(t) t.Run("treats que suffix with exceptions", func(t *testing.T) { - assert.Equal(t, stemmer.Stem("detorque").Stem, "detorque") - assert.Equal(t, stemmer.Stem("somethingque").Stem, "something") + assert.Equal(t, "detorque", stemmer.Stem("detorque").Stem) + assert.Equal(t, "something", stemmer.Stem("somethingque").Stem) }) t.Run("removes suffixes correctly", func(t *testing.T) { for k, v := range stemsDict { - assert.Equal(t, stemmer.Stem(k).Stem, v) + assert.Equal(t, v, stemmer.Stem(k).Stem) } }) @@ -39,7 +39,7 @@ func TestStemmer(t *testing.T) { {"GraftChimeraFormula2", "Cytisus purpureus + Laburnum anagyroides", "Cytisus purpure + Laburnum anagyroid"}, } for _, v := range data { - assert.Equal(t, stemmer.StemCanonical(v.in), v.out, v.msg) + assert.Equal(t, v.out, stemmer.StemCanonical(v.in), v.msg) } }) } diff --git a/ent/str/str_test.go b/ent/str/str_test.go index 4d55274..d2b335d 100644 --- a/ent/str/str_test.go +++ b/ent/str/str_test.go @@ -1,138 +1,138 @@ package str_test import ( - "testing" + "testing" - "github.com/gnames/gnparser/ent/str" - "github.com/stretchr/testify/assert" + "github.com/gnames/gnparser/ent/str" + "github.com/stretchr/testify/assert" ) func TestStringTools(t *testing.T) { - t.Run("CapitalizeName", func(t *testing.T) { - tests := []struct { - msg string - in string - out string - }{ - {"common canonical", "Pomatomus saltator", "Pomatomus saltator"}, - {"low-case canonical", "pomatomus saltator", "Pomatomus saltator"}, - {"hybrid sign", "× Hydnellum scrobiculatum", "× Hydnellum scrobiculatum"}, - {"hybrid sign2", "×Hydnellum scrobiculatum", "×Hydnellum scrobiculatum"}, - {"hybrid x", "xHydnellum scrobiculatum", "xHydnellum scrobiculatum"}, - {"first x", "xhydnellum scrobiculatum", "Xhydnellum scrobiculatum"}, - {"first x", "x hydnellum scrobiculatum", "x hydnellum scrobiculatum"}, - {"uninomial", "bubo", "Bubo"}, - {"greek", "ß-Goma-dimeroceras Sobolew", "ß-Goma-dimeroceras Sobolew"}, - {"hindi", "खपृष्ठ म", "खपृष्ठ म"}, - } - for _, v := range tests { - res := str.CapitalizeName(v.in) - assert.Equal(t, res, v.out, v.msg) - } - }) + t.Run("CapitalizeName", func(t *testing.T) { + tests := []struct { + msg string + in string + out string + }{ + {"common canonical", "Pomatomus saltator", "Pomatomus saltator"}, + {"low-case canonical", "pomatomus saltator", "Pomatomus saltator"}, + {"hybrid sign", "× Hydnellum scrobiculatum", "× Hydnellum scrobiculatum"}, + {"hybrid sign2", "×Hydnellum scrobiculatum", "×Hydnellum scrobiculatum"}, + {"hybrid x", "xHydnellum scrobiculatum", "xHydnellum scrobiculatum"}, + {"first x", "xhydnellum scrobiculatum", "Xhydnellum scrobiculatum"}, + {"first x", "x hydnellum scrobiculatum", "x hydnellum scrobiculatum"}, + {"uninomial", "bubo", "Bubo"}, + {"greek", "ß-Goma-dimeroceras Sobolew", "ß-Goma-dimeroceras Sobolew"}, + {"hindi", "खपृष्ठ म", "खपृष्ठ म"}, + } + for _, v := range tests { + res := str.CapitalizeName(v.in) + assert.Equal(t, v.out, res, v.msg) + } + }) - t.Run("NormalizePreservingDiaereses", func(t *testing.T) { - tests := []struct { - msg string - in string - out string - }{ - {"Döringina", "Döringina", "Doeringina"}, - {"Lecythis paraënsis", "Lecythis paraënsis", "Lecythis paraënsis"}, - {"thomæ", "thomæ", "thomae"}, - {"many ö", "ööö", "oeoeoe"}, - {"’", "’", ""}, - {"‘", "‘", ""}, - } - for _, v := range tests { - res := str.NormalizePreservingDiaereses(v.in) - assert.Equal(t, res, v.out, v.msg) - } - }) + t.Run("NormalizePreservingDiaereses", func(t *testing.T) { + tests := []struct { + msg string + in string + out string + }{ + {"Döringina", "Döringina", "Doeringina"}, + {"Lecythis paraënsis", "Lecythis paraënsis", "Lecythis paraënsis"}, + {"thomæ", "thomæ", "thomae"}, + {"many ö", "ööö", "oeoeoe"}, + {"’", "’", ""}, + {"‘", "‘", ""}, + } + for _, v := range tests { + res := str.NormalizePreservingDiaereses(v.in) + assert.Equal(t, v.out, res, v.msg) + } + }) - t.Run("ToASCII", func(t *testing.T) { - tests := []struct { - msg string - in string - out string - tbl map[rune]string - }{ - {"Döringina", "Döringina", "Doeringina", str.Transliterations}, - {"Aëtosaurus", "Aëtosaurus", "Aetosaurus", str.Transliterations}, - {"thomæ", "thomæ", "thomae", str.Transliterations}, - {"many ö", "ööö", "oeoeoe", str.Transliterations}, - {"’", "’", "'", str.GlobalTransliterations}, - {"‘", "‘", "'", str.GlobalTransliterations}, - {"’", "’", "", str.Transliterations}, - {"‘", "‘", "", str.Transliterations}, - } - for _, v := range tests { - res := str.ToASCII(v.in, v.tbl) - assert.Equal(t, res, v.out, v.msg) - } - }) + t.Run("ToASCII", func(t *testing.T) { + tests := []struct { + msg string + in string + out string + tbl map[rune]string + }{ + {"Döringina", "Döringina", "Doeringina", str.Transliterations}, + {"Aëtosaurus", "Aëtosaurus", "Aetosaurus", str.Transliterations}, + {"thomæ", "thomæ", "thomae", str.Transliterations}, + {"many ö", "ööö", "oeoeoe", str.Transliterations}, + {"’", "’", "'", str.GlobalTransliterations}, + {"‘", "‘", "'", str.GlobalTransliterations}, + {"’", "’", "", str.Transliterations}, + {"‘", "‘", "", str.Transliterations}, + } + for _, v := range tests { + res := str.ToASCII(v.in, v.tbl) + assert.Equal(t, v.out, res, v.msg) + } + }) - t.Run("NumToStr", func(t *testing.T) { - tests := []struct { - msg string - in string - out string - }{ - {"1", "1", "uni"}, - {"2", "2", "bi"}, - {"3", "3", "tri"}, - {"4", "4", "quadri"}, - {"5", "5", "quinque"}, - {"6", "6", "sex"}, - {"7", "7", "septem"}, - {"8", "8", "octo"}, - {"9", "9", "novem"}, - {"10", "10", "decem"}, - {"11", "11", "undecim"}, - {"12", "12", "duodecim"}, - {"13", "13", "tredecim"}, - {"14", "14", "quatuordecim"}, - {"15", "15", "quindecim"}, - {"16", "16", "sedecim"}, - {"17", "17", "septendecim"}, - {"18", "18", "octodecim"}, - {"19", "19", "novemdecim"}, - {"20", "20", "viginti"}, - {"21", "21", "vigintiuno"}, - {"22", "22", "vigintiduo"}, - {"23", "23", "vigintitre"}, - {"24", "24", "vigintiquatuor"}, - {"25", "25", "vigintiquinque"}, - {"26", "26", "vigintisex"}, - {"27", "27", "vigintiseptem"}, - {"28", "28", "vigintiocto"}, - {"30", "30", "triginta"}, - {"31", "31", "trigintauno"}, - {"32", "32", "trigintaduo"}, - {"38", "38", "trigintaocto"}, - {"40", "40", "quadraginta"}, - {"400", "400", "400"}, - {"something", "something", "something"}, - } - for _, v := range tests { - res := str.NumToStr(v.in) - assert.Equal(t, res, v.out, v.msg) - } - }) + t.Run("NumToStr", func(t *testing.T) { + tests := []struct { + msg string + in string + out string + }{ + {"1", "1", "uni"}, + {"2", "2", "bi"}, + {"3", "3", "tri"}, + {"4", "4", "quadri"}, + {"5", "5", "quinque"}, + {"6", "6", "sex"}, + {"7", "7", "septem"}, + {"8", "8", "octo"}, + {"9", "9", "novem"}, + {"10", "10", "decem"}, + {"11", "11", "undecim"}, + {"12", "12", "duodecim"}, + {"13", "13", "tredecim"}, + {"14", "14", "quatuordecim"}, + {"15", "15", "quindecim"}, + {"16", "16", "sedecim"}, + {"17", "17", "septendecim"}, + {"18", "18", "octodecim"}, + {"19", "19", "novemdecim"}, + {"20", "20", "viginti"}, + {"21", "21", "vigintiuno"}, + {"22", "22", "vigintiduo"}, + {"23", "23", "vigintitre"}, + {"24", "24", "vigintiquatuor"}, + {"25", "25", "vigintiquinque"}, + {"26", "26", "vigintisex"}, + {"27", "27", "vigintiseptem"}, + {"28", "28", "vigintiocto"}, + {"30", "30", "triginta"}, + {"31", "31", "trigintauno"}, + {"32", "32", "trigintaduo"}, + {"38", "38", "trigintaocto"}, + {"40", "40", "quadraginta"}, + {"400", "400", "400"}, + {"something", "something", "something"}, + } + for _, v := range tests { + res := str.NumToStr(v.in) + assert.Equal(t, v.out, res, v.msg) + } + }) - t.Run("FixAllCaps", func(t *testing.T) { - tests := []struct { - msg string - in string - out string - }{ - {"KURNAKOV", "KURNAKOV", "Kurnakov"}, - {"GÓMEZ-BOLEA", "GÓMEZ-BOLEA", "Gómez-Bolea"}, - {"hello", "hello", "hello"}, - } - for _, v := range tests { - res := str.FixAllCaps(v.in) - assert.Equal(t, res, v.out, v.msg) - } - }) + t.Run("FixAllCaps", func(t *testing.T) { + tests := []struct { + msg string + in string + out string + }{ + {"KURNAKOV", "KURNAKOV", "Kurnakov"}, + {"GÓMEZ-BOLEA", "GÓMEZ-BOLEA", "Gómez-Bolea"}, + {"hello", "hello", "hello"}, + } + for _, v := range tests { + res := str.FixAllCaps(v.in) + assert.Equal(t, v.out, res, v.msg) + } + }) } diff --git a/gnparser/tools.go b/gnparser/tools.go index 0c88eba..18b918c 100644 --- a/gnparser/tools.go +++ b/gnparser/tools.go @@ -1,10 +1,11 @@ +//go:build tools // +build tools package main import ( _ "github.com/pointlander/peg" - _ "github.com/spf13/cobra/cobra" + _ "github.com/spf13/cobra" _ "golang.org/x/perf/cmd/benchstat" _ "golang.org/x/tools/cmd/goimports" ) diff --git a/gnparser_test.go b/gnparser_test.go index 0645677..0976364 100644 --- a/gnparser_test.go +++ b/gnparser_test.go @@ -30,7 +30,7 @@ func TestParseName(t *testing.T) { for _, v := range data { parsed := gnp.ParseName(v.name) json := parsed.Output(gnp.Format()) - assert.Equal(t, json, v.jsonData, v.name) + assert.Equal(t, v.jsonData, json, v.name) } } @@ -46,7 +46,7 @@ func TestParseNameCultivars(t *testing.T) { for _, v := range data { parsed := gnp.ParseName(v.name) json := parsed.Output(gnp.Format()) - assert.Equal(t, json, v.jsonData, v.name) + assert.Equal(t, v.jsonData, json, v.name) } } @@ -66,11 +66,11 @@ func TestParseLowCaseName(t *testing.T) { for _, v := range tests { parsed := gnp.ParseName(v.in) if v.out != "" { - assert.Equal(t, parsed.Canonical.Simple, v.out, v.msg) + assert.Equal(t, v.out, parsed.Canonical.Simple, v.msg) } else { assert.Nil(t, parsed.Canonical) } - assert.Equal(t, parsed.ParseQuality, v.quality, v.msg) + assert.Equal(t, v.quality, parsed.ParseQuality, v.msg) } } @@ -90,9 +90,9 @@ func TestParsePreserveDiaereses(t *testing.T) { gnp := gnparser.New(cfg) for _, v := range tests { parsed := gnp.ParseName(v.in) - assert.Equal(t, parsed.Canonical.Simple, v.canonical, v.msg) - assert.Equal(t, parsed.Normalized, v.normalized, v.msg) - assert.Equal(t, parsed.ParseQuality, v.quality, v.msg) + assert.Equal(t, v.canonical, parsed.Canonical.Simple, v.msg) + assert.Equal(t, v.normalized, parsed.Normalized, v.msg) + assert.Equal(t, v.quality, parsed.ParseQuality, v.msg) } } @@ -105,12 +105,12 @@ func TestWordNormalizeByType(t *testing.T) { {"betula", "Betula", "betula", parsed.GenusType}, {"alba", "alba", "alb", parsed.SpEpithetType}, {"Linn", "Linn.", "linn.", parsed.AuthorWordType}, - {"yr", "1888", "1888", parsed.YearType}, + {"yr", "1888", "1888", parsed.YearType}, } for _, v := range tests { res := parsed.NormalizeByType(v.word, v.wType) - assert.Equal(t, res, v.norm, v.msg) + assert.Equal(t, v.norm, res, v.msg) } } @@ -120,16 +120,16 @@ func TestOutputRestore(t *testing.T) { gnp := gnparser.New(cfg) res := gnp.ParseName(name) res.RestoreAmbiguous("sapiens", "zapiens") - assert.Equal(t, res.Verbatim, "Homo zapiens Linn. 1758") - assert.Equal(t, res.Normalized, "Homo sapiens Linn. 1758") - assert.Equal(t, res.Canonical.Full, "Homo sapiens") - assert.Equal(t, res.Canonical.Simple, "Homo sapiens") - assert.Equal(t, res.Canonical.Stemmed, "Homo sapiens") - assert.Equal(t, res.Words[1].Verbatim, "sapiens") - assert.Equal(t, res.Words[1].Normalized, "sapiens") + assert.Equal(t, "Homo zapiens Linn. 1758", res.Verbatim) + assert.Equal(t, "Homo sapiens Linn. 1758", res.Normalized) + assert.Equal(t, "Homo sapiens", res.Canonical.Full) + assert.Equal(t, "Homo sapiens", res.Canonical.Simple) + assert.Equal(t, "Homo sapiens", res.Canonical.Stemmed) + assert.Equal(t, "sapiens", res.Words[1].Verbatim) + assert.Equal(t, "sapiens", res.Words[1].Normalized) sp, ok := res.Details.(parsed.DetailsSpecies) assert.True(t, ok) - assert.Equal(t, sp.Species.Species, "sapiens") + assert.Equal(t, "sapiens", sp.Species.Species) } func getTestData(t *testing.T, filename string) []testData { diff --git a/go.mod b/go.mod index fe4a1c6..e5c031d 100644 --- a/go.mod +++ b/go.mod @@ -1,63 +1,51 @@ module github.com/gnames/gnparser -go 1.17 +go 1.18 require ( github.com/dustin/go-humanize v1.0.0 github.com/gnames/gnfmt v0.2.0 - github.com/gnames/gnlib v0.8.0 + github.com/gnames/gnlib v0.11.0 github.com/gnames/gnsys v0.2.2 github.com/gnames/gnuuid v0.1.1 github.com/gnames/organizer v0.1.1 github.com/gnames/tribool v0.1.1 - github.com/labstack/echo/v4 v4.6.3 + github.com/labstack/echo/v4 v4.7.2 github.com/labstack/gommon v0.3.1 github.com/pointlander/peg v1.0.1 github.com/rendon/testcli v1.0.0 github.com/rs/zerolog v1.26.1 github.com/sfgrp/lognsq v0.1.1 - github.com/spf13/cobra v1.3.0 - github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd - golang.org/x/perf v0.0.0-20211012211434-03971e389cd3 - golang.org/x/tools v0.1.9 + github.com/spf13/cobra v1.4.0 + github.com/stretchr/testify v1.7.1 + golang.org/x/net v0.0.0-20220225172249-27dd8689420f + golang.org/x/perf v0.0.0-20220317191433-96728ec1d780 + golang.org/x/tools v0.1.10 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect + github.com/golang/snappy v0.0.3 // indirect + github.com/google/uuid v1.2.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-colorable v0.1.11 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/nsqio/go-nsq v1.1.0 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3 // indirect github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4 // indirect - github.com/spf13/afero v1.8.0 // indirect - github.com/spf13/cast v1.4.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.10.1 // indirect - github.com/subosito/gotenv v1.2.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect - golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect - golang.org/x/mod v0.5.1 // indirect - golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect + golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/ini.v1 v1.66.3 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index 2a48de1..30d53c3 100644 --- a/go.sum +++ b/go.sum @@ -1,128 +1,19 @@ cloud.google.com/go v0.0.0-20170206221025-ce650573d812/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/aclements/go-gg v0.0.0-20170118225347-6dbb4e4fefb0/go.mod h1:55qNq4vcpkIuHowELi5C8e+1yUHtoLoOUR9QU5j7Tes= -github.com/aclements/go-moremath v0.0.0-20161014184102-0ff62e0875ff/go.mod h1:idZL3yvz4kzx1dsBOAC+oYv6L92P1oFEhUXUB1A/lwQ= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794/go.mod h1:7e+I0LQFUI9AXWxOfsQROs9xPhoJtbsyWcjJqDd4KPY= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gnames/gnfmt v0.1.0/go.mod h1:WG9c3CoiVrGc1SDsxLk7zjmv2B4UIzI00m4K5Khc/d0= github.com/gnames/gnfmt v0.2.0 h1:CjE1HxdqyTwufua5wMCdILWnCsCfRiHe5G4TgxR8aAI= github.com/gnames/gnfmt v0.2.0/go.mod h1:0Aog37s1ZNpmUwVQOf+lnx0SQq8r2EvfE/pLYGiJlJQ= -github.com/gnames/gnlib v0.8.0 h1:ZLkpBn7/mkU9VYQ3CiZozZoEPYghzHrkHAo0qW4sILI= -github.com/gnames/gnlib v0.8.0/go.mod h1:19DRcg4P/oP623qYZjG1yIBUpdqIh0UXeq2GXdz6/TU= +github.com/gnames/gnlib v0.11.0 h1:axPb2VMcA0PvUFilMttkvxICo/IIquDMIcCOTITsHnI= +github.com/gnames/gnlib v0.11.0/go.mod h1:19DRcg4P/oP623qYZjG1yIBUpdqIh0UXeq2GXdz6/TU= github.com/gnames/gnsys v0.2.2 h1:7IG4aKdCQzzP1tBFp6I9s75QSwM/qhMjpyQVQsedQUY= github.com/gnames/gnsys v0.2.2/go.mod h1:xCjepsCm9yJWTpIfDGt0sUJBLoFRGzH0I3F6ast+Bow= github.com/gnames/gnuuid v0.1.1 h1:UMRHYUSlD19qo8oVz1JyU57kg4yu+SJ/b+yvWYeqRiA= @@ -131,219 +22,50 @@ github.com/gnames/organizer v0.1.1 h1:3Xcz4QWS6cDBKI5sFK6ZJjpNptMJV6Fsq4N9gmC7Um github.com/gnames/organizer v0.1.1/go.mod h1:IZrbsFCqHb7DzKWmM9gf17khqRmSTG5ywuPF5BdM6qU= github.com/gnames/tribool v0.1.1 h1:kktNme8blgibopZVgQ02kkJGHMpxslD2Tv5UZCyb/vw= github.com/gnames/tribool v0.1.1/go.mod h1:36kZYqI/mtDdV7FeQJNrcOOkagn6iNPHyrLk4K3uBkE= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo/v4 v4.6.3 h1:VhPuIZYxsbPmo4m9KAkMU/el2442eB7EBFFhNTTT9ac= -github.com/labstack/echo/v4 v4.6.3/go.mod h1:Hk5OiHj0kDqmFq7aHe7eDqI7CUhuCrfpupQtLGGLm7A= +github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI= +github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE= github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3 h1:hUmXhbljNFtrH5hzV9kiRoddZ5nfPTq3K0Sb2hYYiqE= @@ -352,553 +74,82 @@ github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4 h1:RHHRCZeaNy github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4/go.mod h1:RdR1j20Aj5pB6+fw6Y9Ur7lMHpegTEjY1vc19hEZL40= github.com/pointlander/peg v1.0.1 h1:mgA/GQE8TeS9MdkU6Xn6iEzBmQUQCNuWD7rHCK6Mjs0= github.com/pointlander/peg v1.0.1/go.mod h1:5hsGDQR2oZI4QoWz0/Kdg3VSVEC31iJw/b7WjqCBGRI= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rendon/testcli v1.0.0 h1:GMGirnade1Zj88y/UINfa0sgVG0ph5dAFXr9xsx8zyE= github.com/rendon/testcli v1.0.0/go.mod h1:z5nHelI3O4dlSj2vIeFKvwn2z2Tm3hwV2M8J7SQ7XOg= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sfgrp/lognsq v0.1.1 h1:Cg6J5TO0AlDg7OpmQSdM2liY0lhQEFf3fWKSW6V9xaY= github.com/sfgrp/lognsq v0.1.1/go.mod h1:aNbHWh6z8OIKU/3jwQIYnd3hDh0f4Nmdj0kyAiHKvh0= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= -github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/perf v0.0.0-20211012211434-03971e389cd3 h1:TxpziJvKtFH7T75kH/tX3QELShnXGyWX1iVgw8hU9EY= -golang.org/x/perf v0.0.0-20211012211434-03971e389cd3/go.mod h1:KRSrLY7jerMEa0Ih7gBheQ3FYDiSx6liMnniX1o3j2g= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/perf v0.0.0-20220317191433-96728ec1d780 h1:MdAWFmXuNk+Ifyw3aQlLou1DV4TdP7mAcQz3L60y0bk= +golang.org/x/perf v0.0.0-20220317191433-96728ec1d780/go.mod h1:hp+p/FuQWxyFheeJWfMaOBTEFpYb+e7xEkBTWVrDVsI= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M= -golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20170206182103-3d017632ea10/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.3 h1:jRskFVxYaMGAMUbN0UZ7niA9gzL9B49DOqE78vg0k3w= -gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/io/web/web_internal_test.go b/io/web/web_internal_test.go index 734cfcb..3d4775a 100644 --- a/io/web/web_internal_test.go +++ b/io/web/web_internal_test.go @@ -1,240 +1,240 @@ package web import ( - "bytes" - "net/http" - "net/http/httptest" - "net/url" - "strings" - "testing" - - "github.com/gnames/gnfmt" - "github.com/gnames/gnlib/ent/gnvers" - "github.com/gnames/gnparser" - "github.com/gnames/gnparser/ent/parsed" - "github.com/labstack/echo/v4" - "github.com/stretchr/testify/assert" + "bytes" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + + "github.com/gnames/gnfmt" + "github.com/gnames/gnlib/ent/gnvers" + "github.com/gnames/gnparser" + "github.com/gnames/gnparser/ent/parsed" + "github.com/labstack/echo/v4" + "github.com/stretchr/testify/assert" ) func handlerGET(path string) (echo.Context, *httptest.ResponseRecorder) { - req := httptest.NewRequest(http.MethodGet, path, nil) - rec := httptest.NewRecorder() - e := echo.New() - e.Renderer, _ = NewTemplate() - c := e.NewContext(req, rec) - return c, rec + req := httptest.NewRequest(http.MethodGet, path, nil) + rec := httptest.NewRecorder() + e := echo.New() + e.Renderer, _ = NewTemplate() + c := e.NewContext(req, rec) + return c, rec } func TestHome(t *testing.T) { - var err error - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - - req := httptest.NewRequest(http.MethodGet, "/", nil) - rec := httptest.NewRecorder() - e := echo.New() - c := e.NewContext(req, rec) - e.Renderer, err = NewTemplate() - assert.Nil(t, err) - - assert.Nil(t, homePOST(gnps)(c)) - assert.Equal(t, rec.Code, http.StatusFound) + var err error + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + + req := httptest.NewRequest(http.MethodGet, "/", nil) + rec := httptest.NewRecorder() + e := echo.New() + c := e.NewContext(req, rec) + e.Renderer, err = NewTemplate() + assert.Nil(t, err) + + assert.Nil(t, homePOST(gnps)(c)) + assert.Equal(t, http.StatusFound, rec.Code) } func TestDocAPI(t *testing.T) { - c, rec := handlerGET("/doc/api") - assert.Nil(t, docAPI()(c)) - assert.Equal(t, rec.Code, http.StatusOK) - assert.Contains(t, rec.Body.String(), "Application Programming Interface") + c, rec := handlerGET("/doc/api") + assert.Nil(t, docAPI()(c)) + assert.Equal(t, http.StatusOK, rec.Code) + assert.Contains(t, rec.Body.String(), "Application Programming Interface") } func TestInfo(t *testing.T) { - c, rec := handlerGET("/") + c, rec := handlerGET("/") - assert.Nil(t, info()(c)) - assert.Equal(t, rec.Code, http.StatusOK) - assert.Contains(t, rec.Body.String(), "OpenAPI") + assert.Nil(t, info()(c)) + assert.Equal(t, http.StatusOK, rec.Code) + assert.Contains(t, rec.Body.String(), "OpenAPI") } func TestPing(t *testing.T) { - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - c, rec := handlerGET("/ping") - - assert.Nil(t, ping(gnps)(c)) - assert.Equal(t, rec.Code, http.StatusOK) - assert.Equal(t, rec.Body.String(), "pong") + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + c, rec := handlerGET("/ping") + + assert.Nil(t, ping(gnps)(c)) + assert.Equal(t, http.StatusOK, rec.Code) + assert.Equal(t, "pong", rec.Body.String()) } func TestVer(t *testing.T) { - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - c, rec := handlerGET("/version") - - assert.Nil(t, ver(gnps)(c)) - enc := gnfmt.GNjson{} - var response gnvers.Version - err := enc.Decode(rec.Body.Bytes(), &response) - assert.Nil(t, err) - assert.Regexp(t, `^v\d+\.\d+\.\d+`, response.Version) + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + c, rec := handlerGET("/version") + + assert.Nil(t, ver(gnps)(c)) + enc := gnfmt.GNjson{} + var response gnvers.Version + err := enc.Decode(rec.Body.Bytes(), &response) + assert.Nil(t, err) + assert.Regexp(t, `^v\d+\.\d+\.\d+`, response.Version) } func TestParseGET(t *testing.T) { - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - - var response []parsed.Parsed - names := []string{ - "Not name", "Bubo bubo", "Pomatomus", - "Pardosa moesta", "Plantago major var major", - "Cytospora ribis mitovirus 2", - "A-shaped rods", "Alb. alba", - "Pisonia grandis", "Acacia vestita may", - } - request := strings.Join( - names, - "|", - ) - namesQuery := url.QueryEscape(request) - path := "/" + namesQuery - - c, rec := handlerGET(path) - c.SetPath("/:names") - c.SetParamNames("names") - c.SetParamValues(namesQuery) - - assert.Nil(t, parseNamesGET(gnps)(c)) - - enc := gnfmt.GNjson{} - err := enc.Decode(rec.Body.Bytes(), &response) - assert.Nil(t, err) - - assert.Equal(t, len(response), len(names)) - for i, v := range response { - switch i { - case 0: - assert.Equal(t, v.Verbatim, "Not name", v.Verbatim) - assert.False(t, v.Parsed, v.Verbatim) - case 1: - assert.Equal(t, v.Verbatim, "Bubo bubo", v.Verbatim) - assert.Equal(t, v.Canonical.Simple, "Bubo bubo") - } - } + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + + var response []parsed.Parsed + names := []string{ + "Not name", "Bubo bubo", "Pomatomus", + "Pardosa moesta", "Plantago major var major", + "Cytospora ribis mitovirus 2", + "A-shaped rods", "Alb. alba", + "Pisonia grandis", "Acacia vestita may", + } + request := strings.Join( + names, + "|", + ) + namesQuery := url.QueryEscape(request) + path := "/" + namesQuery + + c, rec := handlerGET(path) + c.SetPath("/:names") + c.SetParamNames("names") + c.SetParamValues(namesQuery) + + assert.Nil(t, parseNamesGET(gnps)(c)) + + enc := gnfmt.GNjson{} + err := enc.Decode(rec.Body.Bytes(), &response) + assert.Nil(t, err) + + assert.Equal(t, len(names), len(response)) + for i, v := range response { + switch i { + case 0: + assert.Equal(t, "Not name", v.Verbatim, v.Verbatim) + assert.False(t, v.Parsed, v.Verbatim) + case 1: + assert.Equal(t, "Bubo bubo", v.Verbatim, v.Verbatim) + assert.Equal(t, "Bubo bubo", v.Canonical.Simple) + } + } } func TestParseParamsGET(t *testing.T) { - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - - name := url.QueryEscape("Bubo bubo") - tests := []struct { - csv, det, startsWith, pattern string - contains bool - }{ - {"true", "false", "Id", "[", false}, - {"true", "true", "Id", "[", false}, - {"false", "false", "[", "details", false}, - {"false", "true", "[", "details", true}, - } - - for _, v := range tests { - e := echo.New() - q := make(url.Values) - q.Set("csv", v.csv) - q.Set("with_details", v.det) - req := httptest.NewRequest(http.MethodGet, "/?"+q.Encode(), nil) - rec := httptest.NewRecorder() - c := e.NewContext(req, rec) - c.SetPath("/:names") - c.SetParamNames("names") - c.SetParamValues(name) - - assert.Nil(t, parseNamesGET(gnps)(c)) - - body := rec.Body.String() - assert.True(t, strings.HasPrefix(body, v.startsWith)) - if v.contains { - assert.True(t, strings.Contains(body, v.pattern)) - } else { - assert.False(t, strings.HasPrefix(body, v.pattern)) - } - } + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + + name := url.QueryEscape("Bubo bubo") + tests := []struct { + csv, det, startsWith, pattern string + contains bool + }{ + {"true", "false", "Id", "[", false}, + {"true", "true", "Id", "[", false}, + {"false", "false", "[", "details", false}, + {"false", "true", "[", "details", true}, + } + + for _, v := range tests { + e := echo.New() + q := make(url.Values) + q.Set("csv", v.csv) + q.Set("with_details", v.det) + req := httptest.NewRequest(http.MethodGet, "/?"+q.Encode(), nil) + rec := httptest.NewRecorder() + c := e.NewContext(req, rec) + c.SetPath("/:names") + c.SetParamNames("names") + c.SetParamValues(name) + + assert.Nil(t, parseNamesGET(gnps)(c)) + + body := rec.Body.String() + assert.True(t, strings.HasPrefix(body, v.startsWith)) + if v.contains { + assert.True(t, strings.Contains(body, v.pattern)) + } else { + assert.False(t, strings.HasPrefix(body, v.pattern)) + } + } } func TestParsePOST(t *testing.T) { - cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) - gnp := gnparser.New(cfg) - gnps := NewGNparserService(gnp, 0) - - var response []parsed.Parsed - names := []string{ - "Not name", "Bubo bubo", "Leptochloöpsis virgata", - "Pomatomus", "Pardosa moesta", - "Plantago major var major", - "Cytospora ribis mitovirus 2", - "A-shaped rods", "Alb. alba", - "Pisonia grandis", "Acacia vestita may", - "Sarracenia flava 'Maxima'", - } - params := inputREST{ - Names: names, - CSV: false, - WithDetails: false, - WithCultivars: true, - PreserveDiaereses: true, - } - reqBody, err := gnfmt.GNjson{}.Encode(params) - assert.Nil(t, err) - r := bytes.NewReader(reqBody) - req := httptest.NewRequest(http.MethodPost, "/api/v1", r) - req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) - rec := httptest.NewRecorder() - e := echo.New() - c := e.NewContext(req, rec) - - assert.Nil(t, parseNamesPOST(gnps)(c)) - - enc := gnfmt.GNjson{} - err = enc.Decode(rec.Body.Bytes(), &response) - assert.Nil(t, err) - - assert.Equal(t, len(response), len(names)) - for i, v := range response { - switch i { - case 0: - assert.Equal(t, v.Verbatim, "Not name", v.Verbatim) - assert.False(t, v.Parsed, v.Verbatim) - case 1: - assert.Equal(t, v.Verbatim, "Bubo bubo", v.Verbatim) - assert.Equal(t, v.Canonical.Simple, "Bubo bubo") - case 2: - assert.Equal(t, v.Verbatim, "Leptochloöpsis virgata", v.Verbatim) - assert.Equal(t, v.Canonical.Simple, "Leptochloöpsis virgata") - case 11: - assert.Equal(t, v.Normalized, "Sarracenia flava ‘Maxima’") - assert.Equal(t, v.Cardinality, 3) - } - - } - - params = inputREST{ - Names: names, - CSV: true, - WithDetails: false, - WithCultivars: false, - PreserveDiaereses: false, - } - reqBody, err = gnfmt.GNjson{}.Encode(params) - r = bytes.NewReader(reqBody) - req = httptest.NewRequest(http.MethodPost, "/api/v1", r) - req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) - rec = httptest.NewRecorder() - c = e.NewContext(req, rec) - assert.Nil(t, parseNamesPOST(gnps)(c)) - assert.True(t, strings.HasPrefix(rec.Body.String(), "Id")) + cfg := gnparser.NewConfig(gnparser.OptFormat("compact")) + gnp := gnparser.New(cfg) + gnps := NewGNparserService(gnp, 0) + + var response []parsed.Parsed + names := []string{ + "Not name", "Bubo bubo", "Leptochloöpsis virgata", + "Pomatomus", "Pardosa moesta", + "Plantago major var major", + "Cytospora ribis mitovirus 2", + "A-shaped rods", "Alb. alba", + "Pisonia grandis", "Acacia vestita may", + "Sarracenia flava 'Maxima'", + } + params := inputREST{ + Names: names, + CSV: false, + WithDetails: false, + WithCultivars: true, + PreserveDiaereses: true, + } + reqBody, err := gnfmt.GNjson{}.Encode(params) + assert.Nil(t, err) + r := bytes.NewReader(reqBody) + req := httptest.NewRequest(http.MethodPost, "/api/v1", r) + req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) + rec := httptest.NewRecorder() + e := echo.New() + c := e.NewContext(req, rec) + + assert.Nil(t, parseNamesPOST(gnps)(c)) + + enc := gnfmt.GNjson{} + err = enc.Decode(rec.Body.Bytes(), &response) + assert.Nil(t, err) + + assert.Equal(t, len(names), len(response)) + for i, v := range response { + switch i { + case 0: + assert.Equal(t, "Not name", v.Verbatim, v.Verbatim) + assert.False(t, v.Parsed, v.Verbatim) + case 1: + assert.Equal(t, "Bubo bubo", v.Verbatim, v.Verbatim) + assert.Equal(t, "Bubo bubo", v.Canonical.Simple) + case 2: + assert.Equal(t, "Leptochloöpsis virgata", v.Verbatim, v.Verbatim) + assert.Equal(t, "Leptochloöpsis virgata", v.Canonical.Simple) + case 11: + assert.Equal(t, "Sarracenia flava ‘Maxima’", v.Normalized) + assert.Equal(t, 3, v.Cardinality) + } + + } + + params = inputREST{ + Names: names, + CSV: true, + WithDetails: false, + WithCultivars: false, + PreserveDiaereses: false, + } + reqBody, err = gnfmt.GNjson{}.Encode(params) + r = bytes.NewReader(reqBody) + req = httptest.NewRequest(http.MethodPost, "/api/v1", r) + req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) + rec = httptest.NewRecorder() + c = e.NewContext(req, rec) + assert.Nil(t, parseNamesPOST(gnps)(c)) + assert.True(t, strings.HasPrefix(rec.Body.String(), "Id")) } diff --git a/testdata/test_data.md b/testdata/test_data.md index baa2314..3a4eea4 100644 --- a/testdata/test_data.md +++ b/testdata/test_data.md @@ -1,5 +1,7 @@ # Global Names Parser Test + + * [Introduction](#introduction) @@ -7489,12 +7491,12 @@ Authorship: (Ginsburg 1939) Name: Globigerina spec -Canonical: Globigerina spec +Canonical: Globigerina Authorship: ```json -{"parsed":true,"quality":1,"verbatim":"Globigerina spec","normalized":"Globigerina spec","canonical":{"stemmed":"Globigerina spec","simple":"Globigerina spec","full":"Globigerina spec"},"cardinality":2,"details":{"species":{"genus":"Globigerina","species":"spec"}},"words":[{"verbatim":"Globigerina","normalized":"Globigerina","wordType":"GENUS","start":0,"end":11},{"verbatim":"spec","normalized":"spec","wordType":"SPECIES","start":12,"end":16}],"id":"4f8f7189-42a0-59e2-8d6f-67c3889673d9","parserVersion":"test_version"} +{"parsed":true,"quality":4,"qualityWarnings":[{"quality":4,"warning":"Unparsed tail"}],"verbatim":"Globigerina spec","normalized":"Globigerina","canonical":{"stemmed":"Globigerina","simple":"Globigerina","full":"Globigerina"},"cardinality":1,"tail":" spec","details":{"uninomial":{"uninomial":"Globigerina"}},"words":[{"verbatim":"Globigerina","normalized":"Globigerina","wordType":"UNINOMIAL","start":0,"end":11}],"id":"4f8f7189-42a0-59e2-8d6f-67c3889673d9","parserVersion":"test_version"} ``` Name: Eunotia genuflexa Norpel-Schempp nov spec @@ -7601,6 +7603,16 @@ Authorship: {"parsed":true,"quality":2,"qualityWarnings":[{"quality":2,"warning":"Non-standard space characters"}],"verbatim":"Oxalis_barrelieri","normalized":"Oxalis barrelieri","canonical":{"stemmed":"Oxalis barrelier","simple":"Oxalis barrelieri","full":"Oxalis barrelieri"},"cardinality":2,"details":{"species":{"genus":"Oxalis","species":"barrelieri"}},"words":[{"verbatim":"Oxalis","normalized":"Oxalis","wordType":"GENUS","start":0,"end":6},{"verbatim":"barrelieri","normalized":"barrelieri","wordType":"SPECIES","start":7,"end":17}],"id":"ad546700-9cae-50d3-9eaf-6adcbbb67bae","parserVersion":"test_version"} ``` +Name: Oxalis_barrelieri ined.? + +Canonical: Oxalis barrelieri + +Authorship: + +```json +{"parsed":false,"quality":0,"verbatim":" Oxalis_barrelieri ined.?","cardinality":0,"id":"c065444b-dbdd-5f29-96f9-629f49469abd","parserVersion":"test_version"} +``` + Name: Pseudocercospora__dendrobii Canonical: Pseudocercospora dendrobii diff --git a/version.go b/version.go index cd078c7..5e323fb 100644 --- a/version.go +++ b/version.go @@ -3,7 +3,7 @@ package gnparser var ( // Version is the version of the gnparser package. When Makefile is // used, the version is calculated out of Git tags. - Version = "v1.6.4+" + Version = "v1.6.5+" // Build is a timestamp of when Makefile was used to compile // the gnparser code. If go build was used, Build stays empty. Build string