AST WIP

Author: CHiPs44

include/ps_ast.h

@@ -79,15 +79,14 @@ extern "C"
     /** @details Units may be separated as they are special cases with interface and implementation */
     typedef struct s_ps_ast_block
     {
-        PS_AST_NODE_COMMON ps_identifier name; /** @brief Every block has a name                                    */
-        struct s_ps_ast_block *parent;         /** @brief Parent block, NULL for PROGRAM */
-        size_t n_vars;                         /** @brief Number of variables to allocate at startup                */
-        ps_symbol_table *symbols;              /** @brief Constants, types, variables, procedures and functions     */
-        size_t n_executables;                  /** @brief exactly 1 for procedure and function, 0 or more otherwise */
-        struct s_ps_ast_block **executables;   /** @brief declarations of procedures and functions                  */
-        ps_ast_statement_list *statement_list; /** @brief Statements for this block                                 */
-        ps_formal_signature *signature;        /** @brief Only for procedures and functions, NULL otherwise         */
-        ps_symbol *result_type;                /** @brief Only for functions, NULL otherwise                        */
+        PS_AST_NODE_COMMON
+        ps_identifier name;                    /** @brief Every block has a name                                */
+        struct s_ps_ast_block *parent;         /** @brief Parent block, NULL for PROGRAM                        */
+        size_t n_vars;                         /** @brief Number of variables to allocate at startup            */
+        ps_symbol_table *symbols;              /** @brief Constants, types, variables, procedures and functions */
+        ps_ast_statement_list *statement_list; /** @brief Statements for this block                             */
+        ps_formal_signature *signature;        /** @brief Only for procedures and functions, NULL otherwise     */
+        ps_symbol *result_type;                /** @brief Only for functions, NULL otherwise                    */
     } ps_ast_block;
 
     /** @brief IF statement */

include/ps_compiler.h

@@ -33,7 +33,7 @@ extern "C"
         COMPILER_DEBUG_NONE,    /** @brief No debug */
         COMPILER_DEBUG_TRACE,   /** @brief Output messages to stderr */
         COMPILER_DEBUG_VERBOSE, /** @brief More traces */
-    } ps_compiler_debug;
+    } __attribute__((__packed__)) ps_compiler_debug;
 
     typedef struct s_ps_compiler
     {
@@ -46,9 +46,6 @@ extern "C"
         bool range_check;            /** @brief Range checking for integer and real values                   */
         bool bool_eval;              /** @brief *FUTURE* Short circuit boolean evaluation                    */
         bool io_check;               /** @brief *FUTURE* stop or set IOResult on I/O error                   */
-        ps_environment
-            *environments[PS_COMPILER_ENVIRONMENTS]; /** @brief Environments with enough levels for some recursion */
-        ps_ast_node *ast;                            /** @brief AST */
     } /*__attribute__((__packed__))*/ ps_compiler;
 
 #define PS_COMPILER_SIZEOF sizeof(ps_compiler)

include/ps_parse_declaration.h

@@ -17,13 +17,14 @@ extern "C"
 {
 #endif
 
-    /* src/ps_parse_declaration.c */
-    ps_ast_node *ps_parse_program(ps_compiler *compiler);
-    ps_ast_node *ps_parse_uses(ps_compiler *compiler);
-    ps_ast_node *ps_parse_const(ps_compiler *compiler);
-    ps_ast_node *ps_parse_type(ps_compiler *compiler);
-    ps_ast_node *ps_parse_var(ps_compiler *compiler);
-    ps_ast_node *ps_parse_block(ps_compiler *compiler);
+    // clang-format off
+    bool ps_parse_program(ps_compiler *compiler, ps_ast_block *block);
+    bool ps_parse_uses   (ps_compiler *compiler, ps_ast_block *block);
+    bool ps_parse_const  (ps_compiler *compiler, ps_ast_block *block);
+    bool ps_parse_type   (ps_compiler *compiler, ps_ast_block *block);
+    bool ps_parse_var    (ps_compiler *compiler, ps_ast_block *block);
+    bool ps_parse_block  (ps_compiler *compiler, ps_ast_block *block);
+    // clang-format on
 
 #ifdef __cplusplus
 }

src/ps_ast.c

@@ -113,7 +113,7 @@ ps_ast_block *ps_ast_create_block(uint16_t line, uint16_t column, ps_ast_block *
         return NULL;
     snprintf(block->name, PS_IDENTIFIER_LEN, "%s", name);
     block->parent = parent;
-    block->symbols = NULL;
+    block->symbols = ps_symbol_table_alloc(0, 0);
     block->signature = NULL;
     block->result_type = NULL;
     block->n_vars = 0;

src/ps_ast_test.c

@@ -67,8 +67,6 @@ ps_ast_block *ps_ast_test_create_block_program(const char *name)
     ASSERT_GOTO_CLEANUP(block_program->column == 1);
     ASSERT_GOTO_CLEANUP(strcmp(block_program->name, name) == 0);
     ASSERT_GOTO_CLEANUP(block_program->n_vars == 0);
-    ASSERT_GOTO_CLEANUP(block_program->n_executables == 0);
-    ASSERT_GOTO_CLEANUP(block_program->executables == NULL);
     ASSERT_GOTO_CLEANUP(block_program->statement_list == NULL);
     ASSERT_GOTO_CLEANUP(block_program->signature == NULL);
     ASSERT_GOTO_CLEANUP(block_program->result_type == NULL);

src/ps_parse.c

@@ -6,31 +6,26 @@
 
 #include <string.h>
 
+#include "ps_ast.h"
 #include "ps_compiler.h"
-#include "ps_functions.h"
 #include "ps_parse.h"
 #include "ps_parse_declaration.h"
-#include "ps_parser.h"
-#include "ps_procedures.h"
-#include "ps_string.h"
-#include "ps_system.h"
 
 /**
  * Parse
  *  PROGRAM IDENTIFIER [ '(' [ IDENTIFIER { ',' IDENTIFIER } ] ')' ] ';'
  *  BLOCK
  *  '.'
  */
-ps_ast_node *ps_parse_start(ps_compiler *compiler)
+ps_ast_block *ps_parse_start(ps_compiler *compiler, ps_ast_block *block_program)
 {
     PARSE_BEGIN("START", "")
 
-    READ_NEXT_TOKEN
+    READ_NEXT_TOKEN()
     switch (lexer->current_token.type)
     {
     case PS_TOKEN_PROGRAM:
-        ast = ps_parse_program(compiler);
-        if (NULL == ast)
+        if (!ps_parse_program(compiler, block_program))
             TRACE_ERROR("PROGRAM")
         break;
     case PS_TOKEN_UNIT: