atomic bitset implementations of caps.Set and modes.ModeSet

irc/caps/constants.go

@@ -3,58 +3,30 @@
 
 package caps
 
+import "errors"
+
 // Capability represents an optional feature that a client may request from the server.
-type Capability string
+type Capability uint
 
-const (
-	// LabelTagName is the tag name used for the labeled-response spec.
-	LabelTagName = "draft/label"
+// actual capability definitions appear in defs.go
 
-	// AccountNotify is this IRCv3 capability: http://ircv3.net/specs/extensions/account-notify-3.1.html
-	AccountNotify Capability = "account-notify"
-	// AccountTag is this IRCv3 capability: http://ircv3.net/specs/extensions/account-tag-3.2.html
-	AccountTag Capability = "account-tag"
-	// AwayNotify is this IRCv3 capability: http://ircv3.net/specs/extensions/away-notify-3.1.html
-	AwayNotify Capability = "away-notify"
-	// Batch is this IRCv3 capability: http://ircv3.net/specs/extensions/batch-3.2.html
-	Batch Capability = "batch"
-	// CapNotify is this IRCv3 capability: http://ircv3.net/specs/extensions/cap-notify-3.2.html
-	CapNotify Capability = "cap-notify"
-	// ChgHost is this IRCv3 capability: http://ircv3.net/specs/extensions/chghost-3.2.html
-	ChgHost Capability = "chghost"
-	// EchoMessage is this IRCv3 capability: http://ircv3.net/specs/extensions/echo-message-3.2.html
-	EchoMessage Capability = "echo-message"
-	// ExtendedJoin is this IRCv3 capability: http://ircv3.net/specs/extensions/extended-join-3.1.html
-	ExtendedJoin Capability = "extended-join"
-	// InviteNotify is this IRCv3 capability: http://ircv3.net/specs/extensions/invite-notify-3.2.html
-	InviteNotify Capability = "invite-notify"
-	// LabeledResponse is this draft IRCv3 capability: http://ircv3.net/specs/extensions/labeled-response.html
-	LabeledResponse Capability = "draft/labeled-response"
-	// Languages is this proposed IRCv3 capability: https://gist.github.com/DanielOaks/8126122f74b26012a3de37db80e4e0c6
-	Languages Capability = "draft/languages"
-	// MaxLine is this capability: https://oragono.io/maxline
-	MaxLine Capability = "oragono.io/maxline"
-	// MessageTags is this draft IRCv3 capability: http://ircv3.net/specs/core/message-tags-3.3.html
-	MessageTags Capability = "draft/message-tags-0.2"
-	// MultiPrefix is this IRCv3 capability: http://ircv3.net/specs/extensions/multi-prefix-3.1.html
-	MultiPrefix Capability = "multi-prefix"
-	// Rename is this proposed capability: https://github.com/SaberUK/ircv3-specifications/blob/rename/extensions/rename.md
-	Rename Capability = "draft/rename"
-	// Resume is this proposed capability: https://github.com/DanielOaks/ircv3-specifications/blob/master+resume/extensions/resume.md
-	Resume Capability = "draft/resume"
-	// SASL is this IRCv3 capability: http://ircv3.net/specs/extensions/sasl-3.2.html
-	SASL Capability = "sasl"
-	// ServerTime is this IRCv3 capability: http://ircv3.net/specs/extensions/server-time-3.2.html
-	ServerTime Capability = "server-time"
-	// STS is this IRCv3 capability: http://ircv3.net/specs/extensions/sts.html
-	STS Capability = "sts"
-	// UserhostInNames is this IRCv3 capability: http://ircv3.net/specs/extensions/userhost-in-names-3.2.html
-	UserhostInNames Capability = "userhost-in-names"
+var (
+	nameToCapability map[string]Capability
+
+	NoSuchCap = errors.New("Unsupported capability name")
 )
 
 // Name returns the name of the given capability.
 func (capability Capability) Name() string {
-	return string(capability)
+	return capabilityNames[capability]
+}
+
+func NameToCapability(name string) (result Capability, err error) {
+	result, found := nameToCapability[name]
+	if !found {
+		err = NoSuchCap
+	}
+	return
 }
 
 // Version is used to select which max version of CAP the client supports.
@@ -78,3 +50,10 @@ const (
 	// NegotiatedState means CAP negotiation has been successfully ended and reg should complete.
 	NegotiatedState State = iota
 )
+
+func init() {
+	nameToCapability = make(map[string]Capability)
+	for capab, name := range capabilityNames {
+		nameToCapability[name] = Capability(capab)
+	}
+}