From b8ee6a1505911e45fbbf56460debec68faccb7a0 Mon Sep 17 00:00:00 2001
From: Dustin Pianalto <dustin@djpianalto.com>
Date: Tue, 25 Aug 2020 22:22:39 -0800
Subject: [PATCH] Move rpn logic to separate package

---
 djpianalto.com/goff/exts/fun.go | 10 +++++-----
 go.mod                          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/djpianalto.com/goff/exts/fun.go b/djpianalto.com/goff/exts/fun.go
index c133a88..5084128 100644
--- a/djpianalto.com/goff/exts/fun.go
+++ b/djpianalto.com/goff/exts/fun.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"djpianalto.com/goff/djpianalto.com/goff/utils"
 	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/rpnparse"
 )
 
 func interleave(ctx disgoman.Context, args []string) {
@@ -52,7 +52,7 @@ func deinterleave(ctx disgoman.Context, args []string) {
 }
 
 func generateRPNCommand(ctx disgoman.Context, args []string) {
-	rpn, err := utils.GenerateRPN(args)
+	rpn, err := rpnparse.GenerateRPN(args)
 	if err != nil {
 		ctx.Send(err.Error())
 		return
@@ -61,7 +61,7 @@ func generateRPNCommand(ctx disgoman.Context, args []string) {
 }
 
 func parseRPNCommand(ctx disgoman.Context, args []string) {
-	res, err := utils.ParseRPN(args)
+	res, err := rpnparse.ParseRPN(args)
 	if err != nil {
 		ctx.Send(err.Error())
 		return
@@ -70,12 +70,12 @@ func parseRPNCommand(ctx disgoman.Context, args []string) {
 }
 
 func solveCommand(ctx disgoman.Context, args []string) {
-	rpn, err := utils.GenerateRPN(args)
+	rpn, err := rpnparse.GenerateRPN(args)
 	if err != nil {
 		ctx.Send(err.Error())
 		return
 	}
-	res, err := utils.ParseRPN(strings.Split(rpn, " "))
+	res, err := rpnparse.ParseRPN(strings.Split(rpn, " "))
 	if err != nil {
 		ctx.Send(err.Error())
 		return
diff --git a/go.mod b/go.mod
index 05b3072..427dafe 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.14
 require (
 	github.com/bwmarrin/discordgo v0.20.3-0.20200525154655-ca64123b05de
 	github.com/dustinpianalto/disgoman v0.0.10
+	github.com/dustinpianalto/rpnparse v1.0.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/lib/pq v1.3.0
 	github.com/olebedev/when v0.0.0-20190311101825-c3b538a97254