Add array value destructure

1 files changed, 40 insertions, 0 deletions

diff --git a/subex/subexast.go b/subex/subexast.go
index 7070baf..a2c3675 100644
--- a/subex/subexast.go
+++ b/subex/subexast.go
@@ -484,6 +484,13 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 		construct = &SubexConstructArrayState {
 			next: next,
 		}
+	case ArrayValuesStructure:
+		innerOutType = ValueType
+		construct = &SubexConstructArrayValuesState {
+			next: next,
+		}
+	default:
+		panic("Invalid ast structure")
 	}
 
 	var innerInType Type
@@ -508,6 +515,16 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 				next: construct,
 			},
 		}
+	case ArrayValuesStructure:
+		innerInType = ValueType
+		destructFooter = &SubexDiscardTerminalState {
+			terminal: walk.ArrayEnd,
+			next: &SubexDecrementNestState {
+				next: construct,
+			},
+		}
+	default:
+		panic("Invalid ast destructure")
 	}
 
 	inner := ast.Content.compileWith(
@@ -529,6 +546,12 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 		beginConstruct = &SubexCaptureBeginState {
 			next: inner,
 		}
+	case ArrayValuesStructure:
+		beginConstruct = &SubexCaptureBeginState {
+			next: inner,
+		}
+	default:
+		panic("Invalid ast structure")
 	}
 
 	switch ast.Destructure {
@@ -540,6 +563,7 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 				filter: anyStringFilter{},
 				next: &SubexDiscardState {
 					next: &SubexIncrementNestState {
+						keys: true,
 						next: beginConstruct,
 					},
 				},
@@ -551,6 +575,19 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 				filter: anyArrayFilter{},
 				next: &SubexDiscardState {
 					next: &SubexIncrementNestState {
+						keys: true,
+						next: beginConstruct,
+					},
+				},
+			},
+		}
+	case ArrayValuesStructure:
+		return &SubexCaptureBeginState {
+			next: &SubexCopyState {
+				filter: anyArrayFilter{},
+				next: &SubexDiscardState {
+					next: &SubexIncrementNestState {
+						keys: false,
 						next: beginConstruct,
 					},
 				},
@@ -560,3 +597,6 @@ func (ast SubexASTDestructure) compileWith(next SubexState, slotMap *SlotMap, in
 		panic("Invalid destructure in ast")
 	}
 }
+func (ast SubexASTDestructure) String() string {
+	return fmt.Sprintf("%v(%v)%v", ast.Destructure, ast.Content, ast.Structure)
+}