} elsif (@i==2 && m/^(\??)([a-z]\w*)\s*(\S.*)/
&& defined $c_entry) {
($opt, $var, $type) = ($1,$2,$3);
- if ($type =~ m/^\w+$/) {
- $xtypeargs='';
- } elsif ($type =~ m/^(\w+)\((.+)\)$/) {
- $type= $1;
- $xtypeargs= $2;
- }
+ ($type, $xtypeargs) = split_type_args($type);
push @{ $tables{$c_table}{$c_entry}{A} },
{ N => $var, T => $type, A => $xtypeargs, O => ($opt eq '?') };
} elsif (@i==2 && m/^\=\>\s*(\S.*)$/ && defined $c_entry) {
- $tables{$c_table}{$c_entry}{R}= $1;
+ ($type, $xtypeargs) = split_type_args($1);
+ $tables{$c_table}{$c_entry}{R}= $type;
+ $tables{$c_table}{$c_entry}{X}= $xtypeargs;
} elsif (@i==0 && m/^Type\s+([^\:]+)\:\s+(\S.*)$/) {
($typename,$ctype)= ($1,$2);
$ctype .= ' @' unless $ctype =~ m/\@/;
- if ($typename =~ m/^\w+$/) {
- $xtypeargs='';
- } elsif ($typename =~ m/^(\w+)\((.+)\)$/) {
- $typename=$1;
- $xtypeargs=$2;
- } else {
- badsyntax($wh,$.,"bad type name/args");
- }
+ ($typename,$xtypeargs) = split_type_args($typename);
$types{$typename}= { C => $ctype, X => $xtypeargs };
} elsif (@i==0 && s/^Init\s+(\w+)\s+(\S.*)//) {
$type_init{$1}= $2;
$decl .= ");\n";
o('h',160, $decl);
- $decl= "Tcl_Obj *ret_$t(Tcl_Interp *ip, ".subst_in_decl('val',$c).");\n";
+ $decl= "Tcl_Obj *ret_$t(Tcl_Interp *ip, ".subst_in_decl('val',$c);
+ $decl .= ", $xta" if length $xta;
+ $decl .= ");\n";
o('h',170, $decl);
}
$n= $arg->{N};
$t= $arg->{T};
$a= $arg->{A};
- push @do_al, make_decl($n, $t, $arg->{A});
- $pa_vars .= make_decl_init("a_$n", $t, $a, \$pa_init);
+ push @do_al, make_decl($n, $t, $arg->{A},
+ "table $c_table entry $c_entry arg $n");
+ $pa_vars .= make_decl_init("a_$n", $t, $a, \$pa_init, "pa_vars");
if ($arg->{O}) {
$pa_hint .= " ?$n?";
if ($any_mand) {
}
if (exists $r_entry->{R}) {
$t= $r_entry->{R};
- push @do_al, make_decl("*result", $t);
- $pa_vars .= make_decl_init("result", $t, '', \$pa_init);
+ $xta= $r_entry->{X};
+ push @do_al, make_decl("*result", $t, "do_al result");
+ $pa_vars .= make_decl_init("result", $t, $xta, \$pa_init,
+ "pa_vars result");
push @do_aa, "&result";
- $pa_rslt .= " Tcl_SetObjResult(ip, ret_$t(ip, result));\n";
+ $pa_rslt .= " Tcl_SetObjResult(ip, ret_$t(ip, result";
+ $pa_rslt .= ", $xta" if length $xta;
+ $pa_rslt .= "));\n";
}
$pa_body .= "\n";
$pa_body .= " rc= do_${c_table}_${c_entry_c}(";
$pa_vars .= " const char *e;\n";
$pa_fini .= "\n";
$pa_fini .= "e_err:\n";
- $pa_fini .= " setstringresult(ip,e);";
+ $pa_fini .= " setstringresult(ip,e);\n";
$pa_fini .= " rc= TCL_ERROR; goto rc_err;\n";
}
$pa_vars .= "\n";
$o{$wh}{sprintf "%010d", $pr} .= $s;
}
-sub make_decl_init ($$$$) {
- my ($n, $t, $a, $initcode) = @_;
+sub split_type_args ($) {
+ my ($type) = @_;
+ my ($xtypeargs);
+ if ($type =~ m/^\w+$/) {
+ $xtypeargs='';
+ } elsif ($type =~ m/^(\w+)\((.+)\)$/) {
+ $type= $1;
+ $xtypeargs= $2;
+ } else {
+ badsyntax($wh,$.,"bad type name/args \`$type'\n");
+ }
+ return ($type,$xtypeargs);
+}
+
+sub make_decl_init ($$$$$) {
+ my ($n, $t, $a, $initcode, $why) = @_;
my ($o,$init);
- $o= make_decl($n,$t,$a);
+ $o= make_decl($n,$t,$a,"$why _init");
if (exists $type_init{$t}) {
$init= $type_init{$t};
$$initcode .= " ".subst_in("$n", $init)."\n"
return " ".$o.";\n";
}
-sub make_decl ($$$) {
- my ($n, $t, $ta) = @_;
+sub make_decl ($$$$) {
+ my ($n, $t, $ta, $why) = @_;
my ($type);
if ($t eq 'enum') {
- $ta =~ m/\,/ or die "invalid enum type \`$t'\n";
+ $ta =~ m/\,/ or die "invalid enum type \`$t' ($why)\n";
$c= "const $` *@";
} else {
- defined $types{$t} or die "unknown type $t\n";
+ defined $types{$t} or die "unknown type $t ($why)\n";
$c= $types{$t}{C};
}
return subst_in_decl($n,$c);