Skip to content

Commit

Permalink
FixPort binding statement values
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesaorson
jamesaorson committed Oct 1, 2022
1 parent 66ed738 commit db1dc3d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 182 deletions.
184 changes: 5 additions & 179 deletions src/include/parser/ast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ typedef union AstNodeUnion {
struct UnionTypeDeclarationNode* union_type_declaration;
} AstNodeUnion;

union BindingStatementNodeUnion {
typedef union BindingStatementNodeUnion {
struct LetBindingNode* let_binding;
struct MutBindingNode* mut_binding;
};
} BindingStatementNodeUnion;

union ExpressionNodeUnion {
struct CallExpressionNode* call_expression;
Expand Down Expand Up @@ -236,10 +236,10 @@ typedef struct AstNode {
union AstNodeUnion value;
} AstNode;

struct BindingStatementNode {
typedef struct BindingStatementNode {
AstNodeKind kind;
union BindingStatementNodeUnion value;
};
} BindingStatementNode;

struct CallExpressionNode {
AstNodeKind kind;
Expand Down Expand Up @@ -489,10 +489,8 @@ struct UnionTypeDeclarationNode {
/*************************/
/* Function Declarations */
/*************************/
// int ast_free_node(struct AstNode*);

struct BindingStatementNode* ast_new_binding_statement_node(AstNodeKind, union BindingStatementNodeUnion);
// int ast_free_binding_statement_node(struct BindingStatementNode*);
inline BindingStatementNode* ast_new_binding_statement_node(const AstNodeKind, const BindingStatementNodeUnion);
struct BindingStatementNode* ast_parse_binding_statement(struct Token**);
bool ast_binding_statement_token_matches_first_set(struct Token);

Expand Down Expand Up @@ -719,181 +717,9 @@ int ast_free_union_type_declaration_node(struct UnionTypeDeclarationNode*);
struct UnionTypeDeclarationNode* ast_parse_union_type_declaration(struct IdentifierNode*, struct Token**);
bool ast_union_type_declaration_token_matches_first_set(struct Token);

/***********/
/* AstNode */
/***********/
// int ast_free_node(struct AstNode* node) {
// switch (node->kind) {
// case AstBindingStatement: {
// ast_free_binding_statement_node(node->value.binding_statement);
// } break;
// case AstCallExpression: {
// ast_free_call_expression_node(node->value.call_expression);
// } break;
// case AstDoStatement: {
// ast_free_do_statement_node(node->value.do_statement);
// } break;
// case AstDoubleExpression: {
// ast_free_double_expression_node(node->value.double_expression);
// } break;
// case AstEnumField: {
// ast_free_enum_field_node(node->value.enum_field);
// } break;
// case AstEnumFieldList: {
// ast_free_enum_field_list_node(node->value.enum_field_list);
// } break;
// case AstEnumTypeDeclaration: {
// ast_free_enum_type_declaration_node(node->value.enum_type_declaration);
// } break;
// case AstEnumTypeExpression: {
// ast_free_enum_type_expression_node(node->value.enum_type_expression);
// } break;
// case AstExpression: {
// ast_free_expression_node(node->value.expression);
// } break;
// case AstExpressionList: {
// ast_free_expression_list_node(node->value.expression_list);
// } break;
// case AstField: {
// ast_free_field_node(node->value.field);
// } break;
// case AstFieldBinding: {
// ast_free_field_binding_node(node->value.field_binding);
// } break;
// case AstFieldBindingList: {
// ast_free_field_binding_list_node(node->value.field_binding_list);
// } break;
// case AstFieldList: {
// ast_free_field_list_node(node->value.field_list);
// } break;
// case AstFunctionDeclaration: {
// ast_free_function_declaration_node(node->value.function_declaration);
// } break;
// case AstIdentifier: {
// ast_free_identifier_node(node->value.identifier);
// } break;
// case AstIdentifierExpression: {
// ast_free_identifier_expression_node(node->value.identifier_expression);
// } break;
// case AstImportStatement: {
// ast_free_import_statement_node(node->value.import_statement);
// } break;
// case AstIntegerExpression: {
// ast_free_integer_expression_node(node->value.integer_expression);
// } break;
// case AstLetBinding: {
// ast_free_let_binding_node(node->value.let_binding);
// } break;
// case AstListExpression: {
// ast_free_list_expression_node(node->value.list_expression);
// } break;
// case AstMatchCase: {
// ast_free_match_case_node(node->value.match_case);
// } break;
// case AstMatchCaseList: {
// ast_free_match_case_list_node(node->value.match_case_list);
// } break;
// case AstMatchStatement: {
// ast_free_match_statement_node(node->value.match_expression);
// } break;
// case AstModuleStatement: {
// ast_free_module_statement_node(node->value.module_statement);
// } break;
// case AstModuleStatementList: {
// ast_free_module_statement_list_node(node->value.module_statement_list);
// } break;
// case AstMutBinding: {
// ast_free_mut_binding_node(node->value.mut_binding);
// } break;
// case AstMutExpression: {
// ast_free_mut_expression_node(node->value.mut_expression);
// } break;
// case AstNewAlloc: {
// ast_free_new_alloc_node(node->value.new_alloc);
// } break;
// case AstNumericExpression: {
// ast_free_numeric_expression_node(node->value.numeric_expression);
// } break;
// case AstParameter: {
// ast_free_parameter_node(node->value.parameter);
// } break;
// case AstParameterList: {
// ast_free_parameter_list_node(node->value.parameter_list);
// } break;
// case AstProgram: {
// ast_free_program_node(node->value.program);
// } break;
// case AstReturnStatement: {
// ast_free_return_statement_node(node->value.return_statement);
// } break;
// case AstShebang: {
// ast_free_shebang_node(node->value.shebang);
// } break;
// case AstStatement: {
// ast_free_statement_node(node->value.statement);
// } break;
// case AstStatementList: {
// ast_free_statement_list_node(node->value.statement_list);
// } break;
// case AstStringExpression: {
// ast_free_string_expression_node(node->value.string_expression);
// } break;
// case AstStructTypeDeclaration: {
// ast_free_struct_type_declaration_node(node->value.struct_type_declaration);
// } break;
// case AstStructuredTypeExpression: {
// ast_free_structured_type_expression_node(node->value.structured_type_expression);
// } break;
// case AstTypeDeclaration: {
// ast_free_type_declaration_node(node->value.type_declaration);
// } break;
// case AstTypeExpression: {
// ast_free_type_expression_node(node->value.type_expression);
// } break;
// case AstTypeIdentifier: {
// ast_free_type_identifier_node(node->value.type_identifier);
// } break;
// case AstUnionTypeDeclaration: {
// ast_free_union_type_declaration_node(node->value.union_type_declaration);
// } break;
// default: {
// LOG_ERROR("Invalid AstNode kind");
// exit(1);
// }
// }

// free(node);
// }

/*************************/
/* BindingStatementNode */
/*************************/
struct BindingStatementNode* ast_new_binding_statement_node(
AstNodeKind kind,
union BindingStatementNodeUnion value
) {
struct BindingStatementNode* node = malloc(sizeof(struct BindingStatementNode));
node->kind = kind;
node->value = value;
return node;
}

// int ast_free_binding_statement_node(struct BindingStatementNode* node) {
// switch (node->kind) {
// case AstLetBinding: {
// ast_free_let_binding_node(node->value.let_binding);
// } break;
// case AstMutBinding: {
// ast_free_mut_binding_node(node->value.mut_binding);
// } break;
// default: {
// LOG_ERROR("Invalid AstNode kind");
// exit(1);
// }
// }

// free(node);
// }

struct BindingStatementNode* ast_parse_binding_statement(struct Token** tokens) {
_CHECK_TOKENS();
Expand Down
6 changes: 3 additions & 3 deletions std/compiler/parser/ast/binding_statement_node.day
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ fun ast_new_binding_statement_node (kind: AstNodeKind value: BindingStatementNod
node
end

fun ast_free_binding_statement_node(node_ptr: ptr<AstNode>) int do
let node: AstNode <- (deref node_ptr)
fun ast_free_binding_statement_node(node_ptr: ptr<BindingStatementNode>) int do
let node: BindingStatementNode <- (deref node_ptr)
let kind: AstNodeKind <- node.kind
let value: AstNodeUnion <- node.value
let value: BindingStatementNodeUnion <- node.value

match
(eq kind #AstNodeKind.AstLetBinding) =>
Expand Down

0 comments on commit db1dc3d

Please sign in to comment.