From: Gurusamy Sarathy Date: Thu, 9 Mar 2000 06:39:21 +0000 (+0000) Subject: new xsubpp keywords should be in all caps X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=63385af5313ec91646b850e34176f5ed8b8155f6;p=p5sagit%2Fp5-mst-13.2.git new xsubpp keywords should be in all caps p4raw-id: //depot/perl@5623 --- diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp index 08e7436..96e1bb4 100755 --- a/lib/ExtUtils/xsubpp +++ b/lib/ExtUtils/xsubpp @@ -273,7 +273,7 @@ $END = "!End!\n\n"; # "impossible" keyword (multiple newline) $BLOCK_re= '\s*(' . join('|', qw( REQUIRE BOOT CASE PREINIT INPUT INIT CODE PPCODE OUTPUT CLEANUP ALIAS PROTOTYPES PROTOTYPE VERSIONCHECK INCLUDE - SCOPE INTERFACE INTERFACE_MACRO C_ARGS POST_CALL + SCOPE INTERFACE INTERFACE_MACRO C_ARGS POSTCALL )) . "|$END)\\s*:"; # Input: ($_, @line) == unparsed input. @@ -436,7 +436,7 @@ sub INPUT_handler { $func_args =~ s/\b($var_name)\b/&$1/; } if ($var_init =~ /^[=;]\s*NO_INIT\s*;?\s*$/ - or $in_out{$var_name} and $in_out{$var_name} eq 'outlist' + or $in_out{$var_name} and $in_out{$var_name} eq 'OUTLIST' and $var_init !~ /\S/) { if ($name_printed) { print ";\n"; @@ -522,7 +522,7 @@ EOF sub CLEANUP_handler() { print_section() } sub PREINIT_handler() { print_section() } -sub POST_CALL_handler() { print_section() } +sub POSTCALL_handler() { print_section() } sub INIT_handler() { print_section() } sub GetAliases @@ -1041,10 +1041,10 @@ while (fetch_para()) { next unless length $pre; my $out_type; my $inout_var; - if ($process_inout and s/^(in|in_outlist|outlist)\s+//) { + if ($process_inout and s/^(IN|IN_OUTLIST|OUTLIST)\s+//) { my $type = $1; - $out_type = $type if $type ne 'in'; - $arg =~ s/^(in|in_outlist|outlist)\s+//; + $out_type = $type if $type ne 'IN'; + $arg =~ s/^(IN|IN_OUTLIST|OUTLIST)\s+//; } if (/\W/) { # Has a type push @arg_with_types, $arg; @@ -1052,7 +1052,7 @@ while (fetch_para()) { $arg_types{$name} = $arg; $_ = "$name$default"; } - $out_vars{$_} = 1 if $out_type eq 'outlist'; + $out_vars{$_} = 1 if $out_type eq 'OUTLIST'; push @in_out, $name if $out_type; $in_out{$name} = $out_type if $out_type; } @@ -1063,10 +1063,10 @@ while (fetch_para()) { } else { @args = split(/\s*,\s*/, $orig_args); for (@args) { - if ($process_inout and s/^(in|in_outlist|outlist)\s+//) { + if ($process_inout and s/^(IN|IN_OUTLIST|OUTLIST)\s+//) { my $out_type = $1; - next if $out_type eq 'in'; - $out_vars{$_} = 1 if $out_type eq 'outlist'; + next if $out_type eq 'IN'; + $out_vars{$_} = 1 if $out_type eq 'OUTLIST'; push @in_out, $name; $in_out{$_} = $out_type; } @@ -1278,7 +1278,7 @@ EOF # $wantRETVAL set if 'RETVAL =' autogenerated ($wantRETVAL, $ret_type) = (0, 'void') if $RETVAL_no_return; undef %outargs ; - process_keyword("POST_CALL|OUTPUT|ALIAS|PROTOTYPE"); + process_keyword("POSTCALL|OUTPUT|ALIAS|PROTOTYPE"); # all OUTPUT done, so now push the return value on the stack if ($gotRETVAL && $RETVAL_code) {