Simplified constant folding

src/core/Fold.go

@@ -17,31 +17,11 @@ func (f *Function) Fold(expr *expression.Expression) error {
 	}
 
 	if expr.IsLeaf() {
-		if expr.Token.IsNumeric() {
+		return f.FoldLeaf(expr)
-			value, err := f.ToNumber(expr.Token)
-			expr.Value = value
-			expr.IsFolded = true
-			return err
-		}
-
-		return nil
 	}
 
 	if expr.Token.Kind == token.Period {
-		left := expr.Children[0]
+		return f.FoldConstant(expr)
-		leftText := left.Token.Text(f.File.Bytes)
-		right := expr.Children[1]
-		rightText := right.Token.Text(f.File.Bytes)
-		constant, isConst := f.All.Constants[f.Package+"."+leftText+"."+rightText]
-
-		if !isConst {
-			return nil
-		}
-
-		value, err := ToNumber(constant.Token, constant.File)
-		expr.Value = value
-		expr.IsFolded = true
-		return err
 	}
 
 	canFold := true

src/core/FoldConstant.go

@@ -0,0 +1,23 @@
+package core
+
+import (
+	"git.urbach.dev/cli/q/src/expression"
+)
+
+// FoldConstant tries to find a constant that can be folded.
+func (f *Function) FoldConstant(expr *expression.Expression) error {
+	left := expr.Children[0]
+	right := expr.Children[1]
+	leftText := left.Token.Text(f.File.Bytes)
+	rightText := right.Token.Text(f.File.Bytes)
+	constant, exists := f.All.Constants[f.Package+"."+leftText+"."+rightText]
+
+	if !exists {
+		return nil
+	}
+
+	value, err := ToNumber(constant.Token, constant.File)
+	expr.Value = value
+	expr.IsFolded = true
+	return err
+}

src/core/FoldLeaf.go

@@ -0,0 +1,17 @@
+package core
+
+import (
+	"git.urbach.dev/cli/q/src/expression"
+)
+
+// FoldLeaf tries to fold a leaf expression.
+func (f *Function) FoldLeaf(expr *expression.Expression) error {
+	if !expr.Token.IsNumeric() {
+		return nil
+	}
+
+	value, err := f.ToNumber(expr.Token)
+	expr.Value = value
+	expr.IsFolded = true
+	return err
+}

src/expression/Expression.go

@@ -11,9 +11,8 @@ type Expression struct {
 	Parent     *Expression
 	Children   []*Expression
 	Token      token.Token
-	Value      int
 	Precedence int8
-	IsFolded   bool
+	Foldable
 }
 
 // New creates a new expression.
@@ -62,8 +61,8 @@ func (expr *Expression) Reset() {
 	}
 
 	expr.Token.Reset()
-	expr.Value = 0
 	expr.Precedence = 0
+	expr.Value = 0
 	expr.IsFolded = false
 }
 

src/expression/Foldable.go

@@ -0,0 +1,7 @@
+package expression
+
+// Foldable has optional fields that are used for constant folding later.
+type Foldable struct {
+	Value    int
+	IsFolded bool
+}