raising the head after a three-weeks refactoring

[m6w6/ext-psi] / src / types / decl_var.h

diff --git a/src/types/decl_var.h b/src/types/decl_var.h
index 8fd75db431b85ad3f3537bd9f8e0aadb4609f306..ba7332166ff2882babd771a7d4e3f85b36c9d05f 100644 (file)
--- a/src/types/decl_var.h
+++ b/src/types/decl_var.h
@@ -26,22 +26,43 @@
 #ifndef PSI_TYPES_DECL_VAR_H
 #define PSI_TYPES_DECL_VAR_H
 
-typedef struct decl_var {
+struct psi_data;
+struct psi_token;
+struct psi_decl_arg;
+struct psi_let_exp;
+struct psi_set_exp;
+
+struct psi_decl_var {
        struct psi_token *token;
-       char *name;
+       char *name, *fqn;
        unsigned pointer_level;
        unsigned array_size;
-       struct decl_arg *arg;
-} decl_var;
+       struct psi_decl_arg *arg;
+};
+
+struct psi_decl_var *psi_decl_var_init(const char *name, unsigned pl, unsigned as);
+struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src);
+void psi_decl_var_free(struct psi_decl_var **var_ptr);
+void psi_decl_var_dump(int fd, struct psi_decl_var *var);
+
+#include <string.h>
+
+static inline char *psi_decl_var_name_prepend(char *current, const char *prepend) {
+       size_t c_len = strlen(current);
+       size_t p_len = strlen(prepend);
 
-decl_var *init_decl_var(const char *name, unsigned pl, unsigned as);
-decl_var *copy_decl_var(decl_var *src);
-void free_decl_var(decl_var *var);
-void dump_decl_var(int fd, decl_var *var);
+       current = realloc(current, p_len + 1 + c_len + 1);
+       if (current) {
+               memmove(current + p_len + 1, current, c_len + 1);
+               current[p_len] = '.';
+               memcpy(current, prepend, p_len);
+       }
+       return current;
+}
 
-struct decl_arg;
-struct decl_args;
+bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar, struct psi_decl *decl,
+               struct psi_let_exp *current_let_exp, struct psi_set_exp *current_set_exp);
 
-struct decl_arg *locate_decl_var_arg(decl_var *var, struct decl_args *args, struct decl_arg *func);
+size_t psi_decl_var_get_size(struct psi_decl_var *var);
 
 #endif