Expand format_args! - Handle trailing commas

1 files changed, 6 insertions, 0 deletions

diff --git a/src/expand/format_args.cpp b/src/expand/format_args.cpp
index 5d9940bc..9696a586 100644
--- a/src/expand/format_args.cpp
+++ b/src/expand/format_args.cpp
@@ -408,6 +408,11 @@ class CFormatArgsExpander:
         // - Parse the arguments
         while( GET_TOK(tok, lex) == TOK_COMMA )
         {
+            if( lex.lookahead(0) == TOK_EOF ) {
+                GET_TOK(tok, lex);
+                break;
+            }
+            
             // - Named parameters
             if( lex.lookahead(0) == TOK_IDENT && lex.lookahead(1) == TOK_EQUAL )
             {
@@ -431,6 +436,7 @@ class CFormatArgsExpander:
                 free_args.push_back( mv$(expr_tt) );
             }
         }
+        CHECK_TOK(tok, TOK_EOF);
         
         // - Parse the format string
         ::std::vector< FmtFrag> fragments;