typedef struct PSI_Token {
token_t type;
- unsigned line;
- size_t size;
- char text[1];
+ size_t size, line, col;
+ char *text, *file;
+ char buf[1];
} PSI_Token;
typedef union impl_val {
} impl_val;
typedef struct decl_type {
+ PSI_Token *token;
char *name;
token_t type;
struct decl_type *real;
typedef struct decl_args {
decl_arg **args;
size_t count;
+ unsigned varargs:1;
} decl_args;
static inline decl_args *init_decl_args(decl_arg *arg) {
typedef struct impl_args {
impl_arg **args;
size_t count;
+ impl_arg *vararg;
} impl_args;
static inline impl_args *init_impl_args(impl_arg *arg) {
typedef struct let_func {
token_t type;
char *name;
- let_calloc *alloc;
+ impl_var *var;
+ impl_arg *arg;
} let_func;
-static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
+static inline let_func *init_let_func(token_t type, const char *name, impl_var *var) {
let_func *func = calloc(1, sizeof(*func));
func->type = type;
func->name = strdup(name);
- func->alloc = alloc;
+ func->var = var;
return func;
}
static inline void free_let_func(let_func *func) {
- if (func->alloc) {
- free_let_calloc(func->alloc);
- }
+ free_impl_var(func->var);
free(func->name);
free(func);
}
-typedef struct let_value {
- let_func *func;
- impl_var *var;
- num_exp *num;
- unsigned is_reference:1;
-} let_value;
-
-static inline let_value *init_let_value(let_func *func, impl_var *var, int is_reference) {
- let_value *val = calloc(1, sizeof(*val));
- val->is_reference = is_reference;
- val->func = func;
- val->var = var;
- return val;
+#define PSI_LET_REFERENCE 0x1;
+typedef struct let_val {
+ enum let_val_kind {
+ PSI_LET_NULL,
+ PSI_LET_NUMEXP,
+ PSI_LET_CALLOC,
+ PSI_LET_FUNC,
+ PSI_LET_TMP,
+ } kind;
+ union {
+ num_exp *num;
+ let_calloc *alloc;
+ let_func *func;
+ decl_var *var;
+ } data;
+ union {
+ struct {
+ unsigned is_reference:1;
+ } one;
+ unsigned all;
+ } flags;
+} let_val;
+
+static inline let_val *init_let_val(enum let_val_kind kind, void *data) {
+ let_val *let = calloc(1, sizeof(*let));
+ switch (let->kind = kind) {
+ case PSI_LET_NULL:
+ break;
+ case PSI_LET_NUMEXP:
+ let->data.num = data;
+ break;
+ case PSI_LET_CALLOC:
+ let->data.alloc = data;
+ break;
+ case PSI_LET_FUNC:
+ let->data.func = data;
+ break;
+ case PSI_LET_TMP:
+ let->data.var = data;
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ return let;
}
-static inline void free_let_value(let_value *val) {
- if (val->func) {
- free_let_func(val->func);
- }
- if (val->var) {
- free_impl_var(val->var);
+static inline void free_let_val(let_val *let) {
+ switch (let->kind) {
+ case PSI_LET_NULL:
+ break;
+ case PSI_LET_NUMEXP:
+ free_num_exp(let->data.num);
+ break;
+ case PSI_LET_CALLOC:
+ free_let_calloc(let->data.alloc);
+ break;
+ case PSI_LET_FUNC:
+ free_let_func(let->data.func);
+ break;
+ case PSI_LET_TMP:
+ free_decl_var(let->data.var);
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
}
- free(val);
+ free(let);
}
typedef struct let_stmt {
decl_var *var;
- let_value *val;
- impl_arg *arg;
+ let_val *val;
+
void *ptr;
} let_stmt;
-static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
+static inline let_stmt *init_let_stmt(decl_var *var, let_val *val) {
let_stmt *let = calloc(1, sizeof(*let));
let->var = var;
let->val = val;
}
static inline void free_let_stmt(let_stmt *stmt) {
- free_decl_var(stmt->var);
if (stmt->val) {
- free_let_value(stmt->val);
+ if (stmt->val->kind == PSI_LET_TMP && stmt->var->arg) {
+ free_decl_arg(stmt->var->arg);
+ }
+ free_let_val(stmt->val);
}
+ free_decl_var(stmt->var);
free(stmt);
}
}
free(val->inner);
}
+ if (val->num) {
+ free_num_exp(val->num);
+ }
free(val);
}
static inline void free_free_call(free_call *f) {
free(f->func);
+ free_decl_vars(f->vars);
free(f);
}
unsigned flags;
unsigned errors;
void *proc;
- size_t line;
+ size_t line, col;
token_t num;
char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
} PSI_Parser;
static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
PSI_Token *T;
- size_t token_len;
+ size_t token_len, fname_len;
+ token_t token_typ;
if (P->cur < P->tok) {
return NULL;
}
+ token_typ = P->num;
token_len = P->cur - P->tok;
+ fname_len = strlen(P->psi.file.fn);
- T = calloc(1, sizeof(*T) + token_len);
- T->type = P->num;
- T->line = P->line;
+ T = calloc(1, sizeof(*T) + token_len + fname_len + 1);
+ T->type = token_typ;
T->size = token_len;
- T->text[token_len] = 0;
+ T->line = P->line;
+ T->col = P->col;
+ T->file = &T->buf[0];
+ T->text = &T->buf[fname_len + 1];
+
+ memcpy(T->file, P->psi.file.fn, fname_len);
memcpy(T->text, P->tok, token_len);
return T;
}
+static inline PSI_Token *PSI_TokenCopy(PSI_Token *src) {
+ size_t fname_len = strlen(src->file);
+ size_t strct_len = sizeof(*src) + src->size + fname_len + 1;
+ PSI_Token *ptr = malloc(strct_len);
+
+ memcpy(ptr, src, strct_len);
+
+ ptr->file = &ptr->buf[0];
+ ptr->text = &ptr->buf[fname_len + 1];
+
+ return ptr;
+}
+
#define PSI_PARSER_DEBUG 0x1
PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags);
void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...);
size_t PSI_ParserFill(PSI_Parser *P, size_t n);
token_t PSI_ParserScan(PSI_Parser *P);
-void PSI_ParserParse(PSI_Parser *P, PSI_Token *T);
+void PSI_ParserParse(PSI_Parser *P, PSI_Token *src);
void PSI_ParserDtor(PSI_Parser *P);
void PSI_ParserFree(PSI_Parser **P);
projects / m6w6 / ext-psi / blobdiff