diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/context.h | 1 | ||||
| -rw-r--r-- | inc/preprocess.h | 3 | ||||
| -rw-r--r-- | inc/tokenize.h | 10 | ||||
| -rw-r--r-- | inc/treeify.h | 37 |
4 files changed, 40 insertions, 11 deletions
diff --git a/inc/context.h b/inc/context.h index 5b314d7..f9bb5e5 100644 --- a/inc/context.h +++ b/inc/context.h @@ -34,6 +34,7 @@ struct ctx { struct ctx *context_create(const char *path); void context_destroy(struct ctx *ctx); +char context_getch(struct ctx *ctx, size_t i); void context_print(FILE *fd, struct ctx_location *location); void context_rewind(struct ctx *ctx); diff --git a/inc/preprocess.h b/inc/preprocess.h index e57af10..2724068 100644 --- a/inc/preprocess.h +++ b/inc/preprocess.h @@ -3,6 +3,9 @@ #include <context.h> +#define MACRO_SKIP ((char)128) +#define MACRO_NEWLINE ((char)129) + void preprocess(struct ctx *ctx); #endif diff --git a/inc/tokenize.h b/inc/tokenize.h index f5e8600..61fcd67 100644 --- a/inc/tokenize.h +++ b/inc/tokenize.h @@ -10,17 +10,19 @@ enum token_type { TYPE, TYPEDELIM, - PARAM, IDENT, + IDENTDELIM, + PARAM, + + STRING, + NUMBER, OPERATOR, LPAREN, RPAREN, - EQUAL, NEWLINE, - EOL, END, SOMETHING, @@ -32,7 +34,7 @@ struct token { ctx_string string; }; -void token_print(struct ctx *ctx, struct token *tok); +void token_print(struct ctx *ctx, struct token *token); void tokenize(struct ctx *ctx); #endif diff --git a/inc/treeify.h b/inc/treeify.h index bc8a64d..1e2d3e5 100644 --- a/inc/treeify.h +++ b/inc/treeify.h @@ -6,6 +6,7 @@ enum node_type { EXPRESSION, DECLARATION, + DEFINITION, }; /** @@ -31,33 +32,55 @@ struct node_expression_parameter { } data; }; -// *(f x y)* +// (*f x y*) struct node_expression { struct node_expression_identifier *callee; // f struct node_expression_parameter *parameters; // x y + size_t parameter_count; }; /** * Declarations */ -// *u32:f* u32:x u32:y = (...) +// *f* u32 u32 -> *u32* struct node_declaration_callee { ctx_string name; // f ctx_string type; // u32 }; -// u32:f *u32:x* *u32:y* = (...) +// f *u32* *u32* -> u32 struct node_declaration_parameter { - ctx_string name; // x or y ctx_string type; // u32 }; -// *u32:f u32:x u32:y* = (...) OR -// *u32:a* = ... +// *f u32 u32 -> u32* struct node_declaration { struct node_declaration_callee callee; // f - struct node_declaration_parameter *parameters; // x y OR NULL + struct node_declaration_parameter *parameters; // u32 u32 OR NULL + size_t parameter_count; +}; + +/** + * Definitions + */ + +// *f* a b : expr +struct node_definition_callee { + ctx_string name; +}; + +// f *a* *b* : expr +struct node_definition_parameter { + ctx_string name; // u32 +}; + +// *f a b : expr* +struct node_definition { + struct node_definition_callee callee; // f + struct node_definition_parameter *parameters; // a b + size_t parameter_count; + struct node_expression expression; // expr }; struct node { |