Checkpoint

ExoKomodo · Sep 27, 2022 · 0145afd · 0145afd
1 parent 2f426d5
commit 0145afd
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 20 deletions.
diff --git a/bootstrap/linux/daybreak b/bootstrap/linux/daybreak
diff --git a/src/include/parser/ast.h b/src/include/parser/ast.h
@@ -231,10 +231,10 @@ union TypeExpressionNodeUnion {
 /* Type Definitions */
 /********************/
 
-struct AstNode {
+typedef struct AstNode {
   AstNodeKind kind;
   union AstNodeUnion value;
-};
+} AstNode;
 
 struct BindingStatementNode {
   AstNodeKind kind;
@@ -490,7 +490,6 @@ struct UnionTypeDeclarationNode {
 /* Function Declarations */
 /*************************/
 
-struct AstNode* ast_new_node(AstNodeKind, union AstNodeUnion);
 void ast_free_node(struct AstNode*);
 
 struct BindingStatementNode* ast_new_binding_statement_node(AstNodeKind, union BindingStatementNodeUnion);
@@ -724,16 +723,6 @@ bool ast_union_type_declaration_token_matches_first_set(struct Token);
 /***********/
 /* AstNode */
 /***********/
-struct AstNode* ast_new_node(
-  AstNodeKind kind,
-  union AstNodeUnion value
-) {
-  struct AstNode* node = malloc(sizeof(struct AstNode));
-  node->kind = kind;
-  node->value = value;
-  return node;
-}
-
 void ast_free_node(struct AstNode* node) {
   switch (node->kind) {
     case AstBindingStatement: {

diff --git a/src/include/std/log/ansi_log.h b/src/include/std/log/ansi_log.h
@@ -4,7 +4,7 @@
 #include <std/ansi/colors.h>
 
 #ifndef DEBUG
-  #define DEBUG false
+  #define DEBUG true
 #endif
 
 #if DEBUG

diff --git a/src/main.day b/src/main.day
@@ -1,5 +1,6 @@
 import "std/log/prelude.day"
 import "std/compiler/api.day"
+import "std/compiler/parser.day"
 
 fun main (argc: int argv: ptr<ccstring>) int do
 	(daybreak_greeting)

diff --git a/std/compiler/parser.day b/std/compiler/parser.day
@@ -0,0 +1 @@
+import "std/compiler/parser/prelude.day"
diff --git a/std/compiler/parser/ast.day b/std/compiler/parser/ast.day
@@ -1,2 +1 @@
-import "std/compiler/parser/types.day"
 import "std/compiler/parser/ast/prelude.day"
diff --git a/std/compiler/parser/ast/ast_node.day b/std/compiler/parser/ast/ast_node.day
@@ -1,4 +1,11 @@
+type AstNodeUnion union is
+
+end
+
 fun ast_new_node (kind: AstNodeKind value: AstNodeUnion) ptr<AstNode> do
-	mut node: ptr<AstNode> <- (malloc
-		(mul (sizeof AstNode)))
+	mut node: ptr<AstNode> <- new {AstNode
+		kind <- kind
+		value <- value
+	}
+	node
 end
diff --git a/std/compiler/parser/ast/prelude.day b/std/compiler/parser/ast/prelude.day
@@ -1 +1 @@
-import "compiler/parser/ast/ast_node.day"
+import "std/compiler/parser/ast/ast_node.day"
diff --git a/std/compiler/parser/prelude.day b/std/compiler/parser/prelude.day
@@ -1,4 +1,3 @@
 import "std/compiler/parser/ast.day"
-import "std/compiler/parser/types.day"
 
-importc "compiler/parser/prelude.h"
+importc "parser/prelude.h"
diff --git a/std/compiler/parser/types.day b/std/compiler/parser/types.day
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		import "std/compiler/parser/types.day"
		import "std/compiler/parser/ast/prelude.day"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import "compiler/parser/ast/ast_node.day"
		import "std/compiler/parser/ast/ast_node.day"