Drop alg->byteswap; implement counter mode; split padding so now we do PKCS#5 and...

[chiark-tcl.git] / base / tcmdifgen

diff --git a/base/tcmdifgen b/base/tcmdifgen
index 21833c1d1cdc415718eb508d313fcd813208f1e4..14567703c2129f95b05e3f65f95f4a02cec3c4e3 100755 (executable)
--- a/base/tcmdifgen
+++ b/base/tcmdifgen
@@ -63,16 +63,16 @@ sub parse ($$) {
        } elsif (@i>=1 && defined $c_entryextra) {
            $entrytype_x{$c_entryextra} .= "  $_\n";
        } elsif (@i==1 && m/^[a-z].*$/ && defined $c_table) {
-           if (m/^\w+$/) {
+           if (m/^[-_0-9A-Za-z]+$/) {
                $c_entry= $_;
-           } elsif (m/^(\w+)\s+(\S.*)$/) {
+           } elsif (m/^([-_0-9A-Za-z]+)\s+(\S.*)$/) {
                $c_entry= $1;
                $tables{$c_table}{$c_entry}{I} .= ", $2";
            } else {
                badsyntax($wh,$.,"bad entry");
            }
            $tables{$c_table}{$c_entry}{A} = [ ];
-       } elsif (@i==2 && m/^(\w+)\s+\.\.\.$/ && defined $c_entry) {
+       } elsif (@i==2 && m/^\.\.\.\s+(\w+)$/ && defined $c_entry) {
            $tables{$c_table}{$c_entry}{V}= $1;
        } elsif (@i==2 && m/^(\??)([a-z]\w*)\s*(\S.*)/
                 && defined $c_entry) {
@@ -144,11 +144,12 @@ foreach $c_table (sort keys %tables) {
     $x_table= $table_x{$c_table};
     $op_tab= '';
 
-    foreach $c_entry (keys %$r_table) {
+    foreach $c_entry (sort keys %$r_table) {
+       $c_entry_c= $c_entry; $c_entry_c =~ y/-/_/;
        $r_entry= $r_table->{$c_entry};
-       $pa_decl= "int pa_${c_table}_${c_entry}(ClientData cd,".
+       $pa_decl= "int pa_${c_table}_${c_entry_c}(ClientData cd,".
            " Tcl_Interp *ip, int objc, Tcl_Obj *const *objv)";
-       $do_decl= "int do_${c_table}_${c_entry}(";
+       $do_decl= "int do_${c_table}_${c_entry_c}(";
        @do_al= ('ClientData cd', 'Tcl_Interp *ip');
        @do_aa= qw(cd ip);
        $pa_init= '';
@@ -161,6 +162,10 @@ foreach $c_table (sort keys %tables) {
        $any_mand= 0;
        $any_optl= 0;
        $any_eerr= 0;
+       $any_eargc= 0;
+       $pa_hint= '';
+       $pa_hint .= "$c_table " if length $c_table;
+       $pa_hint.= $c_entry;
        foreach $arg (@{ $r_entry->{A} }) {
            $n= $arg->{N};
            $t= $arg->{T};
@@ -168,18 +173,19 @@ foreach $c_table (sort keys %tables) {
            push @do_al, make_decl($n, $t, $arg->{A});
            $pa_vars .= make_decl_init("a_$n", $t, $a, \$pa_init);
            if ($arg->{O}) {
+               $pa_hint .= " ?$n?";
                if ($any_mand) {
-                   $pa_argc .= "  if (objc < $any_mand) {".
-                       " e=\"too few args\"; goto e_err; }\n";
-                   $pa_body .= "  objc -= $any_mand;\n";
                    $any_mand= 0;
                    $any_eerr= 1;
                }
                $pa_body .= "  if (!objc--) goto end_optional;\n";
                $any_optl= 1;
            } else {
-               die if $any_optl;
+               $pa_hint .= " $n";
+               $pa_body .= "  if (!objc--) goto wrong_count_args;\n";
                $any_mand++;
+               $any_eargc= 1;
+               die if $any_optl;
            }
            $paarg= "&a_$n";
            $pafin= '';
@@ -201,18 +207,15 @@ foreach $c_table (sort keys %tables) {
            push @do_aa, "a_$n";
        }
        if (exists $r_entry->{V}) {
-           if ($any_mand) {
-               $pa_body .= "  objc -= $any_mand;\n";
-           }
+           $pa_hint .= " ...";
            $va= $r_entry->{V};
            push @do_al, subst_in_decl("${va}c", 'int @');
            push @do_al, subst_in_decl("${va}v", 'Tcl_Obj *const *@');
            push @do_aa, "objc+1", "objv-1";
        } else {
            if (!$any_optl) {
-               $pa_argc .= "  if (objc != $any_mand) {".
-                   " e=\"wrong number of args\"; goto e_err; }\n";
-               $any_eerr= 1;
+               $pa_body .= "  if (objc) goto wrong_count_args;\n";
+               $any_eargc= 1;
            }
        }
        if ($any_optl) {
@@ -226,7 +229,7 @@ foreach $c_table (sort keys %tables) {
            $pa_rslt .= "  Tcl_SetObjResult(ip, ret_$t(ip, result));\n";
        }
        $pa_body .= "\n";
-       $pa_body .= "  rc= do_${c_table}_${c_entry}(";
+       $pa_body .= "  rc= do_${c_table}_${c_entry_c}(";
        $pa_body .= join ', ', @do_aa;
        $pa_body .= ");\n";
        $pa_body .= "  if (rc) goto rc_err;\n";
@@ -235,11 +238,17 @@ foreach $c_table (sort keys %tables) {
        $pa_rslt .= "rc_err:\n";
        
        $pa_fini .= "  return rc;\n";
+       if ($any_eargc) {
+           $pa_fini .= "\nwrong_count_args:\n";
+           $pa_fini .= "  e=\"wrong # args: should be \\\"$pa_hint\\\"\";\n";
+           $pa_fini .= "  goto e_err;";
+           $any_eerr= 1;
+       }
        if ($any_eerr) {
            $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";
@@ -268,7 +277,7 @@ foreach $c_table (sort keys %tables) {
 
        $op_tab .= sprintf("  { %-20s %-40s%s },\n",
                           "\"$c_entry\",",
-                          "pa_${c_table}_${c_entry}",
+                          "pa_${c_table}_${c_entry_c}",
                           $r_entry->{I});
     }
     if (length $c_table) {