Adds optimizations to tokenizer and parser.

main/main.go

@@ -14,7 +14,7 @@ func main() {
 
 func TestParse() {
 	var inputString = "a * b * c + 123 + sin(x)"
-	var parsed, err = parser.Parse(inputString)
+	var parsed, err = parser.ParseOperation(inputString)
 	if err != nil {
 		fmt.Println((*err).Error())
 		return

pkg/operations/constants/constant.go

@@ -2,7 +2,7 @@ package constants
 
 import (
 	"goast/pkg/operations"
-	"strconv"
+	"goast/pkg/utils"
 )
 
 type Constant struct {
@@ -22,7 +22,7 @@ func (c Constant) ToString() string {
 	if c.StringRepresentation != nil {
 		return *(c.StringRepresentation)
 	}
-	return strconv.FormatComplex(c.Representation, 'G', 5, 64)
+	return utils.SmartComplexString(c.Representation)
 }
 
 func (c Constant) ToNumber() complex128 {

pkg/operations/functions/abs.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Abs struct {
@@ -21,7 +21,7 @@ func (a Abs) IsConstant() bool {
 func (a Abs) ToString() string {
 	if a.Inner.IsConstant() {
 		c := a.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "abs("
 	retString += a.Inner.ToString()

pkg/operations/functions/addition.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Addition struct {
@@ -27,7 +27,7 @@ func (a Addition) IsConstant() bool {
 func (a Addition) ToString() string {
 	if a.IsConstant() {
 		c := a.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := ""
 	var values = a.GetValues()

pkg/operations/functions/arccos.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type ArcCos struct {
@@ -21,7 +21,7 @@ func (a ArcCos) IsConstant() bool {
 func (a ArcCos) ToString() string {
 	if a.Inner.IsConstant() {
 		c := a.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "arccos("
 	retString += a.Inner.ToString()

pkg/operations/functions/arcsin.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type ArcSin struct {
@@ -21,7 +21,7 @@ func (a ArcSin) IsConstant() bool {
 func (a ArcSin) ToString() string {
 	if a.Inner.IsConstant() {
 		c := a.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "arcsin("
 	retString += a.Inner.ToString()

pkg/operations/functions/arctan.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type ArcTan struct {
@@ -21,7 +21,7 @@ func (a ArcTan) IsConstant() bool {
 func (a ArcTan) ToString() string {
 	if a.Inner.IsConstant() {
 		c := a.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "arctan("
 	retString += a.Inner.ToString()

pkg/operations/functions/cos.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Cos struct {
@@ -21,7 +21,7 @@ func (c Cos) IsConstant() bool {
 func (c Cos) ToString() string {
 	if c.Inner.IsConstant() {
 		c := c.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "cos("
 	retString += c.Inner.ToString()

pkg/operations/functions/division.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Division struct {
@@ -28,7 +28,7 @@ func (d Division) IsConstant() bool {
 func (d Division) ToString() string {
 	if d.IsConstant() {
 		c := d.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := ""
 	retString += d.Numerator.ToString()

pkg/operations/functions/log.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Log struct {
@@ -22,9 +22,9 @@ func (l Log) IsConstant() bool {
 func (l Log) ToString() string {
 	if l.Inner.IsConstant() {
 		c := l.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
-	retString := "log("
+	retString := "log_("
 	retString += l.Base.ToString() + ", "
 	retString += l.Inner.ToString()
 	retString += ")"

pkg/operations/functions/multiplication.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Multiplication struct {
@@ -27,7 +27,7 @@ func (m Multiplication) IsConstant() bool {
 func (m Multiplication) ToString() string {
 	if m.IsConstant() {
 		c := m.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := ""
 	var values = m.GetValues()

pkg/operations/functions/negation.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Negation struct {
@@ -21,7 +21,7 @@ func (n Negation) IsConstant() bool {
 func (n Negation) ToString() string {
 	if n.Inner.IsConstant() {
 		c := n.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "-"
 	retString += n.Inner.ToString()

pkg/operations/functions/parentheses.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Parentheses struct {
@@ -21,7 +21,7 @@ func (p Parentheses) IsConstant() bool {
 func (p Parentheses) ToString() string {
 	if p.Inner.IsConstant() {
 		c := p.Inner.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "("
 	retString += p.Inner.ToString()

pkg/operations/functions/power.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Power struct {
@@ -25,7 +25,7 @@ func (p Power) IsConstant() bool {
 func (p Power) ToString() string {
 	if p.IsConstant() {
 		c := p.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := p.Base.ToString()
 	retString += " ^ "

pkg/operations/functions/sin.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Sin struct {
@@ -21,7 +21,7 @@ func (s Sin) IsConstant() bool {
 func (s Sin) ToString() string {
 	if s.Inner.IsConstant() {
 		c := s.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "sin("
 	retString += s.Inner.ToString()

pkg/operations/functions/subtraction.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Subtraction struct {
@@ -27,7 +27,7 @@ func (s Subtraction) IsConstant() bool {
 func (s Subtraction) ToString() string {
 	if s.IsConstant() {
 		c := s.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := ""
 	for i := 0; i < len(s.Values); i++ {

pkg/operations/functions/tan.go

@@ -2,8 +2,8 @@ package functions
 
 import (
 	"goast/pkg/operations"
+	"goast/pkg/utils"
 	"math/cmplx"
-	"strconv"
 )
 
 type Tan struct {
@@ -21,7 +21,7 @@ func (t Tan) IsConstant() bool {
 func (t Tan) ToString() string {
 	if t.Inner.IsConstant() {
 		c := t.ToNumber()
-		return strconv.FormatComplex(c, 'f', 5, 64)
+		return utils.SmartComplexString(c)
 	}
 	retString := "tan("
 	retString += t.Inner.ToString()

pkg/operations/parser/parser.go

@@ -423,7 +423,7 @@ func Remove(intermediates []Intermediate, other Intermediate) []Intermediate {
 	return intermediates
 }
 
-func Parse(inputString string) (operations.Operation, *error) {
+func ParseOperation(inputString string) (operations.Operation, *error) {
 	err := validateString(inputString)
 	if err != nil {
 		return constants.NaN, err
@@ -730,7 +730,7 @@ func generateOperators(current []Intermediate, inputList []tokens.Token) []Inter
 }
 
 func generateIdentities(current []Intermediate, inputList []tokens.Token) []Intermediate {
-	var clone = slices.Clone(current)
+	var clone = current
 	for i, token := range inputList {
 		if indexProcessedOperation(i, clone) == false {
 			if token.TokenType == tokens.Operator {
@@ -762,13 +762,13 @@ func generateIdentities(current []Intermediate, inputList []tokens.Token) []Inte
 			}
 		}
 	}
-	var retList = slices.Clone(clone)
+	var retList = clone
 	SortByStartIndex(retList)
 	return retList
 }
 
 func generatePowers(current []Intermediate, inputList []tokens.Token) []Intermediate {
-	var clone = slices.Clone(current)
+	var clone = current
 	for i, token := range inputList {
 		if indexProcessedOperation(i, clone) == false {
 			if token.TokenType == tokens.Operator {
@@ -790,14 +790,14 @@ func generatePowers(current []Intermediate, inputList []tokens.Token) []Intermed
 			}
 		}
 	}
-	var retList = slices.Clone(clone)
+	var retList = clone
 	SortByStartIndex(retList)
 	return retList
 }
 
 func generateMultiplicationAndDivision(current []Intermediate, inputList []tokens.Token) []Intermediate {
 	// TODO Require left and right checks for mult and div
-	var clone = slices.Clone(current)
+	var clone = current
 	for i, token := range inputList {
 		if indexProcessedOperation(i, clone) == false {
 			if token.TokenType == tokens.Operator {
@@ -831,14 +831,14 @@ func generateMultiplicationAndDivision(current []Intermediate, inputList []token
 			}
 		}
 	}
-	var retList = slices.Clone(clone)
+	var retList = clone
 	SortByStartIndex(retList)
 	return retList
 }
 
 func generateAdditionAndSubtraction(current []Intermediate, inputList []tokens.Token) []Intermediate {
 	// TODO Require left and right checks for add and sub
-	var clone = slices.Clone(current)
+	var clone = current
 	for i, token := range inputList {
 		if indexProcessedOperation(i, clone) == false {
 			if token.TokenType == tokens.Operator {
@@ -873,7 +873,7 @@ func generateAdditionAndSubtraction(current []Intermediate, inputList []tokens.T
 		}
 	}
 
-	var retList = slices.Clone(clone)
+	var retList = clone
 	SortByStartIndex(retList)
 	return retList
 }