Fix/build issue fix (#2)

* accidentally left out a function in the wrong utils

* Added missing dependency of `data_structures` to main target

* CMake: added source file to main target that was missed

* Updated platform.c, added missing macro definitions in utils.h

* Added missing includes

* Fixed comments for `https://` got affected accidentally by formatting change

* Removed test code from main

* formatting, removed college-related information

* Added needed stdio.h include

* Updated "server" target

Author: nb-programmer

CMakeLists.txt

@@ -13,25 +13,33 @@ add_subdirectory("lib/basic_system_interface/")
 add_subdirectory("lib/data_structures/")
 
 # Build the main project executable
-add_executable(${CMAKE_PROJECT_NAME}
-    "src/main.c"
+add_executable(server
+    "src/http_server_main.c"
 
     "src/http.c"
     "src/http.h"
     "src/tcpserver.c"
     "src/tcpserver.h"
     "src/utils.c"
     "src/utils.h"
+    "src/platform/platform.c"
+    "src/platform/platform.h"
 )
 
 # Add some preprocessor defines
-target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:DEBUG>")
+target_compile_definitions(server
+    PUBLIC "$<$<CONFIG:DEBUG>:DEBUG>"
+)
 
-add_dependencies(${CMAKE_PROJECT_NAME} basic)
+add_dependencies(server
+    basic
+    data_structures
+)
 
-target_link_libraries(${CMAKE_PROJECT_NAME}
+target_link_libraries(server
     PRIVATE
         basic::basic
+        data_structures::data_structures
 )
 
 # Build the main project executable

lib/basic/include/basic/ast.h

@@ -4,95 +4,103 @@ typedef char StringLiteral[101];
 
 /* Abstract Syntax Tree */
 
-typedef union {
-    float flt;
-    int num;
-    StringLiteral str;
+typedef union
+{
+	float flt;
+	int num;
+	StringLiteral str;
 } Literal;
 
-typedef enum {
-    OP_NONE,
-
-    // Unary
-    OP_NOT,
-    OP_NEGATE,
-
-    // Binary
-    OP_ADD,
-    OP_SUB,
-    OP_MUL,
-    OP_DIV,
-    OP_MOD,
-    OP_EQ,
-    OP_LT,
-    OP_GT,
-    OP_ASSIGN,
-
-    // Separator, only used during parsing
-    OP_OPEN_PAREN,
-    OP_CLOSE_PAREN
+typedef enum
+{
+	OP_NONE,
+
+	// Unary
+	OP_NOT,
+	OP_NEGATE,
+
+	// Binary
+	OP_ADD,
+	OP_SUB,
+	OP_MUL,
+	OP_DIV,
+	OP_MOD,
+	OP_EQ,
+	OP_LT,
+	OP_GT,
+	OP_ASSIGN,
+
+	// Separator, only used during parsing
+	OP_OPEN_PAREN,
+	OP_CLOSE_PAREN
 } ASTOperator;
 
-typedef enum {
-    OPTYPE_NONE,
-    OPTYPE_UNARY,
-    OPTYPE_BINARY,
-    OPTYPE_TERNARY
+typedef enum
+{
+	OPTYPE_NONE,
+	OPTYPE_UNARY,
+	OPTYPE_BINARY,
+	OPTYPE_TERNARY
 } ASTOperatorType;
 
-typedef union {
-    int generic;
-    // For keyword / operation / function call
-    StringLiteral kw;
+typedef union
+{
+	int generic;
+	// For keyword / operation / function call
+	StringLiteral kw;
 
-    // For a variable name
-    StringLiteral variable_name;
+	// For a variable name
+	StringLiteral variable_name;
 
-    // token_type is used for following
+	// token_type is used for following
 
-    // For a literal number/string
-    Literal literal;
-    // For ALU operation
-    ASTOperator op;
+	// For a literal number/string
+	Literal literal;
+	// For ALU operation
+	ASTOperator op;
 } ASTData;
 
-typedef enum {
-    DTYPE_NONE,
-    DTYPE_STR,
-    DTYPE_NUM,
-    DTYPE_FLT,
-    DTYPE_SYMB
+typedef enum
+{
+	DTYPE_NONE,
+	DTYPE_STR,
+	DTYPE_NUM,
+	DTYPE_FLT,
+	DTYPE_SYMB
 } ASTDType;
 
-typedef struct {
-    ASTData token;
-    ASTDType token_type;
+typedef struct
+{
+	ASTData token;
+	ASTDType token_type;
 } ASTNodeData;
 
-typedef enum {
-    AST_NONE,
-    AST_PROGRAM_SEQUENCE,
+typedef enum
+{
+	AST_NONE,
+	AST_PROGRAM_SEQUENCE,
 
-    // Operation
-    AST_KEYWORD,
-    AST_EXPRESSION,
-    AST_OPERATION,
-    AST_CONDITION,
+	// Operation
+	AST_KEYWORD,
+	AST_EXPRESSION,
+	AST_OPERATION,
+	AST_CONDITION,
 
-    // Data
-    AST_IMMEDIATE,
-    AST_VARIABLE,
+	// Data
+	AST_IMMEDIATE,
+	AST_VARIABLE,
 
-    // Call to function
-    AST_FUNC_CALL,
+	// Call to function
+	AST_FUNC_CALL,
 } ASTNodeType;
 
-typedef struct _ast_node {
-    ASTNodeType type;
-    ASTNodeData data;
+typedef struct _ast_node
+{
+	ASTNodeType type;
+	ASTNodeData data;
 
-    struct _ast_node *next;
-    struct _ast_node *child;
+	struct _ast_node *next;
+	struct _ast_node *child;
 } ASTNode;
 
 // Void data

lib/basic/include/basic/basic.h

@@ -4,12 +4,12 @@
 
 /**
  * BASIC interpreter steps:
- * 
+ *
  * 0. BASIC program source code input
  * 1. BASIC Lexer (Program source to tokens)
  * 2. BASIC Parser (Tokens to AST)
  * 3. Execute AST sequentially (Program run)
- * 
+ *
  * */
 
 #include "ast.h"
@@ -19,49 +19,53 @@
 extern unsigned int log_print_mask;
 
 // Log level mask
-#define LOGTYPE_DEBUG   (1 << 0)
-#define LOGTYPE_INFO    (1 << 1)
+#define LOGTYPE_DEBUG (1 << 0)
+#define LOGTYPE_INFO (1 << 1)
 #define LOGTYPE_MESSAGE (1 << 2)
-#define LOGTYPE_ERROR   (1 << 3)
-#define LOGMASK_ALL     0xffff
+#define LOGTYPE_ERROR (1 << 3)
+#define LOGMASK_ALL 0xffff
 
 // Printf modified to allow only selected messages
 void lprintf(const char *tag, unsigned int level_mask, const char *format, ...);
 
 /* AST parser (tokenizer) */
 
-typedef enum {
-    TOKEN_IDENTIFIER,
-    TOKEN_KEYWORD,
-    TOKEN_WHITESPACE,
-    TOKEN_OPERATOR,
-    TOKEN_SEPARATOR,
-    TOKEN_NUM,
-    TOKEN_BOOL,
-    TOKEN_STRING,
-    TOKEN_END
+typedef enum
+{
+	TOKEN_IDENTIFIER,
+	TOKEN_KEYWORD,
+	TOKEN_WHITESPACE,
+	TOKEN_OPERATOR,
+	TOKEN_SEPARATOR,
+	TOKEN_NUM,
+	TOKEN_BOOL,
+	TOKEN_STRING,
+	TOKEN_END
 } BASICTokenType;
 
-typedef struct {
-    StringLiteral token;
-    BASICTokenType token_type;
-    char *token_at;
+typedef struct
+{
+	StringLiteral token;
+	BASICTokenType token_type;
+	char *token_at;
 } BASICToken;
 
 // Structure with all the stuff needed to convert a BASIC program to an AST
-typedef struct {
-    // List of tokens
-    BASICToken *tokens;
-    int tokens_length;
-    // Stack for knowning current scope
+typedef struct
+{
+	// List of tokens
+	BASICToken *tokens;
+	int tokens_length;
+	// Stack for knowning current scope
 } BASICParseTree;
 
-typedef struct {
-    char *program_source;
-    BASICParseTree program_tokens;
-    ASTNode *program_sequence;
-    // Map between line number and which instruction to execute on that line. For non-linear control flow
-    // BASICLineNode program_line_instruction;
+typedef struct
+{
+	char *program_source;
+	BASICParseTree program_tokens;
+	ASTNode *program_sequence;
+	// Map between line number and which instruction to execute on that line. For non-linear control flow
+	// BASICLineNode program_line_instruction;
 } BASICProgram;
 
 BASICProgram *basic_create_program();
@@ -77,12 +81,12 @@ extern char PARSE_SEPARATOR[];
 extern char PARSE_WS_CHAR[];
 
 // Index of the keyword in the above PARSE_KEYWORDS array
-#define KEYWORD_IDX_WHILE       0
-#define KEYWORD_IDX_IF          1
-#define KEYWORD_IDX_THEN        2
-#define KEYWORD_IDX_ELSE        3
-#define KEYWORD_IDX_END         4
-#define KEYWORD_IDX_GOTO        5
+#define KEYWORD_IDX_WHILE 0
+#define KEYWORD_IDX_IF 1
+#define KEYWORD_IDX_THEN 2
+#define KEYWORD_IDX_ELSE 3
+#define KEYWORD_IDX_END 4
+#define KEYWORD_IDX_GOTO 5
 
 // Lexer
 int basic_tokenize(BASICProgram *program);
@@ -96,30 +100,32 @@ int basic_parse_to_ast_between_onlyexpr(BASICParseTree *ptree, ASTNode *root, in
 int basic_parse_to_ast_between(BASICParseTree *ptree, ASTNode *root, int from, int to);
 int basic_parse_to_ast(BASICProgram *program);
 
-
 /* BASIC interpreter */
 
-typedef enum {
-    KW_DO_NOTHING,
-    KW_JMP_ONLY,
-    KW_JMP_AND_RET_NEXT,
-    KW_JMP_AND_RET_CURR
+typedef enum
+{
+	KW_DO_NOTHING,
+	KW_JMP_ONLY,
+	KW_JMP_AND_RET_NEXT,
+	KW_JMP_AND_RET_CURR
 } KeywordAction;
 
-typedef struct {
-    ASTNodeData value;
-    StringLiteral name;
+typedef struct
+{
+	ASTNodeData value;
+	StringLiteral name;
 } BASICVariable;
 
-typedef struct {
-    BASICProgram *program;
-    int halt;
-    BASICVariable *variables;
-    int var_count;
-    StackNode *traverse_stack;
+typedef struct
+{
+	BASICProgram *program;
+	int halt;
+	BASICVariable *variables;
+	int var_count;
+	StackNode *traverse_stack;
 } BASICRuntime;
 
-typedef ASTNodeData(*basic_function)(BASICRuntime *runtime, ASTNode *args);
+typedef ASTNodeData (*basic_function)(BASICRuntime *runtime, ASTNode *args);
 
 /* Public functions */
 BASICRuntime *basic_create_runtime(BASICProgram *program);