cpp: inherit macro token's file, line and col information

[m6w6/ext-psi] / src / context.c

diff --git a/src/context.c b/src/context.c
index 161534e9f8aa03a180fc0866dec74d03e8bb7aba..584994f3fd38be672509fca4f49ea15ae26d5c1d 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -146,7 +146,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
                        type = psi_decl_type_init(member->type_tag, member->type_name);
                        dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
                        darg = psi_decl_arg_init(type, dvar);
-                       darg->layout = psi_layout_init(member->offset, member->size);
+                       darg->layout = psi_layout_init(member->offset, member->size, NULL);
 
                        switch (predef_composite->type_tag) {
                        case PSI_T_STRUCT:
@@ -178,7 +178,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
                struct psi_decl_var *fname = psi_decl_var_init(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
                struct psi_decl_arg *tdef, *func = psi_decl_arg_init(ftype, fname);
                struct psi_plist *args = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-               struct psi_decl *decl = psi_decl_init(psi_decl_abi_init("default"), func, args);
+               struct psi_decl *decl = psi_decl_init(func, args);
 
                for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
                        struct psi_decl_type *arg_type = psi_decl_type_init(farg->type_tag, farg->type_name);