Fix C++-generating back end issue with dependent multi-dimensional subscripts [GH #195]

Author: wchilders-nvidia

src/Changes

@@ -1,5 +1,19 @@
 Version 7.1
 
+10/1/26  [GH #195]
+C++-generating back end: dependent multi-dimensional subscripts
+
+In cases in which template definitions are generated from the prototype
+instantiation IL, when a dependent multi-dimensional subscript operation
+appears in a template definition, the C++-generating back end previously
+emitted only the first subscript.  This is now fixed.  For example, with
+--c++23:
+
+  template<typename T> auto f(const T &t) {
+    return t[1, 2];   // Previously generated as "t[1]"
+  }
+
+
 10/1/26  [GH #191]
 C++-generating back end: inaccessible or out-of-scope template arguments
 

src/cp_gen_be.c

@@ -15281,16 +15281,26 @@ it is a tpck_unknown_function constant and to NULL otherwise.
 }  /* is_dot_static_operation */
 
 
-static void gen_array_subscript(an_expr_node_ptr  expr)
+static void gen_array_subscript_list(an_expr_node_ptr expr)
 /*
-Render the given expression surrounded by brackets.
+Put out the given expression list surrounded by square brackets.
 */
 {
+  a_boolean first = TRUE;
+
   write_tok_ch('[');
-  gen_expr(expr, /*need_parens=*/expr_has_comma_operation(expr),
-           /*obj_expr_of_mfunc_operator=*/FALSE);
+  while (expr != NULL) {
+    if (first) {
+      first = FALSE;
+    } else {
+      write_tok_str(", ");
+    }  /* if */
+    gen_expr(expr, /*need_parens=*/expr_has_comma_operation(expr),
+             /*obj_expr_of_mfunc_operator=*/FALSE);
+    expr = expr->next;
+  }  /* if */
   write_tok_ch(']');
-}  /* gen_array_subscript */
+}  /* gen_array_subscript_list */
 
 
 static void gen_va_arg(an_expr_node_ptr expr)
@@ -17878,7 +17888,7 @@ handled through recursion.
       break;
     case eok_subscript:
       gen_member_selector_for_builtin_offsetof(arg1);
-      gen_array_subscript(arg2);
+      gen_array_subscript_list(arg2);
       break;
     case eok_cast:
     case eok_base_class_cast:
@@ -19271,7 +19281,7 @@ gen_expr that might end up generating this expr as a temporary.
                    parens_may_be_needed(generated_precedence[eok_subscript],
                                         operand_1),
                    /*obj_expr_of_mfunc_operator=*/FALSE);
-          gen_array_subscript(operand_2);
+          gen_array_subscript_list(operand_2);
           goto done_with_operation;
         case eok_cli_subscript:
           gen_expr_with_parens(operand_1);

tests/tests/regressions/.gh-195.rto/default.1.1.txt

@@ -0,0 +1 @@
+cpfe -DTEST_NUMBER=1 --c++23 Test_name.c

tests/tests/regressions/gh-195.sft.cpp

@@ -0,0 +1,9 @@
+//options_all:--c++23
+//type:cp
+template<typename T> auto f(const T &t) {
+  return t[1, 2];   // Previously generated as "t[1]"
+}
+struct S {
+  int operator[](int, int) const;
+} s;
+int i = f(s);