From f260fa2774f645cd4849973824605571760cd2b2 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sat, 17 Jun 2023 17:30:33 -0700
Subject: [PATCH] fix shared_array output limit off by one

---
 src/sharedarray.cpp |  2 +-
 test/testqgroup.cpp | 36 ++++++++++++++++++------------------
 test/testtype.cpp   |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sharedarray.cpp b/src/sharedarray.cpp
index e106ef1..fbe0dc0 100644
--- a/src/sharedarray.cpp
+++ b/src/sharedarray.cpp
@@ -114,7 +114,7 @@ void showArr(std::ostream& strm, const void* raw, size_t count, size_t limit)
     for(auto i : range(count)) {
         if(i!=0)
             strm<<", ";
-        if(i>limit) {
+        if(i>=limit) {
             strm<<"...";
             break;
         }
diff --git a/test/testqgroup.cpp b/test/testqgroup.cpp
index 9875073..4e750d3 100644
--- a/test/testqgroup.cpp
+++ b/test/testqgroup.cpp
@@ -285,7 +285,7 @@ void testImage()
               "            int32_t size = 100\n"
               "        }\n"
               "    ]\n"
-              "    any value uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, 3276, ...]\n"
+              "    any value uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, ...]\n"
               "    struct {\n"
               "        struct \"alarm_t\" {\n"
               "            int32_t severity = 0\n"
@@ -333,7 +333,7 @@ void testImage()
               "dimension[1] struct\n"
               "dimension[1].size int32_t = 100\n"
               "value any\n"
-              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, 3276, ...]\n"
+              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, ...]\n"
               "x.alarm.severity int32_t = 0\n"
               "x.alarm.status int32_t = 0\n"
               "x.alarm.message string = \"\"\n"
@@ -379,7 +379,7 @@ void testImage()
               "dimension[1] struct\n"
               "dimension[1].size int32_t = 100\n"
               "value any\n"
-              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, 3276, ...]\n"
+              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, ...]\n"
               "x.alarm.severity int32_t = 0\n"
               "x.alarm.status int32_t = 0\n"
               "x.alarm.message string = \"\"\n"
@@ -425,7 +425,7 @@ void testImage()
               "dimension[1] struct\n"
               "dimension[1].size int32_t = 100\n"
               "value any\n"
-              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, 3276, ...]\n"
+              "value-> uint16_t[] = {10000}[0, 655, 1310, 1966, 2621, ...]\n"
               "x.alarm.severity int32_t = 0\n"
               "x.alarm.status int32_t = 0\n"
               "x.alarm.message string = \"\"\n"
@@ -458,7 +458,7 @@ void testIQ()
               "        } _options\n"
               "    } record\n"
               "    struct \"epics:nt/NTScalarArray:1.0\" {\n"
-              "        double[] value = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "        double[] value = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "        struct \"alarm_t\" {\n"
               "            int32_t severity = 0\n"
               "            int32_t status = 0\n"
@@ -477,7 +477,7 @@ void testIQ()
               "            int32_t precision = 0\n"
               "            struct \"enum_t\" {\n"
               "                int32_t index = 6\n"
-              "                string[] choices = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "                string[] choices = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "            } form\n"
               "        } display\n"
               "        struct {\n"
@@ -499,7 +499,7 @@ void testIQ()
               "        } valueAlarm\n"
               "    } I\n"
               "    struct \"epics:nt/NTScalarArray:1.0\" {\n"
-              "        double[] value = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "        double[] value = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "        struct \"alarm_t\" {\n"
               "            int32_t severity = 0\n"
               "            int32_t status = 0\n"
@@ -518,7 +518,7 @@ void testIQ()
               "            int32_t precision = 0\n"
               "            struct \"enum_t\" {\n"
               "                int32_t index = 6\n"
-              "                string[] choices = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "                string[] choices = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "            } form\n"
               "        } display\n"
               "        struct {\n"
@@ -547,7 +547,7 @@ void testIQ()
               );
     testStrEq(std::string(SB()<<val.format().delta().arrayLimit(5u)),
               "record._options.atomic bool = true\n"
-              "I.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "I.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "I.alarm.severity int32_t = 0\n"
               "I.alarm.status int32_t = 0\n"
               "I.alarm.message string = \"\"\n"
@@ -558,10 +558,10 @@ void testIQ()
               "I.display.description string = \"\"\n"
               "I.display.units string = \"\"\n"
               "I.display.form.index int32_t = 6\n"
-              "I.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "I.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "I.control.limitLow double = 0\n"
               "I.control.limitHigh double = 0\n"
-              "Q.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "Q.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "Q.alarm.severity int32_t = 0\n"
               "Q.alarm.status int32_t = 0\n"
               "Q.alarm.message string = \"\"\n"
@@ -572,7 +572,7 @@ void testIQ()
               "Q.display.description string = \"\"\n"
               "Q.display.units string = \"\"\n"
               "Q.display.form.index int32_t = 6\n"
-              "Q.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "Q.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "Q.control.limitLow double = 0\n"
               "Q.control.limitHigh double = 0\n"
               "phas.i double = 1\n"
@@ -585,7 +585,7 @@ void testIQ()
     testStrEq(std::string(SB()<<val.format().delta().arrayLimit(5u)),
               "record._options.queueSize int32_t = 4\n"
               "record._options.atomic bool = true\n"
-              "I.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "I.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "I.alarm.severity int32_t = 0\n"
               "I.alarm.status int32_t = 0\n"
               "I.alarm.message string = \"\"\n"
@@ -596,10 +596,10 @@ void testIQ()
               "I.display.description string = \"\"\n"
               "I.display.units string = \"\"\n"
               "I.display.form.index int32_t = 6\n"
-              "I.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "I.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "I.control.limitLow double = 0\n"
               "I.control.limitHigh double = 0\n"
-              "Q.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, 0.325568, ...]\n"
+              "Q.value double[] = {500}[0.0174524, 0.0801989, 0.142629, 0.204496, 0.265556, ...]\n"
               "Q.alarm.severity int32_t = 0\n"
               "Q.alarm.status int32_t = 0\n"
               "Q.alarm.message string = \"\"\n"
@@ -610,7 +610,7 @@ void testIQ()
               "Q.display.description string = \"\"\n"
               "Q.display.units string = \"\"\n"
               "Q.display.form.index int32_t = 6\n"
-              "Q.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", \"Exponential\", ...]\n"
+              "Q.display.form.choices string[] = {7}[\"Default\", \"String\", \"Binary\", \"Decimal\", \"Hex\", ...]\n"
               "Q.control.limitLow double = 0\n"
               "Q.control.limitHigh double = 0\n"
               "phas.i double = 1\n"
@@ -625,13 +625,13 @@ void testIQ()
     checkUTAG(val, 2, "I.timeStamp.userTag");
     checkUTAG(val, 2, "Q.timeStamp.userTag");
     {
-        auto expected = "I.value double[] = {500}[0.0348995, 0.0975829, 0.159881, 0.221548, 0.282341, 0.34202, ...]\n"
+        auto expected = "I.value double[] = {500}[0.0348995, 0.0975829, 0.159881, 0.221548, 0.282341, ...]\n"
                         "I.alarm.severity int32_t = 0\n"
                         "I.alarm.status int32_t = 0\n"
                         "I.alarm.message string = \"\"\n"
                         "I.timeStamp.secondsPastEpoch int64_t = 643497682\n"
                         "I.timeStamp.nanoseconds int32_t = 102030\n"
-                        "Q.value double[] = {500}[0.0348995, 0.0975829, 0.159881, 0.221548, 0.282341, 0.34202, ...]\n"
+                        "Q.value double[] = {500}[0.0348995, 0.0975829, 0.159881, 0.221548, 0.282341, ...]\n"
 #if EPICS_VERSION_INT < VERSION_INT(7, 0, 6, 0)
                         "Q.alarm.severity int32_t = 0\n"
                         "Q.alarm.status int32_t = 0\n"
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 5fb606d..b1a5a27 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -572,8 +572,8 @@ void testFormat()
         "        union choice.one int32_t = 1024\n"
         "    } scalar\n"
         "    struct {\n"
-        "        int32_t[] i32 = {4}[1, -1, ...]\n"
-        "        string[] s = {3}[\"one\", \"two\", ...]\n"
+        "        int32_t[] i32 = {4}[1, ...]\n"
+        "        string[] s = {3}[\"one\", ...]\n"
         "        any[] wildcard = {2}[\n"
         "            string = \"simple\"\n"
         "            ...\n"