X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lua%2Fluapkg2c.pl;h=f1bab327825cb4a4961f773bd23251a65fe5df28;hp=2d152cb42b10d2fda41a2000fefa29860d72309e;hb=05e61a9707a6da5c0bca77aa7c3c019a918494de;hpb=b1c9f537b475b3bc8f6517bb4d7008a411bb478e

diff --git a/lib-lua/luapkg2c.pl b/lib-lua/luapkg2c.pl
index 2d152cb..f1bab32 100755
--- a/lib-lua/luapkg2c.pl
+++ b/lib-lua/luapkg2c.pl
@@ -83,13 +83,13 @@ sub parse_type($$) {
 
     while (stream_getline($src)) {
         last if (/^\s*\}\s*;\s*/);
-        if (/^\s*\.(push|kind|ctype|check)\s*=\s*(.*?)\s*;\s*$/) {
+        if (/^\s*\.(kind|ctype|dtor|ctor|push|check)\s*=\s*(.*?)\s*;\s*$/) {
             $t{$1} = $2;
             if ($1 eq "kind") {
-                if ($2 =~ /^'([si])'$/) {
+                if ($2 =~ /^'([bis])'$/) {
                     $t{kind} = $1;
                 } else {
-                    fatal($src, "error: .kind should be 'i' or 's' got $2)");
+                    fatal($src, "error: .kind should be [ibs] got $2)");
                 }
             }
         } elsif (!/^\s*$/) {
@@ -97,19 +97,31 @@ sub parse_type($$) {
         }
     }
 
-    for my $i ('kind', 'ctype') {
-        fatal($src, "incomplete type $type: missing .$i") unless defined $t{$i};
+    for ('kind', 'ctype') {
+        fatal($src, "incomplete type $type: missing .$_") unless defined $t{$_};
+    }
+    if ($t{kind} eq 's') {
+        for ('dtor', 'ctor') {
+            fatal($src, "incomplete type $type: missing .$_") unless defined $t{$_};
+        }
     }
     unless (defined $t{check}) {
-        if ($t{kind} eq 's') {
-            $t{check} = 'luaL_checkstring($L, $$)';
+        if ($t{kind} eq 'b') {
+            $t{check} = '(luaL_checkint($L, $$) == 0)';
         }
 
         if ($t{kind} eq 'i') {
-            $t{check} = 'luaL_checkint($l, $$)';
+            $t{check} = 'luaL_checkint($L, $$)';
+        }
+
+        if ($t{kind} eq 's') {
+            $t{check} = 'luaL_checkstring($L, $$)';
         }
     }
 
+    $t{ctypefmt} .= ' %s' unless (($t{ctypefmt} = $t{ctype}) =~ s/:/ \%s :/);
+    $t{ctype} =~ s/:.*//;
+
     return $types{$type} = \%t;
 }
 
@@ -208,8 +220,16 @@ sub dump_fun($$) {
         }
     }
 
-    if (defined $t{type}->{push}) {
-        $call =~ s/\$\$/$t{type}->{push}/;
+    die "UNIMPLEMENTED" if defined $t{type}->{push};
+
+    if ($t{type}->{kind} eq 'b') {
+        put_line($f, 0);
+        print "    lua_pushboolean(L, $call);\n";
+    }
+
+    if ($t{type}->{kind} eq 'i') {
+        put_line($f, 0);
+        print "    lua_pushint(L, $call);\n";
     }
 
     if ($t{type}->{kind} eq 's') {
@@ -226,11 +246,6 @@ sub dump_fun($$) {
         }
     }
 
-    if ($t{type}->{kind} eq 'i') {
-        put_line($f, 0);
-        print "    lua_pushint(L, $call);\n";
-    }
-
     printf "    return %d;\n", ($f->{type} ne "void");
     print "}\n";
 }
@@ -253,6 +268,7 @@ sub dump_struct_full($) {
             put_line($p, 0);
             print "    $p->{init},\n";
         } else {
+            print "    0,\n"    if ($t{type}->{kind} eq 'b');
             print "    0,\n"    if ($t{type}->{kind} eq 'i');
             print "    NULL,\n" if ($t{type}->{kind} eq 's');
         }
@@ -273,8 +289,13 @@ EOF
         next if $t{const};
 
         put_line($p, 0);
-        print "        m_strreplace(&$var, $p->{init});\n" if ($t{type}->{kind} eq 's');
-        print "        $var = $p->{init};\n"               if ($t{type}->{kind} eq 'i');
+        if ($t{type}->{dtor}) {
+            my $dtor = $t{type}->{dtor};
+            $dtor =~ s/\$L/L/;
+            $dtor =~ s/\$\$/\&$var/;
+            print "    $dtor;\n";
+        }
+        print "    $var = $p->{init};\n"
     }
     print "};\n";
 };
@@ -286,7 +307,11 @@ sub dump_struct_short($) {
     foreach (@{$pkg->{props}}) {
         my $p = $pkg->{members}{$_};
         my %t = find_type($p, $p->{type});
-        print "    $t{type}->{ctype} $p->{name};\n";
+        if ($t{const}) {
+            printf "    const $t{type}->{ctypefmt};\n", $p->{name};
+        } else {
+            printf "    $t{type}->{ctypefmt};\n", $p->{name};
+        }
     }
     put_line($pkg, 0);
     print <<EOF;
@@ -296,14 +321,74 @@ extern struct luaM_$pkg->{name}_t $pkg->{cname};
 EOF
 }
 
+sub dump_struct_static($) {
+    my ($pkg) = @_;
+
+    print "static struct {\n";
+    foreach (@{$pkg->{props}}) {
+        my $p = $pkg->{members}{$_};
+        my %t = find_type($p, $p->{type});
+        if ($t{const}) {
+            printf "    const $t{type}->{ctypefmt};\n", $p->{name};
+        } else {
+            printf "    $t{type}->{ctypefmt};\n", $p->{name};
+        }
+    }
+    put_line($pkg, 0);
+    print "} $pkg->{cname} = {\n";
+
+    foreach (@{$pkg->{props}}) {
+        my $p = $pkg->{members}{$_};
+        my %t = find_type($p, $p->{type});
+
+        if ($t{const}) {
+            put_line($p, 0);
+            print "    $p->{init},\n";
+        } else {
+            print "    0,\n"    if ($t{type}->{kind} eq 'b');
+            print "    0,\n"    if ($t{type}->{kind} eq 'i');
+            print "    NULL,\n" if ($t{type}->{kind} eq 's');
+        }
+    }
+
+    print <<EOF;
+};
+
+static void $pkg->{cname}_init(void)
+{
+EOF
+
+    foreach (@{$pkg->{props}}) {
+        my $p   = $pkg->{members}{$_};
+        my %t   = find_type($p, $p->{type});
+        my $var = $pkg->{cname}.".".$p->{name};
+
+        next if $t{const};
+
+        put_line($p, 0);
+        if ($t{type}->{dtor}) {
+            my $dtor = $t{type}->{dtor};
+            $dtor =~ s/\$L/L/;
+            $dtor =~ s/\$\$/\&$var/;
+            print "    $dtor;\n";
+        }
+        print "    $var = $p->{init};\n"
+    }
+    print "};\n";
+};
+
 #}}}
 
 #{{{ dump package
 
-sub dump_package_full($) {
-    my $pkg = shift;
+sub dump_package_full($$) {
+    my ($pkg, $static) = @_;
 
-    dump_struct_full($pkg);
+    if ($static) {
+        dump_struct_static($pkg);
+    } else {
+        dump_struct_full($pkg);
+    }
     map { print "\n"; dump_fun($pkg->{name}, $pkg->{members}{$_}); } @{$pkg->{meths}};
     print <<EOF;
 
@@ -324,21 +409,24 @@ EOF
     foreach (@{$pkg->{props}}) {
         my $p = $pkg->{members}{$_};
         my %t = find_type($p, $p->{type});
-        my $call = $pkg->{cname}.".".$p->{name};
+        my $call = $t{type}->{push} || '$$';
+
+        $call =~ s/\$L/L/;
+        $call =~ s/\$\$/$pkg->{cname}.$p->{name}/;
 
         my $tok = $p->{name};
         $tok =~ tr/a-z/A-Z/;
 
-        if ($t{type}->{kind} eq 's') {
-            $call = "lua_pushstring(L, $call)";
+        if ($t{type}->{kind} eq 'b') {
+            $call = "lua_pushboolean(L, $call)";
         }
 
         if ($t{type}->{kind} eq 'i') {
             $call = "lua_pushinteger(L, $call)";
         }
 
-        if (defined $t{type}->{push}) {
-            $call =~ s/\$\$/$t{type}->{push}/;
+        if ($t{type}->{kind} eq 's') {
+            $call = "lua_pushstring(L, $call)";
         }
 
         put_line($p, 0);
@@ -376,10 +464,20 @@ EOF
 
         put_line($p, 0);
         print  "      case LTK_$tok: \n";
-        print "        m_strreplace(&$var, $check)" if ($t{type}->{kind} eq 's');
-        print "        $var = $check"               if ($t{type}->{kind} eq 'i');
-
-        print  ";\n        return 1;\n";
+        if ($t{type}->{dtor}) {
+            my $dtor = $t{type}->{dtor};
+            $dtor =~ s/\$L/L/;
+            $dtor =~ s/\$\$/\&$var/;
+            print "        $dtor;\n";
+        }
+        if ($t{type}->{ctor}) {
+            my $ctor = $t{type}->{ctor};
+            $ctor =~ s/\$L/L/;
+            $ctor =~ s/\$\$/$check/;
+            $check = $ctor;
+        }
+        print "        $var = $check;\n";
+        print "        return 1;\n";
     }
 
 print <<EOF;
@@ -455,8 +553,11 @@ sub do_c($) {
         if (/^\s*\@type\s+([a-zA-Z]\w*)\s*=\s*{\s*$/) {
             parse_type(\%src, $1);
             $resync = 1;
+        } elsif (/^\s*static\s+\@package\s+([a-zA-Z]\w*)\s+{\s*$/) {
+            dump_package_full(parse_package(\%src, $1), 1);
+            $resync = 1;
         } elsif (/^\s*\@package\s+([a-zA-Z]\w*)\s+{\s*$/) {
-            dump_package_full(parse_package(\%src, $1));
+            dump_package_full(parse_package(\%src, $1), 0);
             $resync = 1;
         } elsif (/^\s*(\@\w*)/) {
             fatal(\%src, "syntax error: unknown directive `$1'");
@@ -469,7 +570,6 @@ sub do_c($) {
             print;
         }
     }
-    print "/* vi"."m:set ft=c: */\n";
 
     stream_close(\%src);
 }