Unify on empty array indexes

2 files changed, 74 insertions, 74 deletions

diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg
index a6c3999c45f..cd4ea0b212a 100644
--- a/config-model/src/test/derived/complex/documentmanager.cfg
+++ b/config-model/src/test/derived/complex/documentmanager.cfg
@@ -118,31 +118,31 @@ datatype[].documenttype[].inherits[].name "document"
 datatype[].documenttype[].inherits[].version 0
 datatype[].documenttype[].headerstruct -1749463923
 datatype[].documenttype[].bodystruct -1665926686
-datatype[].documenttype[].fieldsets{default}.fields[0] "stringfield"
-datatype[].documenttype[].fieldsets{default}.fields[1] "title"
-datatype[].documenttype[].fieldsets{special}.fields[0] "special1"
-datatype[].documenttype[].fieldsets{special}.fields[1] "special2"
-datatype[].documenttype[].fieldsets{special}.fields[2] "special3"
-datatype[].documenttype[].fieldsets{all}.fields[0] "combineda"
-datatype[].documenttype[].fieldsets{all}.fields[1] "combinedb"
-datatype[].documenttype[].fieldsets{[document]}.fields[0] "category"
-datatype[].documenttype[].fieldsets{[document]}.fields[1] "collapseby"
-datatype[].documenttype[].fieldsets{[document]}.fields[2] "combineda"
-datatype[].documenttype[].fieldsets{[document]}.fields[3] "combinedb"
-datatype[].documenttype[].fieldsets{[document]}.fields[4] "docurl"
-datatype[].documenttype[].fieldsets{[document]}.fields[5] "dyntitle"
-datatype[].documenttype[].fieldsets{[document]}.fields[6] "exactagain"
-datatype[].documenttype[].fieldsets{[document]}.fields[7] "exactemento"
-datatype[].documenttype[].fieldsets{[document]}.fields[8] "fleeting"
-datatype[].documenttype[].fieldsets{[document]}.fields[9] "fleeting2"
-datatype[].documenttype[].fieldsets{[document]}.fields[10] "foundat"
-datatype[].documenttype[].fieldsets{[document]}.fields[11] "location"
-datatype[].documenttype[].fieldsets{[document]}.fields[12] "prefixenabled"
-datatype[].documenttype[].fieldsets{[document]}.fields[13] "source"
-datatype[].documenttype[].fieldsets{[document]}.fields[14] "special1"
-datatype[].documenttype[].fieldsets{[document]}.fields[15] "special2"
-datatype[].documenttype[].fieldsets{[document]}.fields[16] "special3"
-datatype[].documenttype[].fieldsets{[document]}.fields[17] "stringfield"
-datatype[].documenttype[].fieldsets{[document]}.fields[18] "title"
-datatype[].documenttype[].fieldsets{[document]}.fields[19] "ts"
-datatype[].documenttype[].fieldsets{[document]}.fields[20] "yEaR"
+datatype[].documenttype[].fieldsets{default}.fields[] "stringfield"
+datatype[].documenttype[].fieldsets{default}.fields[] "title"
+datatype[].documenttype[].fieldsets{special}.fields[] "special1"
+datatype[].documenttype[].fieldsets{special}.fields[] "special2"
+datatype[].documenttype[].fieldsets{special}.fields[] "special3"
+datatype[].documenttype[].fieldsets{all}.fields[] "combineda"
+datatype[].documenttype[].fieldsets{all}.fields[] "combinedb"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "category"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "collapseby"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "combineda"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "combinedb"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "docurl"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "dyntitle"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "exactagain"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "exactemento"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "fleeting"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "fleeting2"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "foundat"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "location"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "prefixenabled"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "source"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "special1"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "special2"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "special3"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "stringfield"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "title"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "ts"
+datatype[].documenttype[].fieldsets{[document]}.fields[] "yEaR"
diff --git a/config-model/src/test/derived/complex/ilscripts.cfg b/config-model/src/test/derived/complex/ilscripts.cfg
index fec528018fb..dfef7058936 100644
--- a/config-model/src/test/derived/complex/ilscripts.cfg
+++ b/config-model/src/test/derived/complex/ilscripts.cfg
@@ -1,49 +1,49 @@
 maxtermoccurrences 100
 fieldmatchmaxlength 1000000
 ilscript[].doctype "complex"
-ilscript[].docfield[0] "title"
-ilscript[].docfield[1] "location"
-ilscript[].docfield[2] "dyntitle"
-ilscript[].docfield[3] "special1"
-ilscript[].docfield[4] "special2"
-ilscript[].docfield[5] "special3"
-ilscript[].docfield[6] "prefixenabled"
-ilscript[].docfield[7] "source"
-ilscript[].docfield[8] "docurl"
-ilscript[].docfield[9] "fleeting"
-ilscript[].docfield[10] "fleeting2"
-ilscript[].docfield[11] "foundat"
-ilscript[].docfield[12] "collapseby"
-ilscript[].docfield[13] "yEaR"
-ilscript[].docfield[14] "stringfield"
-ilscript[].docfield[15] "exactemento"
-ilscript[].docfield[16] "exactagain"
-ilscript[].docfield[17] "ts"
-ilscript[].docfield[18] "combineda"
-ilscript[].docfield[19] "combinedb"
-ilscript[].docfield[20] "category"
-ilscript[].content[0] "clear_state | guard { input title . input category | tokenize | summary exact | index exact; }"
-ilscript[].content[1] "clear_state | guard { input location | tokenize normalize stem:\"SHORTEST\" | summary woe | index woe; }"
-ilscript[].content[2] "clear_state | guard { input yEaR | to_array | attribute year_arr; }"
-ilscript[].content[3] "clear_state | guard { input yEaR - 1900 | attribute year_sub; }"
-ilscript[].content[4] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | index title | summary title; }"
-ilscript[].content[5] "clear_state | guard { input dyntitle | tokenize normalize stem:\"SHORTEST\" | summary dyntitle; }"
-ilscript[].content[6] "clear_state | guard { input special1 | tokenize normalize | index special1; }"
-ilscript[].content[7] "clear_state | guard { input special2 | tokenize normalize | index special2; }"
-ilscript[].content[8] "clear_state | guard { input special3 | tokenize normalize | index special3; }"
-ilscript[].content[9] "clear_state | guard { input prefixenabled | tokenize stem:\"SHORTEST\" | index prefixenabled | attribute prefixenabled; }"
-ilscript[].content[10] "clear_state | guard { input source | summary source | index source; }"
-ilscript[].content[11] "clear_state | guard { input docurl | index docurl; }"
-ilscript[].content[12] "clear_state | guard { input fleeting | attribute fleeting; }"
-ilscript[].content[13] "clear_state | guard { input fleeting2 | attribute fleeting2; }"
-ilscript[].content[14] "clear_state | guard { input foundat | attribute foundat; }"
-ilscript[].content[15] "clear_state | guard { input collapseby | attribute collapseby; }"
-ilscript[].content[16] "clear_state | guard { input stringfield | tokenize normalize stem:\"SHORTEST\" | summary stringfield | index stringfield; }"
-ilscript[].content[17] "clear_state | guard { input exactemento | tokenize normalize stem:\"SHORTEST\" | index exactemento; }"
-ilscript[].content[18] "clear_state | guard { input exactagain | tokenize normalize stem:\"SHORTEST\" | index exactagain; }"
-ilscript[].content[19] "clear_state | guard { input ts | attribute ts; }"
-ilscript[].content[20] "clear_state | guard { input combineda | attribute combineda; }"
-ilscript[].content[21] "clear_state | guard { input combinedb | tokenize normalize stem:\"SHORTEST\" | index combinedb; }"
-ilscript[].content[22] "input category | passthrough category"
-ilscript[].content[23] "input location | passthrough location"
-ilscript[].content[24] "input yEaR | passthrough yEaR"
+ilscript[].docfield[] "title"
+ilscript[].docfield[] "location"
+ilscript[].docfield[] "dyntitle"
+ilscript[].docfield[] "special1"
+ilscript[].docfield[] "special2"
+ilscript[].docfield[] "special3"
+ilscript[].docfield[] "prefixenabled"
+ilscript[].docfield[] "source"
+ilscript[].docfield[] "docurl"
+ilscript[].docfield[] "fleeting"
+ilscript[].docfield[] "fleeting2"
+ilscript[].docfield[] "foundat"
+ilscript[].docfield[] "collapseby"
+ilscript[].docfield[] "yEaR"
+ilscript[].docfield[] "stringfield"
+ilscript[].docfield[] "exactemento"
+ilscript[].docfield[] "exactagain"
+ilscript[].docfield[] "ts"
+ilscript[].docfield[] "combineda"
+ilscript[].docfield[] "combinedb"
+ilscript[].docfield[] "category"
+ilscript[].content[] "clear_state | guard { input title . input category | tokenize | summary exact | index exact; }"
+ilscript[].content[] "clear_state | guard { input location | tokenize normalize stem:\"SHORTEST\" | summary woe | index woe; }"
+ilscript[].content[] "clear_state | guard { input yEaR | to_array | attribute year_arr; }"
+ilscript[].content[] "clear_state | guard { input yEaR - 1900 | attribute year_sub; }"
+ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | index title | summary title; }"
+ilscript[].content[] "clear_state | guard { input dyntitle | tokenize normalize stem:\"SHORTEST\" | summary dyntitle; }"
+ilscript[].content[] "clear_state | guard { input special1 | tokenize normalize | index special1; }"
+ilscript[].content[] "clear_state | guard { input special2 | tokenize normalize | index special2; }"
+ilscript[].content[] "clear_state | guard { input special3 | tokenize normalize | index special3; }"
+ilscript[].content[] "clear_state | guard { input prefixenabled | tokenize stem:\"SHORTEST\" | index prefixenabled | attribute prefixenabled; }"
+ilscript[].content[] "clear_state | guard { input source | summary source | index source; }"
+ilscript[].content[] "clear_state | guard { input docurl | index docurl; }"
+ilscript[].content[] "clear_state | guard { input fleeting | attribute fleeting; }"
+ilscript[].content[] "clear_state | guard { input fleeting2 | attribute fleeting2; }"
+ilscript[].content[] "clear_state | guard { input foundat | attribute foundat; }"
+ilscript[].content[] "clear_state | guard { input collapseby | attribute collapseby; }"
+ilscript[].content[] "clear_state | guard { input stringfield | tokenize normalize stem:\"SHORTEST\" | summary stringfield | index stringfield; }"
+ilscript[].content[] "clear_state | guard { input exactemento | tokenize normalize stem:\"SHORTEST\" | index exactemento; }"
+ilscript[].content[] "clear_state | guard { input exactagain | tokenize normalize stem:\"SHORTEST\" | index exactagain; }"
+ilscript[].content[] "clear_state | guard { input ts | attribute ts; }"
+ilscript[].content[] "clear_state | guard { input combineda | attribute combineda; }"
+ilscript[].content[] "clear_state | guard { input combinedb | tokenize normalize stem:\"SHORTEST\" | index combinedb; }"
+ilscript[].content[] "input category | passthrough category"
+ilscript[].content[] "input location | passthrough location"
+ilscript[].content[] "input yEaR | passthrough yEaR"