Merge branch 'next'

[i3/i3] / generate-command-parser.pl

diff --git a/generate-command-parser.pl b/generate-command-parser.pl
index f69f715e569594f479d1458493f5d935cbaebfcf..5cdebf343c9dcb9794fd2c8e7930435ca3fc6dc7 100755 (executable)
--- a/generate-command-parser.pl
+++ b/generate-command-parser.pl
@@ -158,7 +158,6 @@ for my $state (@keys) {
         $fmt =~ s/$_/%d/g for @keys;
         $fmt =~ s/\$([a-z_]+)/%s/g;
         $fmt =~ s/\&([a-z_]+)/%ld/g;
-        $fmt =~ s/NULL/%s/g;
         $fmt =~ s/"([a-z0-9_]+)"/%s/g;
         $fmt =~ s/(?:-?|\b)[0-9]+\b/%d/g;
 
@@ -177,6 +176,7 @@ for my $state (@keys) {
         $cmd =~ s/[^(]+\(//;
         $cmd =~ s/\)$//;
         $cmd = ", $cmd" if length($cmd) > 0;
+        $cmd =~ s/, NULL//g;
         say $callfh qq|           fprintf(stderr, "$fmt\\n"$cmd);|;
         # The cfg_criteria functions have side-effects which are important for
         # testing. They are implemented as stubs in the test parser code.
@@ -193,7 +193,6 @@ say $callfh '        default:';
 say $callfh '            printf("BUG in the parser. state = %d\n", call_identifier);';
 say $callfh '            assert(false);';
 say $callfh '    }';
-say $callfh '    state = result->next_state;';
 say $callfh '}';
 close($callfh);