[#2084] Report the comma

5 files changed, 124 insertions, 124 deletions

diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy
index e877175d96..fd4aaf96d7 100644
--- a/src/bin/agent/agent_parser.yy
+++ b/src/bin/agent/agent_parser.yy
@@ -195,7 +195,7 @@ not_empty_map: STRING COLON value {
                   ctx.stack_.back()->set($3, $5);
                   }
              | not_empty_map COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -218,7 +218,7 @@ not_empty_list: value {
                   ctx.stack_.back()->add($3);
                   }
               | not_empty_list COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -269,13 +269,13 @@ global_object: CONTROL_AGENT {
              ;
 
 global_object_comma: global_object COMMA {
-    ctx.warnAboutExtraCommas(@1);
+    ctx.warnAboutExtraCommas(@2);
 };
 
 global_params: global_param
              | global_params COMMA global_param
              | global_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -415,7 +415,7 @@ hooks_libraries_list: %empty
 not_empty_hooks_libraries_list: hooks_library
     | not_empty_hooks_libraries_list COMMA hooks_library
     | not_empty_hooks_libraries_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -430,7 +430,7 @@ hooks_library: LCURLY_BRACKET {
 hooks_params: hooks_param
             | hooks_params COMMA hooks_param
             | hooks_params COMMA {
-                ctx.warnAboutExtraCommas(@1);
+                ctx.warnAboutExtraCommas(@2);
                 }
             | unknown_map_entry
             ;
@@ -476,7 +476,7 @@ control_sockets: CONTROL_SOCKETS COLON LCURLY_BRACKET {
 control_sockets_params: control_socket
                       | control_sockets_params COMMA control_socket
                       | control_sockets_params COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -528,7 +528,7 @@ d2_server_socket: D2_SERVER {
 control_socket_params: control_socket_param
                      | control_socket_params COMMA control_socket_param
                      | control_socket_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -583,7 +583,7 @@ authentication: AUTHENTICATION {
 auth_params: auth_param
            | auth_params COMMA auth_param
            | auth_params COMMA {
-               ctx.warnAboutExtraCommas(@1);
+               ctx.warnAboutExtraCommas(@2);
                }
            ;
 
@@ -633,7 +633,7 @@ clients_list: %empty
 not_empty_clients_list: basic_auth
                       | not_empty_clients_list COMMA basic_auth
                       | not_empty_clients_list COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -648,7 +648,7 @@ basic_auth: LCURLY_BRACKET {
 clients_params: clients_param
               | clients_params COMMA clients_param
               | clients_params COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -697,7 +697,7 @@ loggers: LOGGERS {
 loggers_entries: logger_entry
                | loggers_entries COMMA logger_entry
                | loggers_entries COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -713,7 +713,7 @@ logger_entry: LCURLY_BRACKET {
 logger_params: logger_param
              | logger_params COMMA logger_param
              | logger_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -764,7 +764,7 @@ output_options_list: OUTPUT_OPTIONS {
 output_options_list_content: output_entry
                            | output_options_list_content COMMA output_entry
                            | output_options_list_content COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -779,7 +779,7 @@ output_entry: LCURLY_BRACKET {
 output_params_list: output_params
              | output_params_list COMMA output_params
              | output_params_list COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy
index 1062b24e88..ddee8c1478 100644
--- a/src/bin/d2/d2_parser.yy
+++ b/src/bin/d2/d2_parser.yy
@@ -183,7 +183,7 @@ not_empty_map: STRING COLON value {
                   ctx.stack_.back()->set($3, $5);
                   }
              | not_empty_map COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
              ;
 
@@ -207,7 +207,7 @@ not_empty_list: value {
                   ctx.stack_.back()->add($3);
                   }
               | not_empty_list COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -252,7 +252,7 @@ global_object: DHCPDDNS {
              ;
 
 global_object_comma: global_object COMMA {
-    ctx.warnAboutExtraCommas(@1);
+    ctx.warnAboutExtraCommas(@2);
 };
 
 sub_dhcpddns: LCURLY_BRACKET {
@@ -266,7 +266,7 @@ sub_dhcpddns: LCURLY_BRACKET {
 dhcpddns_params: dhcpddns_param
                | dhcpddns_params COMMA dhcpddns_param
                | dhcpddns_params COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -418,7 +418,7 @@ ddns_mgr_params: %empty
 not_empty_ddns_mgr_params: ddns_mgr_param
                          | ddns_mgr_params COMMA ddns_mgr_param
                          | ddns_mgr_params COMMA {
-                             ctx.warnAboutExtraCommas(@1);
+                             ctx.warnAboutExtraCommas(@2);
                              }
                          ;
 
@@ -453,7 +453,7 @@ ddns_domain_list: %empty
 not_empty_ddns_domain_list: ddns_domain
                         | not_empty_ddns_domain_list COMMA ddns_domain
                         | not_empty_ddns_domain_list COMMA {
-                            ctx.warnAboutExtraCommas(@1);
+                            ctx.warnAboutExtraCommas(@2);
                             }
                         ;
 
@@ -475,7 +475,7 @@ sub_ddns_domain: LCURLY_BRACKET {
 ddns_domain_params: ddns_domain_param
                   | ddns_domain_params COMMA ddns_domain_param
                   | ddns_domain_params COMMA {
-                      ctx.warnAboutExtraCommas(@1);
+                      ctx.warnAboutExtraCommas(@2);
                       }
                   ;
 
@@ -535,7 +535,7 @@ sub_dns_servers: LSQUARE_BRACKET {
 dns_server_list: dns_server
                | dns_server_list COMMA dns_server
                | dns_server_list COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -557,7 +557,7 @@ sub_dns_server: LCURLY_BRACKET {
 dns_server_params: dns_server_param
                | dns_server_params COMMA dns_server_param
                | dns_server_params COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -632,7 +632,7 @@ tsig_keys_list: %empty
 not_empty_tsig_keys_list: tsig_key
                         | not_empty_tsig_keys_list COMMA tsig_key
                         | not_empty_tsig_keys_list COMMA {
-                            ctx.warnAboutExtraCommas(@1);
+                            ctx.warnAboutExtraCommas(@2);
                             }
                         ;
 
@@ -656,7 +656,7 @@ sub_tsig_key: LCURLY_BRACKET {
 tsig_key_params: tsig_key_param
                | tsig_key_params COMMA tsig_key_param
                | tsig_key_params COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -734,7 +734,7 @@ control_socket: CONTROL_SOCKET {
 control_socket_params: control_socket_param
                      | control_socket_params COMMA control_socket_param
                      | control_socket_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -783,7 +783,7 @@ hooks_libraries_list: %empty
 not_empty_hooks_libraries_list: hooks_library
     | not_empty_hooks_libraries_list COMMA hooks_library
     | not_empty_hooks_libraries_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -810,7 +810,7 @@ sub_hooks_library: LCURLY_BRACKET {
 hooks_params: hooks_param
             | hooks_params COMMA hooks_param
             | hooks_params COMMA {
-                ctx.warnAboutExtraCommas(@1);
+                ctx.warnAboutExtraCommas(@2);
                 }
             | unknown_map_entry
             ;
@@ -854,7 +854,7 @@ loggers: LOGGERS {
 loggers_entries: logger_entry
                | loggers_entries COMMA logger_entry
                | loggers_entries COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -870,7 +870,7 @@ logger_entry: LCURLY_BRACKET {
 logger_params: logger_param
              | logger_params COMMA logger_param
              | logger_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -921,7 +921,7 @@ output_options_list: OUTPUT_OPTIONS {
 output_options_list_content: output_entry
                            | output_options_list_content COMMA output_entry
                            | output_options_list_content COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -936,7 +936,7 @@ output_entry: LCURLY_BRACKET {
 output_params_list: output_params
              | output_params_list COMMA output_params
              | output_params_list COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index c58741e937..8e6082f4cb 100644
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -355,7 +355,7 @@ not_empty_map: STRING COLON value {
                   ctx.stack_.back()->set($3, $5);
                   }
              | not_empty_map COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -379,7 +379,7 @@ not_empty_list: value {
                   ctx.stack_.back()->add($3);
                   }
               | not_empty_list COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -404,7 +404,7 @@ not_empty_list_strings: STRING {
                           ctx.stack_.back()->add(s);
                           }
                       | not_empty_list_strings COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -455,7 +455,7 @@ global_object: DHCP4 {
              ;
 
 global_object_comma: global_object COMMA {
-    ctx.warnAboutExtraCommas(@1);
+    ctx.warnAboutExtraCommas(@2);
 };
 
 // subparser: similar to the corresponding rule but without parent
@@ -472,7 +472,7 @@ sub_dhcp4: LCURLY_BRACKET {
 global_params: global_param
              | global_params COMMA global_param
              | global_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -773,7 +773,7 @@ interfaces_config: INTERFACES_CONFIG {
 interfaces_config_params: interfaces_config_param
                         | interfaces_config_params COMMA interfaces_config_param
                         | interfaces_config_params COMMA {
-                            ctx.warnAboutExtraCommas(@1);
+                            ctx.warnAboutExtraCommas(@2);
                             }
                         ;
 
@@ -866,7 +866,7 @@ sanity_checks: SANITY_CHECKS {
 sanity_checks_params: sanity_checks_param
                     | sanity_checks_params COMMA sanity_checks_param
                     | sanity_checks_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -922,7 +922,7 @@ database_list: %empty
 not_empty_database_list: database
                        | not_empty_database_list COMMA database
                        | not_empty_database_list COMMA {
-                           ctx.warnAboutExtraCommas(@1);
+                           ctx.warnAboutExtraCommas(@2);
                            }
                        ;
 
@@ -939,7 +939,7 @@ database: LCURLY_BRACKET {
 database_map_params: database_map_param
                    | database_map_params COMMA database_map_param
                    | database_map_params COMMA {
-                       ctx.warnAboutExtraCommas(@1);
+                       ctx.warnAboutExtraCommas(@2);
                        }
                    ;
 
@@ -1147,7 +1147,7 @@ host_reservation_identifiers: HOST_RESERVATION_IDENTIFIERS {
 host_reservation_identifiers_list: host_reservation_identifier
     | host_reservation_identifiers_list COMMA host_reservation_identifier
     | host_reservation_identifiers_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1201,7 +1201,7 @@ dhcp_multi_threading: DHCP_MULTI_THREADING {
 multi_threading_params: multi_threading_param
                       | multi_threading_params COMMA multi_threading_param
                       | multi_threading_params COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -1249,7 +1249,7 @@ hooks_libraries_list: %empty
 not_empty_hooks_libraries_list: hooks_library
     | not_empty_hooks_libraries_list COMMA hooks_library
     | not_empty_hooks_libraries_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1276,7 +1276,7 @@ sub_hooks_library: LCURLY_BRACKET {
 hooks_params: hooks_param
             | hooks_params COMMA hooks_param
             | hooks_params COMMA {
-                ctx.warnAboutExtraCommas(@1);
+                ctx.warnAboutExtraCommas(@2);
                 }
             | unknown_map_entry
             ;
@@ -1318,7 +1318,7 @@ expired_leases_processing: EXPIRED_LEASES_PROCESSING {
 expired_leases_params: expired_leases_param
                      | expired_leases_params COMMA expired_leases_param
                      | expired_leases_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -1390,7 +1390,7 @@ subnet4_list_content: %empty
 not_empty_subnet4_list: subnet4
                       | not_empty_subnet4_list COMMA subnet4
                       | not_empty_subnet4_list COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -1438,7 +1438,7 @@ sub_subnet4: LCURLY_BRACKET {
 subnet4_params: subnet4_param
               | subnet4_params COMMA subnet4_param
               | subnet4_params COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -1615,7 +1615,7 @@ shared_networks_content: %empty
 shared_networks_list: shared_network
                     | shared_networks_list COMMA shared_network
                     | shared_networks_list COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -1630,7 +1630,7 @@ shared_network: LCURLY_BRACKET {
 shared_network_params: shared_network_param
                      | shared_network_params COMMA shared_network_param
                      | shared_network_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -1710,7 +1710,7 @@ option_def_list_content: %empty
 not_empty_option_def_list: option_def_entry
                          | not_empty_option_def_list COMMA option_def_entry
                          | not_empty_option_def_list COMMA {
-                             ctx.warnAboutExtraCommas(@1);
+                             ctx.warnAboutExtraCommas(@2);
                              }
                          ;
 
@@ -1752,7 +1752,7 @@ option_def_params: %empty
 not_empty_option_def_params: option_def_param
                            | not_empty_option_def_params COMMA option_def_param
                            | not_empty_option_def_params COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -1848,7 +1848,7 @@ option_data_list_content: %empty
 not_empty_option_data_list: option_data_entry
                           | not_empty_option_data_list COMMA option_data_entry
                           | not_empty_option_data_list COMMA {
-                              ctx.warnAboutExtraCommas(@1);
+                              ctx.warnAboutExtraCommas(@2);
                               }
                           ;
 
@@ -1887,7 +1887,7 @@ option_data_params: %empty
 not_empty_option_data_params: option_data_param
     | not_empty_option_data_params COMMA option_data_param
     | not_empty_option_data_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1954,7 +1954,7 @@ pools_list_content: %empty
 not_empty_pools_list: pool_list_entry
                     | not_empty_pools_list COMMA pool_list_entry
                     | not_empty_pools_list COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -1981,7 +1981,7 @@ sub_pool4: LCURLY_BRACKET {
 pool_params: pool_param
            | pool_params COMMA pool_param
            | pool_params COMMA {
-               ctx.warnAboutExtraCommas(@1);
+               ctx.warnAboutExtraCommas(@2);
                }
            ;
 
@@ -2076,7 +2076,7 @@ reservations_list: %empty
 not_empty_reservations_list: reservation
                            | not_empty_reservations_list COMMA reservation
                            | not_empty_reservations_list COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -2105,7 +2105,7 @@ reservation_params: %empty
 not_empty_reservation_params: reservation_param
     | not_empty_reservation_params COMMA reservation_param
     | not_empty_reservation_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -2274,7 +2274,7 @@ client_classes: CLIENT_CLASSES {
 client_classes_list: client_class_entry
                    | client_classes_list COMMA client_class_entry
                    | client_classes_list COMMA {
-                       ctx.warnAboutExtraCommas(@1);
+                       ctx.warnAboutExtraCommas(@2);
                        }
                    ;
 
@@ -2295,7 +2295,7 @@ client_class_params: %empty
 not_empty_client_class_params: client_class_param
     | not_empty_client_class_params COMMA client_class_param
     | not_empty_client_class_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -2356,7 +2356,7 @@ control_socket: CONTROL_SOCKET {
 control_socket_params: control_socket_param
                      | control_socket_params COMMA control_socket_param
                      | control_socket_params COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                      ;
 
@@ -2404,7 +2404,7 @@ dhcp_queue_control: DHCP_QUEUE_CONTROL {
 queue_control_params: queue_control_param
                     | queue_control_params COMMA queue_control_param
                     | queue_control_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -2473,7 +2473,7 @@ sub_dhcp_ddns: LCURLY_BRACKET {
 dhcp_ddns_params: dhcp_ddns_param
                 | dhcp_ddns_params COMMA dhcp_ddns_param
                 | dhcp_ddns_params COMMA {
-                    ctx.warnAboutExtraCommas(@1);
+                    ctx.warnAboutExtraCommas(@2);
                     }
                 ;
 
@@ -2652,7 +2652,7 @@ sub_config_control: LCURLY_BRACKET {
 config_control_params: config_control_param
                      | config_control_params COMMA config_control_param
                      | config_control_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -2696,7 +2696,7 @@ loggers: LOGGERS {
 loggers_entries: logger_entry
                | loggers_entries COMMA logger_entry
                | loggers_entries COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -2712,7 +2712,7 @@ logger_entry: LCURLY_BRACKET {
 logger_params: logger_param
              | logger_params COMMA logger_param
              | logger_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -2754,7 +2754,7 @@ output_options_list: OUTPUT_OPTIONS {
 output_options_list_content: output_entry
                            | output_options_list_content COMMA output_entry
                            | output_options_list_content COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -2769,7 +2769,7 @@ output_entry: LCURLY_BRACKET {
 output_params_list: output_params
                   | output_params_list COMMA output_params
                   | output_params_list COMMA {
-                      ctx.warnAboutExtraCommas(@1);
+                      ctx.warnAboutExtraCommas(@2);
                       }
                   ;
 
@@ -2830,7 +2830,7 @@ compatibility: COMPATIBILITY {
 compatibility_params: compatibility_param
                     | compatibility_params COMMA compatibility_param
                     | compatibility_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 4050f8b749..77a7770ad7 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -363,7 +363,7 @@ not_empty_map: STRING COLON value {
                   ctx.stack_.back()->set($3, $5);
                   }
              | not_empty_map COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -387,7 +387,7 @@ not_empty_list: value {
                   ctx.stack_.back()->add($3);
                   }
               | not_empty_list COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -412,7 +412,7 @@ not_empty_list_strings: STRING {
                           ctx.stack_.back()->add(s);
                           }
                       | not_empty_list_strings COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -463,7 +463,7 @@ global_object: DHCP6 {
              ;
 
 global_object_comma: global_object COMMA {
-    ctx.warnAboutExtraCommas(@1);
+    ctx.warnAboutExtraCommas(@2);
 };
 
 // subparser: similar to the corresponding rule but without parent
@@ -480,7 +480,7 @@ sub_dhcp6: LCURLY_BRACKET {
 global_params: global_param
              | global_params COMMA global_param
              | global_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -800,7 +800,7 @@ sub_interfaces6: LCURLY_BRACKET {
 interfaces_config_params: interfaces_config_param
                         | interfaces_config_params COMMA interfaces_config_param
                         | interfaces_config_params COMMA {
-                            ctx.warnAboutExtraCommas(@1);
+                            ctx.warnAboutExtraCommas(@2);
                             }
                         ;
 
@@ -872,7 +872,7 @@ database_list: %empty
 not_empty_database_list: database
                        | not_empty_database_list COMMA database
                        | not_empty_database_list COMMA {
-                           ctx.warnAboutExtraCommas(@1);
+                           ctx.warnAboutExtraCommas(@2);
                            }
                        ;
 
@@ -889,7 +889,7 @@ database: LCURLY_BRACKET {
 database_map_params: database_map_param
                    | database_map_params COMMA database_map_param
                    | database_map_params COMMA {
-                       ctx.warnAboutExtraCommas(@1);
+                       ctx.warnAboutExtraCommas(@2);
                        }
                    ;
 
@@ -1096,7 +1096,7 @@ sanity_checks: SANITY_CHECKS {
 sanity_checks_params: sanity_checks_param
                     | sanity_checks_params COMMA sanity_checks_param
                     | sanity_checks_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -1135,7 +1135,7 @@ mac_sources: MAC_SOURCES {
 mac_sources_list: mac_sources_value
                 | mac_sources_list COMMA mac_sources_value
                 | mac_sources_list COMMA {
-                    ctx.warnAboutExtraCommas(@1);
+                    ctx.warnAboutExtraCommas(@2);
                     }
                 ;
 
@@ -1167,7 +1167,7 @@ host_reservation_identifiers: HOST_RESERVATION_IDENTIFIERS {
 host_reservation_identifiers_list: host_reservation_identifier
     | host_reservation_identifiers_list COMMA host_reservation_identifier
     | host_reservation_identifiers_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1217,7 +1217,7 @@ dhcp_multi_threading: DHCP_MULTI_THREADING {
 multi_threading_params: multi_threading_param
                       | multi_threading_params COMMA multi_threading_param
                       | multi_threading_params COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -1265,7 +1265,7 @@ hooks_libraries_list: %empty
 not_empty_hooks_libraries_list: hooks_library
     | not_empty_hooks_libraries_list COMMA hooks_library
     | not_empty_hooks_libraries_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1292,7 +1292,7 @@ sub_hooks_library: LCURLY_BRACKET {
 hooks_params: hooks_param
             | hooks_params COMMA hooks_param
             | hooks_params COMMA {
-                ctx.warnAboutExtraCommas(@1);
+                ctx.warnAboutExtraCommas(@2);
                 }
             | unknown_map_entry
             ;
@@ -1334,7 +1334,7 @@ expired_leases_processing: EXPIRED_LEASES_PROCESSING {
 expired_leases_params: expired_leases_param
                      | expired_leases_params COMMA expired_leases_param
                      | expired_leases_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -1406,7 +1406,7 @@ subnet6_list_content: %empty
 not_empty_subnet6_list: subnet6
                       | not_empty_subnet6_list COMMA subnet6
                       | not_empty_subnet6_list COMMA {
-                          ctx.warnAboutExtraCommas(@1);
+                          ctx.warnAboutExtraCommas(@2);
                           }
                       ;
 
@@ -1454,7 +1454,7 @@ sub_subnet6: LCURLY_BRACKET {
 subnet6_params: subnet6_param
               | subnet6_params COMMA subnet6_param
               | subnet6_params COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -1617,7 +1617,7 @@ shared_networks_content: %empty
 shared_networks_list: shared_network
                     | shared_networks_list COMMA shared_network
                     | shared_networks_list COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -1632,7 +1632,7 @@ shared_network: LCURLY_BRACKET {
 shared_network_params: shared_network_param
                      | shared_network_params COMMA shared_network_param
                      | shared_network_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -1712,7 +1712,7 @@ option_def_list_content: %empty
 not_empty_option_def_list: option_def_entry
                          | not_empty_option_def_list COMMA option_def_entry
                          | not_empty_option_def_list COMMA {
-                             ctx.warnAboutExtraCommas(@1);
+                             ctx.warnAboutExtraCommas(@2);
                              }
                          ;
 
@@ -1754,7 +1754,7 @@ option_def_params: %empty
 not_empty_option_def_params: option_def_param
                            | not_empty_option_def_params COMMA option_def_param
                            | not_empty_option_def_params COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -1850,7 +1850,7 @@ option_data_list_content: %empty
 not_empty_option_data_list: option_data_entry
                           | not_empty_option_data_list COMMA option_data_entry
                           | not_empty_option_data_list COMMA {
-                              ctx.warnAboutExtraCommas(@1);
+                              ctx.warnAboutExtraCommas(@2);
                               }
                           ;
 
@@ -1889,7 +1889,7 @@ option_data_params: %empty
 not_empty_option_data_params: option_data_param
     | not_empty_option_data_params COMMA option_data_param
     | not_empty_option_data_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -1956,7 +1956,7 @@ pools_list_content: %empty
 not_empty_pools_list: pool_list_entry
                     | not_empty_pools_list COMMA pool_list_entry
                     | not_empty_pools_list COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -1983,7 +1983,7 @@ sub_pool6: LCURLY_BRACKET {
 pool_params: pool_param
            | pool_params COMMA pool_param
            | pool_params COMMA {
-               ctx.warnAboutExtraCommas(@1);
+               ctx.warnAboutExtraCommas(@2);
                }
            ;
 
@@ -2080,7 +2080,7 @@ pd_pools_list_content: %empty
 not_empty_pd_pools_list: pd_pool_entry
                        | not_empty_pd_pools_list COMMA pd_pool_entry
                        | not_empty_pd_pools_list COMMA {
-                           ctx.warnAboutExtraCommas(@1);
+                           ctx.warnAboutExtraCommas(@2);
                            }
                        ;
 
@@ -2111,7 +2111,7 @@ sub_pd_pool: LCURLY_BRACKET {
 pd_pool_params: pd_pool_param
               | pd_pool_params COMMA pd_pool_param
               | pd_pool_params COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -2185,7 +2185,7 @@ reservations_list: %empty
 not_empty_reservations_list: reservation
                            | not_empty_reservations_list COMMA reservation
                            | not_empty_reservations_list COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -2214,7 +2214,7 @@ reservation_params: %empty
 not_empty_reservation_params: reservation_param
     | not_empty_reservation_params COMMA reservation_param
     | not_empty_reservation_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -2345,7 +2345,7 @@ client_classes: CLIENT_CLASSES {
 client_classes_list: client_class_entry
                    | client_classes_list COMMA client_class_entry
                    | client_classes_list COMMA {
-                       ctx.warnAboutExtraCommas(@1);
+                       ctx.warnAboutExtraCommas(@2);
                        }
                    ;
 
@@ -2366,7 +2366,7 @@ client_class_params: %empty
 not_empty_client_class_params: client_class_param
     | not_empty_client_class_params COMMA client_class_param
     | not_empty_client_class_params COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -2421,7 +2421,7 @@ server_id: SERVER_ID {
 server_id_params: server_id_param
                 | server_id_params COMMA server_id_param
                 | server_id_params COMMA {
-                    ctx.warnAboutExtraCommas(@1);
+                    ctx.warnAboutExtraCommas(@2);
                     }
                 ;
 
@@ -2500,7 +2500,7 @@ control_socket: CONTROL_SOCKET {
 control_socket_params: control_socket_param
                      | control_socket_params COMMA control_socket_param
                      | control_socket_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -2548,7 +2548,7 @@ dhcp_queue_control: DHCP_QUEUE_CONTROL {
 queue_control_params: queue_control_param
                     | queue_control_params COMMA queue_control_param
                     | queue_control_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
@@ -2617,7 +2617,7 @@ sub_dhcp_ddns: LCURLY_BRACKET {
 dhcp_ddns_params: dhcp_ddns_param
                 | dhcp_ddns_params COMMA dhcp_ddns_param
                 | dhcp_ddns_params COMMA {
-                    ctx.warnAboutExtraCommas(@1);
+                    ctx.warnAboutExtraCommas(@2);
                     }
                 ;
 
@@ -2796,7 +2796,7 @@ sub_config_control: LCURLY_BRACKET {
 config_control_params: config_control_param
                      | config_control_params COMMA config_control_param
                      | config_control_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -2840,7 +2840,7 @@ loggers: LOGGERS {
 loggers_entries: logger_entry
                | loggers_entries COMMA logger_entry
                | loggers_entries COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -2856,7 +2856,7 @@ logger_entry: LCURLY_BRACKET {
 logger_params: logger_param
              | logger_params COMMA logger_param
              | logger_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -2898,7 +2898,7 @@ output_options_list: OUTPUT_OPTIONS {
 output_options_list_content: output_entry
                            | output_options_list_content COMMA output_entry
                            | output_options_list_content COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -2913,7 +2913,7 @@ output_entry: LCURLY_BRACKET {
 output_params_list: output_params
                   | output_params_list COMMA output_params
                   | output_params_list COMMA {
-                      ctx.warnAboutExtraCommas(@1);
+                      ctx.warnAboutExtraCommas(@2);
                       }
                   ;
 
@@ -2974,7 +2974,7 @@ compatibility: COMPATIBILITY {
 compatibility_params: compatibility_param
                     | compatibility_params COMMA compatibility_param
                     | compatibility_params COMMA {
-                        ctx.warnAboutExtraCommas(@1);
+                        ctx.warnAboutExtraCommas(@2);
                         }
                     ;
 
diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy
index 81daa9406d..10048dea84 100644
--- a/src/bin/netconf/netconf_parser.yy
+++ b/src/bin/netconf/netconf_parser.yy
@@ -189,7 +189,7 @@ not_empty_map: STRING COLON value {
                   ctx.stack_.back()->set($3, $5);
                   }
              | not_empty_map COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -212,7 +212,7 @@ not_empty_list: value {
                   ctx.stack_.back()->add($3);
                   }
               | not_empty_list COMMA {
-                  ctx.warnAboutExtraCommas(@1);
+                  ctx.warnAboutExtraCommas(@2);
                   }
               ;
 
@@ -265,7 +265,7 @@ global_object: NETCONF {
              ;
 
 global_object_comma: global_object COMMA {
-    ctx.warnAboutExtraCommas(@1);
+    ctx.warnAboutExtraCommas(@2);
 };
 
 
@@ -276,7 +276,7 @@ global_params: %empty
 not_empty_global_params: global_param
                        | not_empty_global_params COMMA global_param
                        | not_empty_global_params COMMA {
-                           ctx.warnAboutExtraCommas(@1);
+                           ctx.warnAboutExtraCommas(@2);
                            }
                        ;
 
@@ -382,7 +382,7 @@ hooks_libraries_list: %empty
 not_empty_hooks_libraries_list: hooks_library
     | not_empty_hooks_libraries_list COMMA hooks_library
     | not_empty_hooks_libraries_list COMMA {
-        ctx.warnAboutExtraCommas(@1);
+        ctx.warnAboutExtraCommas(@2);
         }
     ;
 
@@ -397,7 +397,7 @@ hooks_library: LCURLY_BRACKET {
 hooks_params: hooks_param
             | hooks_params COMMA hooks_param
             | hooks_params COMMA {
-              ctx.warnAboutExtraCommas(@1);
+              ctx.warnAboutExtraCommas(@2);
               }
             | unknown_map_entry
             ;
@@ -444,7 +444,7 @@ servers_entries: %empty
 not_empty_servers_entries: server_entry
                          | not_empty_servers_entries COMMA server_entry
                          | not_empty_servers_entries COMMA {
-                             ctx.warnAboutExtraCommas(@1);
+                             ctx.warnAboutExtraCommas(@2);
                              }
                          ;
 
@@ -510,7 +510,7 @@ ca_server: CA_SERVER {
 managed_server_params: managed_server_param
                      | managed_server_params COMMA managed_server_param
                      | managed_server_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -551,7 +551,7 @@ control_socket: CONTROL_SOCKET {
 control_socket_params: control_socket_param
                      | control_socket_params COMMA control_socket_param
                      | control_socket_params COMMA {
-                         ctx.warnAboutExtraCommas(@1);
+                         ctx.warnAboutExtraCommas(@2);
                          }
                      ;
 
@@ -616,7 +616,7 @@ loggers: LOGGERS {
 loggers_entries: logger_entry
                | loggers_entries COMMA logger_entry
                | loggers_entries COMMA {
-                   ctx.warnAboutExtraCommas(@1);
+                   ctx.warnAboutExtraCommas(@2);
                    }
                ;
 
@@ -632,7 +632,7 @@ logger_entry: LCURLY_BRACKET {
 logger_params: logger_param
              | logger_params COMMA logger_param
              | logger_params COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;
 
@@ -683,7 +683,7 @@ output_options_list: OUTPUT_OPTIONS {
 output_options_list_content: output_entry
                            | output_options_list_content COMMA output_entry
                            | output_options_list_content COMMA {
-                               ctx.warnAboutExtraCommas(@1);
+                               ctx.warnAboutExtraCommas(@2);
                                }
                            ;
 
@@ -698,7 +698,7 @@ output_entry: LCURLY_BRACKET {
 output_params_list: output_params
              | output_params_list COMMA output_params
              | output_params_list COMMA {
-                 ctx.warnAboutExtraCommas(@1);
+                 ctx.warnAboutExtraCommas(@2);
                  }
              ;