Merge v1.2.1-master

Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2017-04-11 17:10:46 +02:00
parent a590155b0b
commit aeb17182b4
No known key found for this signature in database
GPG key ID: D808B4C167352E59
396 changed files with 27271 additions and 9969 deletions

File diff suppressed because one or more lines are too long

View file

@ -385,7 +385,6 @@ var TLDs = []string{
`durban`,
`dvag`,
`dvr`,
`dwg`,
`dz`,
`earth`,
`eat`,
@ -618,7 +617,6 @@ var TLDs = []string{
`ie`,
`ieee`,
`ifm`,
`iinet`,
`ikano`,
`il`,
`im`,
@ -865,7 +863,6 @@ var TLDs = []string{
`mu`,
`museum`,
`mutual`,
`mutuelle`,
`mv`,
`mw`,
`mx`,
@ -935,6 +932,7 @@ var TLDs = []string{
`omega`,
`one`,
`ong`,
`onion`,
`onl`,
`online`,
`onyourside`,
@ -1074,6 +1072,7 @@ var TLDs = []string{
`rs`,
`rsvp`,
`ru`,
`rugby`,
`ruhr`,
`run`,
`rw`,
@ -1244,7 +1243,6 @@ var TLDs = []string{
`thd`,
`theater`,
`theatre`,
`theguardian`,
`tiaa`,
`tickets`,
`tienda`,
@ -1492,7 +1490,6 @@ var TLDs = []string{
`セール`,
`ファッション`,
`ポイント`,
`一号店`,
`世界`,
`中信`,
`中国`,

View file

@ -19,7 +19,6 @@ var PseudoTLDs = []string{
`invalid`, // Invalid domain
`local`, // Local network
`localhost`, // Local network
`onion`, // Tor hidden services
`test`, // Test domain
`zkey`, // GNS domain name
}

View file

@ -11,12 +11,14 @@ import "regexp"
const (
letter = `\p{L}`
mark = `\p{M}`
number = `\p{N}`
iriChar = letter + number
iriChar = letter + mark + number
currency = `\p{Sc}`
otherSymb = `\p{So}`
endChar = iriChar + `/\-+_&~*%=#` + currency + otherSymb
midChar = endChar + `@.,:;'?!|`
otherPunc = `\p{Po}`
midChar = endChar + `|` + otherPunc
wellParen = `\([` + midChar + `]*(\([` + midChar + `]*\)[` + midChar + `]*)*\)`
wellBrack = `\[[` + midChar + `]*(\[[` + midChar + `]*\][` + midChar + `]*)*\]`
wellBrace = `\{[` + midChar + `]*(\{[` + midChar + `]*\}[` + midChar + `]*)*\}`