Merge branch 'main' into experiment/interpreter

parser/ast.go

@@ -138,15 +138,15 @@ type SourceOverdraft struct {
 	Bounded *Literal
 }
 
-type SourceAllotmentValue interface{ sourceAllotmentValue() }
+type AllotmentValue interface{ allotmentValue() }
 
-func (*RemainingAllotment) sourceAllotmentValue() {}
-func (*RatioLiteral) sourceAllotmentValue()       {}
-func (*VariableLiteral) sourceAllotmentValue()    {}
+func (*RemainingAllotment) allotmentValue() {}
+func (*RatioLiteral) allotmentValue()       {}
+func (*VariableLiteral) allotmentValue()    {}
 
 type SourceAllotmentItem struct {
 	Range     Range
-	Allotment SourceAllotmentValue
+	Allotment AllotmentValue
 	From      Source
 }
 
@@ -164,12 +164,6 @@ func (*DestinationAllotment) destination() {}
 func (d *DestinationInorder) GetRange() Range   { return d.Range }
 func (d *DestinationAllotment) GetRange() Range { return d.Range }
 
-type DestinationAllotmentValue interface{ destinationAllotmentValue() }
-
-func (*RemainingAllotment) destinationAllotmentValue() {}
-func (*RatioLiteral) destinationAllotmentValue()       {}
-func (*VariableLiteral) destinationAllotmentValue()    {}
-
 type DestinationInorder struct {
 	Range     Range
 	Clauses   []DestinationInorderClause
@@ -202,7 +196,7 @@ type DestinationAllotment struct {
 
 type DestinationAllotmentItem struct {
 	Range     Range
-	Allotment DestinationAllotmentValue
+	Allotment AllotmentValue
 	To        KeptOrDestination
 }
 

parser/parser.go

@@ -273,7 +273,7 @@ func parsePercentageRatio(source string, range_ Range) *RatioLiteral {
 	}
 }
 
-func parseAllotment(allotmentCtx parser.IAllotmentContext) SourceAllotmentValue {
+func parseAllotment(allotmentCtx parser.IAllotmentContext) AllotmentValue {
 	switch allotmentCtx := allotmentCtx.(type) {
 	case *parser.PortionedAllotmentContext:
 		return parsePortionSource(allotmentCtx.Portion())
@@ -290,7 +290,7 @@ func parseAllotment(allotmentCtx parser.IAllotmentContext) SourceAllotmentValue
 		return nil
 
 	default:
-		return utils.NonExhaustiveMatchPanic[SourceAllotmentValue](allotmentCtx.GetText())
+		return utils.NonExhaustiveMatchPanic[AllotmentValue](allotmentCtx.GetText())
 	}
 }
 
@@ -455,7 +455,7 @@ func parseKeptOrDestination(clauseCtx parser.IKeptOrDestinationContext) KeptOrDe
 
 }
 
-func parseDestinationAllotment(allotmentCtx parser.IAllotmentContext) DestinationAllotmentValue {
+func parseDestinationAllotment(allotmentCtx parser.IAllotmentContext) AllotmentValue {
 	switch allotmentCtx := allotmentCtx.(type) {
 	case *parser.RemainingAllotmentContext:
 		return &RemainingAllotment{
@@ -472,11 +472,11 @@ func parseDestinationAllotment(allotmentCtx parser.IAllotmentContext) Destinatio
 		return nil
 
 	default:
-		return utils.NonExhaustiveMatchPanic[DestinationAllotmentValue](allotmentCtx.GetText())
+		return utils.NonExhaustiveMatchPanic[AllotmentValue](allotmentCtx.GetText())
 	}
 }
 
-func parseDestinationPortion(portionCtx parser.IPortionContext) DestinationAllotmentValue {
+func parseDestinationPortion(portionCtx parser.IPortionContext) AllotmentValue {
 	switch portionCtx.(type) {
 	case *parser.RatioContext:
 		return parseRatio(portionCtx.GetText(), ctxToRange(portionCtx))
@@ -488,7 +488,7 @@ func parseDestinationPortion(portionCtx parser.IPortionContext) DestinationAllot
 		return nil
 
 	default:
-		return utils.NonExhaustiveMatchPanic[DestinationAllotmentValue](portionCtx.GetText())
+		return utils.NonExhaustiveMatchPanic[AllotmentValue](portionCtx.GetText())
 	}
 }