stdio vararg decls

diff --git a/config.m4 b/config.m4
index e7d1e1f69aa60bd08c6f30335a9a91a18eda7fab..cce2affd5ed24391a819d0d435bfaf08dfcd12b6 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -71,6 +71,8 @@ if test "$PHP_PSI" != no; then
        AC_DEFINE_UNQUOTED([PSI_MACROS], [$PSI_MACROS], [Redirected Macros])
        AC_DEFINE_UNQUOTED([PSI_REDIRS], [$PSI_REDIRS], [Redirected functions])
        AC_DEFINE_UNQUOTED([PSI_DECLS], [$PSI_DECLS], [Predefined functions])
+       AC_DEFINE_UNQUOTED([PSI_VA_DECLS], [$PSI_VA_DECLS], [Predefined vararg functions])
+       
 
        PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
        PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)

diff --git a/m4/psi.m4 b/m4/psi.m4
index ff483bf17f6e78d04229176f8bc4ca7e49ddae3d..4f098514e9a06f88dc27dee7bba4c54c834884fd 100644 (file)
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -4,6 +4,7 @@ PSI_CONSTS=
 PSI_REDIRS=
 PSI_MACROS=
 PSI_DECLS=
+PSI_VA_DECLS=
 
 psi_includes() {
        local have_

diff --git a/m4/psi_decl.m4 b/m4/psi_decl.m4
index 3bc2558d593cbf60cc23a121c29cff6a71ef64bb..69f8edb4e7b2c92905b142a132e391c9ebfb3361 100644 (file)
--- a/m4/psi_decl.m4
+++ b/m4/psi_decl.m4
@@ -51,7 +51,7 @@ AC_DEFUN(PSI_DECL_ARG, [
     psi_decl_args="[$psi_decl_args{]PSI_TYPE_PAIR(member_type)[, \"]member_name[\",] $pl, $as[}]"
 ])
 
-dnl PSI_DECL(type func, args)
+dnl PSI_DECL(type func, args, flags)
 AC_DEFUN(PSI_DECL, [
        psi_decl_args=
        PSI_DECL_ARG($1)
@@ -60,9 +60,14 @@ AC_DEFUN(PSI_DECL, [
                [()], [],
                [m4_map_args_sep([PSI_DECL_ARG(m4_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
        PSI_FUNC(PSI_VAR_NAME($1), [
-               PSI_DECLS="$psi_decl_args, {0}, $PSI_DECLS"
+               ifelse([$3], vararg, [
+                       PSI_VA_DECLS="$psi_decl_args, {0}, $PSI_VA_DECLS"
+               ], [
+                       PSI_DECLS="$psi_decl_args, {0}, $PSI_DECLS"
+               ])
        ], [
                PSI_MACRO($1, $2, [
+                       ifelse([$3], vararg, AC_MSG_ERROR(varargs macro support is not implemented),[])
                        PSI_DECLS="$psi_decl_args, {0}, $PSI_DECLS"
                ])
        ])

diff --git a/m4/stdio.m4 b/m4/stdio.m4
index a6f8a2e856ac6380ea4637800da9911c1d0a16e4..82aaa1b467bc912c0cdb42b7db6c07325bdd8800 100644 (file)
--- a/m4/stdio.m4
+++ b/m4/stdio.m4
@@ -71,5 +71,13 @@ AC_DEFUN(PSI_CHECK_STDIO, [
     PSI_DECL(FILE *tmpfile, [(void)])
     PSI_DECL(char *tmpnam, [(char *s)])
     PSI_DECL(int ungetc, [(int c, FILE *stream)])
-
+       
+       PSI_DECL(int dprintf, [(int fd, char *fmt)], vararg)
+       PSI_DECL(int fprintf, [(FILE *stream, char *fmt)], vararg)
+       PSI_DECL(int fscanf, [(FILE *stream, char *fmt)], vararg)
+       PSI_DECL(int printf, [(char *fmt)], vararg)
+       PSI_DECL(int scanf, [(char *fmt)], vararg)
+       PSI_DECL(int snprintf, [(char *str, size_t size, char *fmt)], vararg)
+       PSI_DECL(int sprintf, [(char *str, char *fmt)], vararg)
+       PSI_DECL(int sscanf, [(char *str, char *fmt)], vararg)
 ])

diff --git a/psi.d/stdio.psi b/psi.d/stdio.psi
index 1e136cef1caaa8101152fac63c3bd6134843ba57..0741874ac5ba0af4ee0ddefb83c3672ad3278d8e 100644 (file)
--- a/psi.d/stdio.psi
+++ b/psi.d/stdio.psi
@@ -65,7 +65,7 @@ function psi\rewind(object $stream) : void {
        return void(rewind);
 }
 
-extern int printf(const char *fmt, ...);
+//extern int printf(const char *fmt, ...);
 function psi\printf(string $fmt, mixed ...$args) : int {
        let fmt = strval($fmt);
        return to_int(printf);

diff --git a/src/context.c b/src/context.c
index b07b6533a1e1a4e2884d33f979f676c3748ca9da..3b5c734e106da577a7aa90a3cf4bea0d876eecab 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -180,6 +180,10 @@ static struct psi_predef_decl {
        PSI_DECLS
        {0}
 };
+static struct psi_predef_decl psi_predef_vararg_decls[] = {
+       PSI_VA_DECLS
+       {0}
+};
 
 static struct psi_predef_struct {
        token_t type_tag;
@@ -992,6 +996,24 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                decl_args *args = init_decl_args(NULL);
                decl *decl = init_decl(init_decl_abi("default"), func, args);
 
+               for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
+                       decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
+                       decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
+                       decl_arg *darg = init_decl_arg(arg_type, arg_var);
+                       args = add_decl_arg(args, darg);
+               }
+
+               T.decls = add_decl(T.decls, decl);
+               predef_decl = farg;
+       }
+
+       for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) {
+               struct psi_predef_decl *farg;
+               decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
+               decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
+               decl_arg *func = init_decl_arg(ftype, fname);
+               decl_args *args = init_decl_args(NULL);
+               decl *decl = init_decl(init_decl_abi("default"), func, args);
 
                for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
                        decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
@@ -999,6 +1021,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                        decl_arg *darg = init_decl_arg(arg_type, arg_var);
                        args = add_decl_arg(args, darg);
                }
+               args->varargs = 1;
 
                T.decls = add_decl(T.decls, decl);
                predef_decl = farg;