GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

fix line parsing function

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-27 21:18:05 -08:00
parent 8c8d371ae2
commit 542744d52a
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
irc/commands.go
View File

@ -80,7 +80,7 @@ func (command *BaseCommand) SetCode(code StringCode) {
}
func ParseCommand(line string) (cmd editableCommand, err error) {
code, args := parseLine(line)
code, args := ParseLine(line)
constructor := parseCommandFuncs[code]
if constructor == nil {
cmd = NewUnknownCommand(args)
@ -97,19 +97,33 @@ var (
spacesExpr = regexp.MustCompile(` +`)
)
func parseLine(line string) (StringCode, []string) {
var parts []string
if colonIndex := strings.IndexRune(line, ':'); colonIndex >= 0 {
lastArg := norm.NFC.String(line[colonIndex+len(":"):])
line = strings.TrimRight(line[:colonIndex], " ")
line = norm.NFKC.String(line)
parts = append(spacesExpr.Split(line, -1), lastArg)
} else {
line = strings.TrimRight(line, " ")
line = norm.NFKC.String(line)
parts = spacesExpr.Split(line, -1)
func splitArg(line string) (arg string, rest string) {
parts := spacesExpr.Split(line, 2)
if len(parts) > 0 {
arg = parts[0]
}
return StringCode(strings.ToUpper(parts[0])), parts[1:]
if len(parts) > 1 {
rest = parts[1]
}
return
}
func ParseLine(line string) (command StringCode, args []string) {
args = make([]string, 0)
if strings.HasPrefix(line, ":") {
_, line = splitArg(line)
}
arg, line := splitArg(line)
command = StringCode(strings.ToUpper(arg))
for len(line) > 0 {
if strings.HasPrefix(line, ":") {
args = append(args, norm.NFC.String(line[len(":"):]))
break
}
arg, line = splitArg(line)
args = append(args, norm.NFKC.String(arg))
}
return
}
// <command> [args...]

2
irc/constants.go
View File

@ -23,7 +23,7 @@ var (
)
const (
SEM_VER = "ergonomadic-1.2.10"
SEM_VER = "ergonomadic-1.2.11"
CRLF = "\r\n"
MAX_REPLY_LEN = 512 - len(CRLF)