Grand test fixup (#138)

* start fixing up tests

* fix up tests + automate with drone

* fiddle with linting

* messing about with drone.yml

* some more fiddling

* hmmm

* add cache

* add vendor directory

* verbose

* ci updates

* update some little things

* update sig

10 files changed, 2094 insertions, 0 deletions

diff --git a/vendor/github.com/leodido/go-urn/.gitignore b/vendor/github.com/leodido/go-urn/.gitignore
new file mode 100644
index 000000000..5bcf4bade
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/.gitignore
@@ -0,0 +1,11 @@
+*.exe
+*.dll
+*.so
+*.dylib
+
+*.test
+
+*.out
+*.txt
+
+vendor/
\ No newline at end of file
diff --git a/vendor/github.com/leodido/go-urn/.travis.yml b/vendor/github.com/leodido/go-urn/.travis.yml
new file mode 100644
index 000000000..21f348d65
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/.travis.yml
@@ -0,0 +1,16 @@
+language: go
+
+go:
+  - 1.13.x
+  - 1.14.x
+  - 1.15.x
+  - tip
+
+before_install:
+  - go get -t -v ./...
+
+script:
+  - go test -race -coverprofile=coverage.txt -covermode=atomic
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/vendor/github.com/leodido/go-urn/LICENSE b/vendor/github.com/leodido/go-urn/LICENSE
new file mode 100644
index 000000000..8c3504a5a
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Leonardo Di Donato
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/github.com/leodido/go-urn/README.md b/vendor/github.com/leodido/go-urn/README.md
new file mode 100644
index 000000000..cc902ec0e
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/README.md
@@ -0,0 +1,55 @@
+[![Build](https://img.shields.io/travis/leodido/go-urn/master.svg?style=for-the-badge)](https://travis-ci.org/leodido/go-urn) [![Coverage](https://img.shields.io/codecov/c/github/leodido/go-urn.svg?style=for-the-badge)](https://codecov.io/gh/leodido/go-urn) [![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=for-the-badge)](https://godoc.org/github.com/leodido/go-urn)
+
+**A parser for URNs**.
+
+> As seen on [RFC 2141](https://tools.ietf.org/html/rfc2141#ref-1).
+
+[API documentation](https://godoc.org/github.com/leodido/go-urn).
+
+## Installation
+
+```
+go get github.com/leodido/go-urn
+```
+
+## Performances
+
+This implementation results to be really fast.
+
+Usually below ½ microsecond on my machine<sup>[1](#mymachine)</sup>.
+
+Notice it also performs, while parsing:
+
+1. fine-grained and informative erroring
+2. specific-string normalization
+
+```
+ok/00/urn:a:b______________________________________/-4      20000000      265 ns/op      182 B/op      6 allocs/op
+ok/01/URN:foo:a123,456_____________________________/-4      30000000      296 ns/op      200 B/op      6 allocs/op
+ok/02/urn:foo:a123%2c456___________________________/-4      20000000      331 ns/op      208 B/op      6 allocs/op
+ok/03/urn:ietf:params:scim:schemas:core:2.0:User___/-4      20000000      430 ns/op      280 B/op      6 allocs/op
+ok/04/urn:ietf:params:scim:schemas:extension:enterp/-4      20000000      411 ns/op      312 B/op      6 allocs/op
+ok/05/urn:ietf:params:scim:schemas:extension:enterp/-4      20000000      472 ns/op      344 B/op      6 allocs/op
+ok/06/urn:burnout:nss______________________________/-4      30000000      257 ns/op      192 B/op      6 allocs/op
+ok/07/urn:abcdefghilmnopqrstuvzabcdefghilm:x_______/-4      20000000      375 ns/op      213 B/op      6 allocs/op
+ok/08/urn:urnurnurn:urn____________________________/-4      30000000      265 ns/op      197 B/op      6 allocs/op
+ok/09/urn:ciao:@!=%2c(xyz)+a,b.*@g=$_'_____________/-4      20000000      307 ns/op      248 B/op      6 allocs/op
+ok/10/URN:x:abc%1dz%2f%3az_________________________/-4      30000000      259 ns/op      212 B/op      6 allocs/op
+no/11/URN:-xxx:x___________________________________/-4      20000000      445 ns/op      320 B/op      6 allocs/op
+no/12/urn::colon:nss_______________________________/-4      20000000      461 ns/op      320 B/op      6 allocs/op
+no/13/urn:abcdefghilmnopqrstuvzabcdefghilmn:specifi/-4      10000000      660 ns/op      320 B/op      6 allocs/op
+no/14/URN:a!?:x____________________________________/-4      20000000      507 ns/op      320 B/op      6 allocs/op
+no/15/urn:urn:NSS__________________________________/-4      20000000      429 ns/op      288 B/op      6 allocs/op
+no/16/urn:white_space:NSS__________________________/-4      20000000      482 ns/op      320 B/op      6 allocs/op
+no/17/urn:concat:no_spaces_________________________/-4      20000000      539 ns/op      328 B/op      7 allocs/op
+no/18/urn:a:/______________________________________/-4      20000000      470 ns/op      320 B/op      7 allocs/op
+no/19/urn:UrN:NSS__________________________________/-4      20000000      399 ns/op      288 B/op      6 allocs/op
+```
+
+---
+
+* <a name="mymachine">[1]</a>: Intel Core i7-7600U CPU @ 2.80GHz
+
+---
+
+[![Analytics](https://ga-beacon.appspot.com/UA-49657176-1/go-urn?flat)](https://github.com/igrigorik/ga-beacon)
\ No newline at end of file
diff --git a/vendor/github.com/leodido/go-urn/go.mod b/vendor/github.com/leodido/go-urn/go.mod
new file mode 100644
index 000000000..98cf196df
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/go.mod
@@ -0,0 +1,5 @@
+module github.com/leodido/go-urn
+
+go 1.13
+
+require github.com/stretchr/testify v1.6.1
diff --git a/vendor/github.com/leodido/go-urn/go.sum b/vendor/github.com/leodido/go-urn/go.sum
new file mode 100644
index 000000000..afe7890c9
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/go.sum
@@ -0,0 +1,11 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/vendor/github.com/leodido/go-urn/machine.go b/vendor/github.com/leodido/go-urn/machine.go
new file mode 100644
index 000000000..fe5a0cc86
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/machine.go
@@ -0,0 +1,1691 @@
+package urn
+
+import (
+	"fmt"
+)
+
+var (
+	errPrefix         = "expecting the prefix to be the \"urn\" string (whatever case) [col %d]"
+	errIdentifier     = "expecting the identifier to be string (1..31 alnum chars, also containing dashes but not at its start) [col %d]"
+	errSpecificString = "expecting the specific string to be a string containing alnum, hex, or others ([()+,-.:=@;$_!*']) chars [col %d]"
+	errNoUrnWithinID  = "expecting the identifier to not contain the \"urn\" reserved string [col %d]"
+	errHex            = "expecting the specific string hex chars to be well-formed (%%alnum{2}) [col %d]"
+	errParse          = "parsing error [col %d]"
+)
+
+const start int = 1
+const firstFinal int = 44
+
+const enFail int = 46
+const enMain int = 1
+
+// Machine is the interface representing the FSM
+type Machine interface {
+	Error() error
+	Parse(input []byte) (*URN, error)
+}
+
+type machine struct {
+	data           []byte
+	cs             int
+	p, pe, eof, pb int
+	err            error
+	tolower        []int
+}
+
+// NewMachine creates a new FSM able to parse RFC 2141 strings.
+func NewMachine() Machine {
+	m := &machine{}
+
+	return m
+}
+
+// Err returns the error that occurred on the last call to Parse.
+//
+// If the result is nil, then the line was parsed successfully.
+func (m *machine) Error() error {
+	return m.err
+}
+
+func (m *machine) text() []byte {
+	return m.data[m.pb:m.p]
+}
+
+// Parse parses the input byte array as a RFC 2141 string.
+func (m *machine) Parse(input []byte) (*URN, error) {
+	m.data = input
+	m.p = 0
+	m.pb = 0
+	m.pe = len(input)
+	m.eof = len(input)
+	m.err = nil
+	m.tolower = []int{}
+	output := &URN{}
+
+	{
+		m.cs = start
+	}
+
+	{
+		if (m.p) == (m.pe) {
+			goto _testEof
+		}
+		switch m.cs {
+		case 1:
+			goto stCase1
+		case 0:
+			goto stCase0
+		case 2:
+			goto stCase2
+		case 3:
+			goto stCase3
+		case 4:
+			goto stCase4
+		case 5:
+			goto stCase5
+		case 6:
+			goto stCase6
+		case 7:
+			goto stCase7
+		case 8:
+			goto stCase8
+		case 9:
+			goto stCase9
+		case 10:
+			goto stCase10
+		case 11:
+			goto stCase11
+		case 12:
+			goto stCase12
+		case 13:
+			goto stCase13
+		case 14:
+			goto stCase14
+		case 15:
+			goto stCase15
+		case 16:
+			goto stCase16
+		case 17:
+			goto stCase17
+		case 18:
+			goto stCase18
+		case 19:
+			goto stCase19
+		case 20:
+			goto stCase20
+		case 21:
+			goto stCase21
+		case 22:
+			goto stCase22
+		case 23:
+			goto stCase23
+		case 24:
+			goto stCase24
+		case 25:
+			goto stCase25
+		case 26:
+			goto stCase26
+		case 27:
+			goto stCase27
+		case 28:
+			goto stCase28
+		case 29:
+			goto stCase29
+		case 30:
+			goto stCase30
+		case 31:
+			goto stCase31
+		case 32:
+			goto stCase32
+		case 33:
+			goto stCase33
+		case 34:
+			goto stCase34
+		case 35:
+			goto stCase35
+		case 36:
+			goto stCase36
+		case 37:
+			goto stCase37
+		case 38:
+			goto stCase38
+		case 44:
+			goto stCase44
+		case 39:
+			goto stCase39
+		case 40:
+			goto stCase40
+		case 45:
+			goto stCase45
+		case 41:
+			goto stCase41
+		case 42:
+			goto stCase42
+		case 43:
+			goto stCase43
+		case 46:
+			goto stCase46
+		}
+		goto stOut
+	stCase1:
+		switch (m.data)[(m.p)] {
+		case 85:
+			goto tr1
+		case 117:
+			goto tr1
+		}
+		goto tr0
+	tr0:
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr3:
+
+		m.err = fmt.Errorf(errPrefix, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr6:
+
+		m.err = fmt.Errorf(errIdentifier, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr41:
+
+		m.err = fmt.Errorf(errSpecificString, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr44:
+
+		m.err = fmt.Errorf(errHex, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errSpecificString, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr50:
+
+		m.err = fmt.Errorf(errPrefix, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errIdentifier, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	tr52:
+
+		m.err = fmt.Errorf(errNoUrnWithinID, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errIdentifier, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		m.err = fmt.Errorf(errParse, m.p)
+		(m.p)--
+
+		{
+			goto st46
+		}
+
+		goto st0
+	stCase0:
+	st0:
+		m.cs = 0
+		goto _out
+	tr1:
+
+		m.pb = m.p
+
+		goto st2
+	st2:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof2
+		}
+	stCase2:
+		switch (m.data)[(m.p)] {
+		case 82:
+			goto st3
+		case 114:
+			goto st3
+		}
+		goto tr0
+	st3:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof3
+		}
+	stCase3:
+		switch (m.data)[(m.p)] {
+		case 78:
+			goto st4
+		case 110:
+			goto st4
+		}
+		goto tr3
+	st4:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof4
+		}
+	stCase4:
+		if (m.data)[(m.p)] == 58 {
+			goto tr5
+		}
+		goto tr0
+	tr5:
+
+		output.prefix = string(m.text())
+
+		goto st5
+	st5:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof5
+		}
+	stCase5:
+		switch (m.data)[(m.p)] {
+		case 85:
+			goto tr8
+		case 117:
+			goto tr8
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto tr7
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto tr7
+			}
+		default:
+			goto tr7
+		}
+		goto tr6
+	tr7:
+
+		m.pb = m.p
+
+		goto st6
+	st6:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof6
+		}
+	stCase6:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st7
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st7
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st7
+			}
+		default:
+			goto st7
+		}
+		goto tr6
+	st7:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof7
+		}
+	stCase7:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st8
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st8
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st8
+			}
+		default:
+			goto st8
+		}
+		goto tr6
+	st8:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof8
+		}
+	stCase8:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st9
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st9
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st9
+			}
+		default:
+			goto st9
+		}
+		goto tr6
+	st9:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof9
+		}
+	stCase9:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st10
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st10
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st10
+			}
+		default:
+			goto st10
+		}
+		goto tr6
+	st10:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof10
+		}
+	stCase10:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st11
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st11
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st11
+			}
+		default:
+			goto st11
+		}
+		goto tr6
+	st11:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof11
+		}
+	stCase11:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st12
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st12
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st12
+			}
+		default:
+			goto st12
+		}
+		goto tr6
+	st12:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof12
+		}
+	stCase12:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st13
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st13
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st13
+			}
+		default:
+			goto st13
+		}
+		goto tr6
+	st13:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof13
+		}
+	stCase13:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st14
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st14
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st14
+			}
+		default:
+			goto st14
+		}
+		goto tr6
+	st14:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof14
+		}
+	stCase14:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st15
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st15
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st15
+			}
+		default:
+			goto st15
+		}
+		goto tr6
+	st15:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof15
+		}
+	stCase15:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st16
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st16
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st16
+			}
+		default:
+			goto st16
+		}
+		goto tr6
+	st16:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof16
+		}
+	stCase16:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st17
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st17
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st17
+			}
+		default:
+			goto st17
+		}
+		goto tr6
+	st17:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof17
+		}
+	stCase17:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st18
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st18
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st18
+			}
+		default:
+			goto st18
+		}
+		goto tr6
+	st18:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof18
+		}
+	stCase18:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st19
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st19
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st19
+			}
+		default:
+			goto st19
+		}
+		goto tr6
+	st19:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof19
+		}
+	stCase19:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st20
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st20
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st20
+			}
+		default:
+			goto st20
+		}
+		goto tr6
+	st20:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof20
+		}
+	stCase20:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st21
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st21
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st21
+			}
+		default:
+			goto st21
+		}
+		goto tr6
+	st21:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof21
+		}
+	stCase21:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st22
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st22
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st22
+			}
+		default:
+			goto st22
+		}
+		goto tr6
+	st22:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof22
+		}
+	stCase22:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st23
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st23
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st23
+			}
+		default:
+			goto st23
+		}
+		goto tr6
+	st23:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof23
+		}
+	stCase23:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st24
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st24
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st24
+			}
+		default:
+			goto st24
+		}
+		goto tr6
+	st24:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof24
+		}
+	stCase24:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st25
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st25
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st25
+			}
+		default:
+			goto st25
+		}
+		goto tr6
+	st25:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof25
+		}
+	stCase25:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st26
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st26
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st26
+			}
+		default:
+			goto st26
+		}
+		goto tr6
+	st26:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof26
+		}
+	stCase26:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st27
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st27
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st27
+			}
+		default:
+			goto st27
+		}
+		goto tr6
+	st27:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof27
+		}
+	stCase27:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st28
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st28
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st28
+			}
+		default:
+			goto st28
+		}
+		goto tr6
+	st28:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof28
+		}
+	stCase28:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st29
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st29
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st29
+			}
+		default:
+			goto st29
+		}
+		goto tr6
+	st29:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof29
+		}
+	stCase29:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st30
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st30
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st30
+			}
+		default:
+			goto st30
+		}
+		goto tr6
+	st30:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof30
+		}
+	stCase30:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st31
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st31
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st31
+			}
+		default:
+			goto st31
+		}
+		goto tr6
+	st31:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof31
+		}
+	stCase31:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st32
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st32
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st32
+			}
+		default:
+			goto st32
+		}
+		goto tr6
+	st32:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof32
+		}
+	stCase32:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st33
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st33
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st33
+			}
+		default:
+			goto st33
+		}
+		goto tr6
+	st33:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof33
+		}
+	stCase33:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st34
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st34
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st34
+			}
+		default:
+			goto st34
+		}
+		goto tr6
+	st34:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof34
+		}
+	stCase34:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st35
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st35
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st35
+			}
+		default:
+			goto st35
+		}
+		goto tr6
+	st35:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof35
+		}
+	stCase35:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st36
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st36
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st36
+			}
+		default:
+			goto st36
+		}
+		goto tr6
+	st36:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof36
+		}
+	stCase36:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st37
+		case 58:
+			goto tr10
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st37
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st37
+			}
+		default:
+			goto st37
+		}
+		goto tr6
+	st37:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof37
+		}
+	stCase37:
+		if (m.data)[(m.p)] == 58 {
+			goto tr10
+		}
+		goto tr6
+	tr10:
+
+		output.ID = string(m.text())
+
+		goto st38
+	st38:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof38
+		}
+	stCase38:
+		switch (m.data)[(m.p)] {
+		case 33:
+			goto tr42
+		case 36:
+			goto tr42
+		case 37:
+			goto tr43
+		case 61:
+			goto tr42
+		case 95:
+			goto tr42
+		}
+		switch {
+		case (m.data)[(m.p)] < 48:
+			if 39 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 46 {
+				goto tr42
+			}
+		case (m.data)[(m.p)] > 59:
+			switch {
+			case (m.data)[(m.p)] > 90:
+				if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+					goto tr42
+				}
+			case (m.data)[(m.p)] >= 64:
+				goto tr42
+			}
+		default:
+			goto tr42
+		}
+		goto tr41
+	tr42:
+
+		m.pb = m.p
+
+		goto st44
+	st44:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof44
+		}
+	stCase44:
+		switch (m.data)[(m.p)] {
+		case 33:
+			goto st44
+		case 36:
+			goto st44
+		case 37:
+			goto st39
+		case 61:
+			goto st44
+		case 95:
+			goto st44
+		}
+		switch {
+		case (m.data)[(m.p)] < 48:
+			if 39 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 46 {
+				goto st44
+			}
+		case (m.data)[(m.p)] > 59:
+			switch {
+			case (m.data)[(m.p)] > 90:
+				if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+					goto st44
+				}
+			case (m.data)[(m.p)] >= 64:
+				goto st44
+			}
+		default:
+			goto st44
+		}
+		goto tr41
+	tr43:
+
+		m.pb = m.p
+
+		goto st39
+	st39:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof39
+		}
+	stCase39:
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st40
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st40
+			}
+		default:
+			goto tr46
+		}
+		goto tr44
+	tr46:
+
+		m.tolower = append(m.tolower, m.p-m.pb)
+
+		goto st40
+	st40:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof40
+		}
+	stCase40:
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st45
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st45
+			}
+		default:
+			goto tr48
+		}
+		goto tr44
+	tr48:
+
+		m.tolower = append(m.tolower, m.p-m.pb)
+
+		goto st45
+	st45:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof45
+		}
+	stCase45:
+		switch (m.data)[(m.p)] {
+		case 33:
+			goto st44
+		case 36:
+			goto st44
+		case 37:
+			goto st39
+		case 61:
+			goto st44
+		case 95:
+			goto st44
+		}
+		switch {
+		case (m.data)[(m.p)] < 48:
+			if 39 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 46 {
+				goto st44
+			}
+		case (m.data)[(m.p)] > 59:
+			switch {
+			case (m.data)[(m.p)] > 90:
+				if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+					goto st44
+				}
+			case (m.data)[(m.p)] >= 64:
+				goto st44
+			}
+		default:
+			goto st44
+		}
+		goto tr44
+	tr8:
+
+		m.pb = m.p
+
+		goto st41
+	st41:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof41
+		}
+	stCase41:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st7
+		case 58:
+			goto tr10
+		case 82:
+			goto st42
+		case 114:
+			goto st42
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st7
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st7
+			}
+		default:
+			goto st7
+		}
+		goto tr6
+	st42:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof42
+		}
+	stCase42:
+		switch (m.data)[(m.p)] {
+		case 45:
+			goto st8
+		case 58:
+			goto tr10
+		case 78:
+			goto st43
+		case 110:
+			goto st43
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st8
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st8
+			}
+		default:
+			goto st8
+		}
+		goto tr50
+	st43:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof43
+		}
+	stCase43:
+		if (m.data)[(m.p)] == 45 {
+			goto st9
+		}
+		switch {
+		case (m.data)[(m.p)] < 65:
+			if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 {
+				goto st9
+			}
+		case (m.data)[(m.p)] > 90:
+			if 97 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 122 {
+				goto st9
+			}
+		default:
+			goto st9
+		}
+		goto tr52
+	st46:
+		if (m.p)++; (m.p) == (m.pe) {
+			goto _testEof46
+		}
+	stCase46:
+		switch (m.data)[(m.p)] {
+		case 10:
+			goto st0
+		case 13:
+			goto st0
+		}
+		goto st46
+	stOut:
+	_testEof2:
+		m.cs = 2
+		goto _testEof
+	_testEof3:
+		m.cs = 3
+		goto _testEof
+	_testEof4:
+		m.cs = 4
+		goto _testEof
+	_testEof5:
+		m.cs = 5
+		goto _testEof
+	_testEof6:
+		m.cs = 6
+		goto _testEof
+	_testEof7:
+		m.cs = 7
+		goto _testEof
+	_testEof8:
+		m.cs = 8
+		goto _testEof
+	_testEof9:
+		m.cs = 9
+		goto _testEof
+	_testEof10:
+		m.cs = 10
+		goto _testEof
+	_testEof11:
+		m.cs = 11
+		goto _testEof
+	_testEof12:
+		m.cs = 12
+		goto _testEof
+	_testEof13:
+		m.cs = 13
+		goto _testEof
+	_testEof14:
+		m.cs = 14
+		goto _testEof
+	_testEof15:
+		m.cs = 15
+		goto _testEof
+	_testEof16:
+		m.cs = 16
+		goto _testEof
+	_testEof17:
+		m.cs = 17
+		goto _testEof
+	_testEof18:
+		m.cs = 18
+		goto _testEof
+	_testEof19:
+		m.cs = 19
+		goto _testEof
+	_testEof20:
+		m.cs = 20
+		goto _testEof
+	_testEof21:
+		m.cs = 21
+		goto _testEof
+	_testEof22:
+		m.cs = 22
+		goto _testEof
+	_testEof23:
+		m.cs = 23
+		goto _testEof
+	_testEof24:
+		m.cs = 24
+		goto _testEof
+	_testEof25:
+		m.cs = 25
+		goto _testEof
+	_testEof26:
+		m.cs = 26
+		goto _testEof
+	_testEof27:
+		m.cs = 27
+		goto _testEof
+	_testEof28:
+		m.cs = 28
+		goto _testEof
+	_testEof29:
+		m.cs = 29
+		goto _testEof
+	_testEof30:
+		m.cs = 30
+		goto _testEof
+	_testEof31:
+		m.cs = 31
+		goto _testEof
+	_testEof32:
+		m.cs = 32
+		goto _testEof
+	_testEof33:
+		m.cs = 33
+		goto _testEof
+	_testEof34:
+		m.cs = 34
+		goto _testEof
+	_testEof35:
+		m.cs = 35
+		goto _testEof
+	_testEof36:
+		m.cs = 36
+		goto _testEof
+	_testEof37:
+		m.cs = 37
+		goto _testEof
+	_testEof38:
+		m.cs = 38
+		goto _testEof
+	_testEof44:
+		m.cs = 44
+		goto _testEof
+	_testEof39:
+		m.cs = 39
+		goto _testEof
+	_testEof40:
+		m.cs = 40
+		goto _testEof
+	_testEof45:
+		m.cs = 45
+		goto _testEof
+	_testEof41:
+		m.cs = 41
+		goto _testEof
+	_testEof42:
+		m.cs = 42
+		goto _testEof
+	_testEof43:
+		m.cs = 43
+		goto _testEof
+	_testEof46:
+		m.cs = 46
+		goto _testEof
+
+	_testEof:
+		{
+		}
+		if (m.p) == (m.eof) {
+			switch m.cs {
+			case 44, 45:
+
+				raw := m.text()
+				output.SS = string(raw)
+				// Iterate upper letters lowering them
+				for _, i := range m.tolower {
+					raw[i] = raw[i] + 32
+				}
+				output.norm = string(raw)
+
+			case 1, 2, 4:
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 3:
+
+				m.err = fmt.Errorf(errPrefix, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 41:
+
+				m.err = fmt.Errorf(errIdentifier, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 38:
+
+				m.err = fmt.Errorf(errSpecificString, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 42:
+
+				m.err = fmt.Errorf(errPrefix, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errIdentifier, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 43:
+
+				m.err = fmt.Errorf(errNoUrnWithinID, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errIdentifier, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			case 39, 40:
+
+				m.err = fmt.Errorf(errHex, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errSpecificString, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+				m.err = fmt.Errorf(errParse, m.p)
+				(m.p)--
+
+				{
+					goto st46
+				}
+
+			}
+		}
+
+	_out:
+		{
+		}
+	}
+
+	if m.cs < firstFinal || m.cs == enFail {
+		return nil, m.err
+	}
+
+	return output, nil
+}
diff --git a/vendor/github.com/leodido/go-urn/machine.go.rl b/vendor/github.com/leodido/go-urn/machine.go.rl
new file mode 100644
index 000000000..3bc05a651
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/machine.go.rl
@@ -0,0 +1,159 @@
+package urn
+
+import (
+    "fmt"
+)
+
+var (
+    errPrefix         = "expecting the prefix to be the \"urn\" string (whatever case) [col %d]"
+    errIdentifier     = "expecting the identifier to be string (1..31 alnum chars, also containing dashes but not at its start) [col %d]"
+    errSpecificString = "expecting the specific string to be a string containing alnum, hex, or others ([()+,-.:=@;$_!*']) chars [col %d]"
+    errNoUrnWithinID  = "expecting the identifier to not contain the \"urn\" reserved string [col %d]"
+    errHex            = "expecting the specific string hex chars to be well-formed (%%alnum{2}) [col %d]"
+    errParse          = "parsing error [col %d]"
+)
+
+%%{
+machine urn;
+
+# unsigned alphabet
+alphtype uint8;
+
+action mark {
+    m.pb = m.p
+}
+
+action tolower {
+    m.tolower = append(m.tolower, m.p - m.pb)
+}
+
+action set_pre {
+    output.prefix = string(m.text())
+}
+
+action set_nid {
+    output.ID = string(m.text())
+}
+
+action set_nss {
+    raw := m.text()
+    output.SS = string(raw)
+    // Iterate upper letters lowering them
+    for _, i := range m.tolower {
+        raw[i] = raw[i] + 32
+    }
+    output.norm = string(raw)
+}
+
+action err_pre {
+    m.err = fmt.Errorf(errPrefix, m.p)
+    fhold;
+    fgoto fail;
+}
+
+action err_nid {
+    m.err = fmt.Errorf(errIdentifier, m.p)
+    fhold;
+    fgoto fail;
+}
+
+action err_nss {
+    m.err = fmt.Errorf(errSpecificString, m.p)
+    fhold;
+    fgoto fail;
+}
+
+action err_urn {
+    m.err = fmt.Errorf(errNoUrnWithinID, m.p)
+    fhold;
+    fgoto fail;
+}
+
+action err_hex {
+    m.err = fmt.Errorf(errHex, m.p)
+    fhold;
+    fgoto fail;
+}
+
+action err_parse {
+    m.err = fmt.Errorf(errParse, m.p)
+    fhold;
+    fgoto fail;
+}
+
+pre = ([uU][rR][nN] @err(err_pre)) >mark %set_pre;
+
+nid = (alnum >mark (alnum | '-'){0,31}) %set_nid;
+
+hex = '%' (digit | lower | upper >tolower){2} $err(err_hex);
+
+sss = (alnum | [()+,\-.:=@;$_!*']);
+
+nss = (sss | hex)+ $err(err_nss);
+
+fail := (any - [\n\r])* @err{ fgoto main; };
+
+main := (pre ':' (nid - pre %err(err_urn)) $err(err_nid) ':' nss >mark %set_nss) $err(err_parse);
+
+}%%
+
+%% write data noerror noprefix;
+
+// Machine is the interface representing the FSM
+type Machine interface {
+    Error() error
+    Parse(input []byte) (*URN, error)
+}
+
+type machine struct {
+    data              []byte
+    cs                int
+    p, pe, eof, pb    int
+    err               error
+    tolower           []int
+}
+
+// NewMachine creates a new FSM able to parse RFC 2141 strings.
+func NewMachine() Machine {
+    m := &machine{}
+
+    %% access m.;
+    %% variable p m.p;
+    %% variable pe m.pe;
+    %% variable eof m.eof;
+    %% variable data m.data;
+
+    return m
+}
+
+// Err returns the error that occurred on the last call to Parse.
+//
+// If the result is nil, then the line was parsed successfully.
+func (m *machine) Error() error {
+    return m.err
+}
+
+func (m *machine) text() []byte {
+    return m.data[m.pb:m.p]
+}
+
+// Parse parses the input byte array as a RFC 2141 string.
+func (m *machine) Parse(input []byte) (*URN, error) {
+    m.data = input
+    m.p = 0
+    m.pb = 0
+    m.pe = len(input)
+    m.eof = len(input)
+    m.err = nil
+    m.tolower = []int{}
+    output := &URN{}
+
+    %% write init;
+    %% write exec;
+
+    if m.cs < first_final || m.cs == en_fail {
+        return nil, m.err
+    }
+
+    return output, nil
+}
diff --git a/vendor/github.com/leodido/go-urn/makefile b/vendor/github.com/leodido/go-urn/makefile
new file mode 100644
index 000000000..47026d509
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/makefile
@@ -0,0 +1,39 @@
+SHELL := /bin/bash
+
+build: machine.go
+
+images: docs/urn.png
+
+machine.go: machine.go.rl
+	ragel -Z -G2 -e -o $@ $<
+	@sed -i '/^\/\/line/d' $@
+	@$(MAKE) -s file=$@ snake2camel
+	@gofmt -w -s $@
+
+docs/urn.dot: machine.go.rl
+	@mkdir -p docs
+	ragel -Z -e -Vp $< -o $@
+
+docs/urn.png: docs/urn.dot
+	dot $< -Tpng -o $@
+
+.PHONY: bench
+bench: *_test.go machine.go
+	go test -bench=. -benchmem -benchtime=5s ./...
+
+.PHONY: tests
+tests: *_test.go machine.go
+	go test -race -timeout 10s -coverprofile=coverage.out -covermode=atomic -v ./...
+
+.PHONY: clean
+clean:
+	@rm -rf docs
+	@rm -f machine.go
+
+.PHONY: snake2camel
+snake2camel:
+	@awk -i inplace '{ \
+	while ( match($$0, /(.*)([a-z]+[0-9]*)_([a-zA-Z0-9])(.*)/, cap) ) \
+	$$0 = cap[1] cap[2] toupper(cap[3]) cap[4]; \
+	print \
+	}' $(file)
\ No newline at end of file
diff --git a/vendor/github.com/leodido/go-urn/urn.go b/vendor/github.com/leodido/go-urn/urn.go
new file mode 100644
index 000000000..d51a6c915
--- /dev/null
+++ b/vendor/github.com/leodido/go-urn/urn.go
@@ -0,0 +1,86 @@
+package urn
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+const errInvalidURN = "invalid URN: %s"
+
+// URN represents an Uniform Resource Name.
+//
+// The general form represented is:
+//
+//	urn:<id>:<ss>
+//
+// Details at https://tools.ietf.org/html/rfc2141.
+type URN struct {
+	prefix string // Static prefix. Equal to "urn" when empty.
+	ID     string // Namespace identifier
+	SS     string // Namespace specific string
+	norm   string // Normalized namespace specific string
+}
+
+// Normalize turns the receiving URN into its norm version.
+//
+// Which means: lowercase prefix, lowercase namespace identifier, and immutate namespace specific string chars (except <hex> tokens which are lowercased).
+func (u *URN) Normalize() *URN {
+	return &URN{
+		prefix: "urn",
+		ID:     strings.ToLower(u.ID),
+		SS:     u.norm,
+	}
+}
+
+// Equal checks the lexical equivalence of the current URN with another one.
+func (u *URN) Equal(x *URN) bool {
+	return *u.Normalize() == *x.Normalize()
+}
+
+// String reassembles the URN into a valid URN string.
+//
+// This requires both ID and SS fields to be non-empty.
+// Otherwise it returns an empty string.
+//
+// Default URN prefix is "urn".
+func (u *URN) String() string {
+	var res string
+	if u.ID != "" && u.SS != "" {
+		if u.prefix == "" {
+			res += "urn"
+		}
+		res += u.prefix + ":" + u.ID + ":" + u.SS
+	}
+
+	return res
+}
+
+// Parse is responsible to create an URN instance from a byte array matching the correct URN syntax.
+func Parse(u []byte) (*URN, bool) {
+	urn, err := NewMachine().Parse(u)
+	if err != nil {
+		return nil, false
+	}
+
+	return urn, true
+}
+
+// MarshalJSON marshals the URN to JSON string form (e.g. `"urn:oid:1.2.3.4"`).
+func (u URN) MarshalJSON() ([]byte, error) {
+	return json.Marshal(u.String())
+}
+
+// MarshalJSON unmarshals a URN from JSON string form (e.g. `"urn:oid:1.2.3.4"`).
+func (u *URN) UnmarshalJSON(bytes []byte) error {
+	var str string
+	if err := json.Unmarshal(bytes, &str); err != nil {
+		return err
+	}
+	if value, ok := Parse([]byte(str)); !ok {
+		return fmt.Errorf(errInvalidURN, str)
+	} else {
+		*u = *value
+	}
+	return nil
+}
\ No newline at end of file