Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / data.h

diff --git a/src/data.h b/src/data.h
index c31269c0aff2108cc7db779ac81a140945b56b4e..88b892610222ae0c304ba2e4beb759fd62160652 100644 (file)
--- a/src/data.h
+++ b/src/data.h
@@ -1,24 +1,63 @@
-#ifndef _PSI_DATA_H
-#define _PSI_DATA_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_DATA_H
+#define PSI_DATA_H

 
 #include "types.h"
 #include "error.h"
 
 #include "types.h"
 #include "error.h"

+#include "plist.h"
+#include "validate.h"
+
+#define PSI_DEBUG 0x1
+#define PSI_SILENT 0x2
+
+#include <stdarg.h>
+
+#define PSI_DEBUG_PRINT(ctx, msg, ...) do { \
+       if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+               fprintf(stderr, msg, __VA_ARGS__); \
+       } \
+} while(0)
+

 
 #define PSI_DATA(D) ((struct psi_data *) (D))
 
 #define PSI_DATA_MEMBERS \
 
 #define PSI_DATA(D) ((struct psi_data *) (D))
 
 #define PSI_DATA_MEMBERS \

-       constants *consts; \
-       decl_typedefs *defs; \
-       decl_structs *structs; \
-       decl_unions *unions; \
-       decl_enums *enums; \
-       decls *decls; \
-       impls *impls; \
-       union { \
-               decl_file file; \
-               decl_libs libs; \
-       } psi; \
+       struct psi_decl_file file; \
+       struct psi_plist *consts; \
+       struct psi_plist *types; \
+       struct psi_plist *structs; \
+       struct psi_plist *unions; \
+       struct psi_plist *enums; \
+       struct psi_plist *decls; \
+       struct psi_plist *vars; \
+       struct psi_plist *impls; \
+       struct psi_plist *libs; \

        psi_error_cb error; \
        psi_error_cb error; \

+       char last_error[0x1000]; \

        unsigned errors; \
        unsigned flags
 
        unsigned errors; \
        unsigned flags
 


@@ -26,7 +65,10 @@ struct psi_data {
        PSI_DATA_MEMBERS;
 };
 
        PSI_DATA_MEMBERS;
 };
 

+struct psi_data *psi_data_ctor(struct psi_data *data, psi_error_cb error, unsigned flags);
+struct psi_data *psi_data_ctor_with_dtors(struct psi_data *data, psi_error_cb error, unsigned flags);

 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);
 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);

+void psi_data_dump(int fd, struct psi_data *data);

 
 #endif
 
 #endif