From a7dc82ff12c72b7eb362534c53a32f62dcfba72f Mon Sep 17 00:00:00 2001
From: Arpad Ryszka <arpad.ryszka@gmail.com>
Date: Thu, 11 Oct 2018 23:48:00 +0200
Subject: [PATCH] fix test syntax

---
 examples/mml-exp2.treerack | 19 +++++++++++++------
 mmlexp2_test.go            | 28 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/examples/mml-exp2.treerack b/examples/mml-exp2.treerack
index b02d5c9..bd0d7f8 100644
--- a/examples/mml-exp2.treerack
+++ b/examples/mml-exp2.treerack
@@ -64,10 +64,16 @@ range-from  = expression;
 range-to    = expression;
 range:alias = range-from? nl* ":" nl* range-to?;
 
-simple-indexer:alias     = primary-expression "[" nl* expression nl* "]";
-range-indexer:alias      = primary-expression "[" nl* range nl* "]";
-expression-indexer       = simple-indexer | range-indexer;
-symbol-indexer           = primary-expression nl* "." nl* symbol;
+// simple-indexer:alias     = primary-expression "[" nl* expression nl* "]";
+// range-indexer:alias      = primary-expression "[" nl* range nl* "]";
+// expression-indexer       = simple-indexer | range-indexer;
+// symbol-indexer           = primary-expression nl* "." nl* symbol;
+
+symbol-index     = "." nl* symbol;
+expression-index = "[" nl* expression nl* "]";
+index:alias      = symbol-index | expression-index;
+index-list:alias = index (nl* index)?;
+indexer          = primary-expression nl* index-list;
 
 function-application = primary-expression "(" list-sep? expression-list? list-sep? ")";
 
@@ -84,8 +90,9 @@ primary-expression:alias = int
                          | mutable-struct
                          | function
                          | effect
-                         | expression-indexer
-                         | symbol-indexer
+                         // | expression-indexer
+                         // | symbol-indexer
+		       | indexer
                          | function-application
                          | expression-group;
 
diff --git a/mmlexp2_test.go b/mmlexp2_test.go
index 7103e09..26ab04f 100644
--- a/mmlexp2_test.go
+++ b/mmlexp2_test.go
@@ -13,23 +13,26 @@ func TestMMLExp2(t *testing.T) {
 
 	t.Run("indexer", func(t *testing.T) {
 		// BUG:
-		t.Skip()
+		// t.Skip()
 
 		runTestsSyntax(t, s, []testItem{{
 			title: "mixed indexer",
 			text:  "a.b[c]",
 			ignorePosition: true,
 			nodes: []*Node{{
-				Name: "expression-indexer",
+				Name: "indexer",
 				Nodes: []*Node{{
-					Name: "symbol-indexer",
+					Name: "symbol",
+				}, {
+					Name: "symbol-index",
 					Nodes: []*Node{{
 						Name: "symbol",
-					}, {
-						Name: "symbol",
 					}},
 				}, {
-					Name: "symbol",
+					Name: "expression-index",
+					Nodes: []*Node{{
+						Name: "symbol",
+					}},
 				}},
 			}},
 		}})
@@ -39,16 +42,19 @@ func TestMMLExp2(t *testing.T) {
 			text:  "a[b].c",
 			ignorePosition: true,
 			nodes: []*Node{{
-				Name: "symbol-indexer",
+				Name: "indexer",
 				Nodes: []*Node{{
-					Name: "expression-indexer",
+					Name: "symbol",
+				}, {
+					Name: "expression-index",
 					Nodes: []*Node{{
 						Name: "symbol",
-					}, {
-						Name: "symbol",
 					}},
 				}, {
-					Name: "symbol",
+					Name: "symbol-index",
+					Nodes: []*Node{{
+						Name: "symbol",
+					}},
 				}},
 			}},
 		}})