all compiles again. more pat to do.

[chiark-tcl.git] / base / tcmdifgen

diff --git a/base/tcmdifgen b/base/tcmdifgen
index 3a317549d62e7c003caa17ee5afa225847b0a01f..aa717d4d74b1225ba3f6c889a1e67e078c990a00 100755 (executable)
--- a/base/tcmdifgen
+++ b/base/tcmdifgen
@@ -47,20 +47,16 @@ sub parse ($$) {
            unshift @i, $this_indent;
        }
 
-       if (@i==0 && m/^Table\s+(\w+)$/) {
+       if (@i==0 && m/^Table\s+(\w+)\s+(\w+)$/) {
            zilch();
            $c_table= $1;
-           $table_x{$c_table}{C}= 'ParserCommandTableEntry';
-           $entrytype_x{ParserCommandTableEntry}= '';
+           $table_x{$c_table}{C}= $2;
+           $entrytype_x{$2}= '';
        } elsif (@i==0 && m/^Untabled$/) {
            zilch();
            $c_table= '';
        } elsif (@i==0 && m/^(C|H)\-Include\s+(\S.*)$/) {
            o(lc $1, 30, "#include $2\n");
-       } elsif (@i==1 && m/^Of\s+(\w+)$/ && defined $c_table) {
-           die unless length $c_table;
-           $table_x{$c_table}{C}= $1;
-           $entrytype_x{$1}= '';
        } elsif (@i==0 && m/^EntryExtra\s+(\w+)$/) {
            zilch();
            $c_entryextra= $1;
@@ -105,6 +101,8 @@ sub parse ($$) {
            $types{$typename}= { C => $ctype, X => $xtypeargs };
        } elsif (@i==0 && s/^Init\s+(\w+)\s+(\S.*)//) {
            $type_init{$1}= $2;
+       } elsif (@i==0 && s/^Fini\s+(\w+)\s+(\S.*)//) {
+           $type_fini{$1}= $2;
        } else {
            badsyntax($wh,$., sprintf
                      "bad directive (indent level %d)", scalar @i);
@@ -121,13 +119,13 @@ foreach $t (sort keys %types) {
     $type= $types{$t};
     $c= $type->{C};
     $xta= $type->{X};
-    $decl= "int pat_$t(Tcl_Interp*, Tcl_Obj*, ";
-    $decl .= subst_in_decl('*', $c, "type $t");
+    $decl= "int pat_$t(Tcl_Interp *ip, Tcl_Obj *obj, ";
+    $decl .= subst_in_decl('*val', $c, "type $t");
     $decl .= ", $xta",  if length $xta;
     $decl .= ");\n";
     o('h',160, $decl);
 
-    $decl= "Tcl_Obj *ret_$t(Tcl_Interp*, ".subst_in_decl('',$c).");\n";
+    $decl= "Tcl_Obj *ret_$t(Tcl_Interp *ip, ".subst_in_decl('val',$c).");\n";
     o('h',170, $decl);
 }
 
@@ -188,8 +186,13 @@ foreach $c_table (sort keys %tables) {
                $pa_vars .= "  const void *v_$n= 0;\n";
                $paarg= "&v_$n";
                $pafin= "\n  a_$n= v_$n; ";
-               $a =~ m/\,/ or die; $a = "$', sizeof($`)";
-               o('h', 210, "extern const $` $'".'[]'.";\n");
+               $a =~ m/\,/ or die "invalid enum type \`$a'\n";
+               $a_tab = lc($`).'s';
+               $a = "$a_tab, sizeof($`), $'";
+               o('h', 210, "extern const $` $a_tab".'[]'.";\n");
+           }
+           if (exists $type_fini{$t}) {
+               $pa_fini .= '  '.subst_in("a_$n", $type_fini{$t})."\n";
            }
            $pa_body .= "  rc= pat_$t(ip, *objv++, $paarg";
            $pa_body .= ", ".$a if length $a;
@@ -256,13 +259,13 @@ foreach $c_table (sort keys %tables) {
        o('h',100, $do_decl.";\n") or die $!;
        
 
-       $op_tab .= sprintf("  { %-20s, %-50s%s },\n",
-                          "\"$c_entry\"",
+       $op_tab .= sprintf("  { %-20s %-40s%s },\n",
+                          "\"$c_entry\",",
                           "pa_${c_table}_${c_entry}",
                           $r_entry->{I});
     }
     if (length $c_table) {
-       $decl= "const $x_table->{C} pcmdtab_$c_table".'[]';
+       $decl= "const $x_table->{C} ".lc($x_table->{C}).'s[]';
        o('h', 500, "extern $decl;\n");
        o('c', 100,
          "$decl = {\n".
@@ -281,7 +284,8 @@ o(h, 0,
 
 o(h, 400,
   "void setstringresult(Tcl_Interp*, const char*);\n".
-  "int pat_enum(Tcl_Interp*, Tcl_Obj*, const void**, const void*, size_t);\n");
+  "int pat_enum(Tcl_Interp*, Tcl_Obj*, const void**,".
+  "             const void*, size_t, const char *what);\n");
 
 o(h, 999,
   "#endif /*INCLUDED_\U${prefix}_H*/\n");
@@ -328,7 +332,7 @@ sub make_decl ($$$) {
     my ($n, $t, $ta) = @_;
     my ($type);
     if ($t eq 'enum') {
-       $ta =~ m/\,/ or die "enum with bad args \`$ta'\n";
+       $ta =~ m/\,/ or die "invalid enum type \`$t'\n";
        $c= "const $` *@";
     } else { 
        defined $types{$t} or die "unknown type $t\n";
@@ -356,6 +360,7 @@ sub badsyntax ($$$) {
 }
 
 __DATA__
-Type int:                      int
-Type obj:                      Tcl_Obj *@
-Type charfrom(const char*):    int
+Type int:      int
+Type obj:      Tcl_Obj *@
+
+Type charfrom(const char *opts, const char *what):     int