Type check alpha 2, fixes everywhere

Author: iamsubhranil

display.c

@@ -53,16 +53,23 @@ void pmgn(const char* msg, ...){
     printf(ANSI_COLOR_RESET);
 }
 
+#ifdef DEBUG
 void dbg2(const char* msg, ...){
+#else
+void dbg(const char* msg, ...){
+#endif
     printf(ANSI_FONT_BOLD);
     printf(ANSI_COLOR_GREEN "\n[Debug] ");
     printf(ANSI_COLOR_RESET);
     va_list args;
     va_start(args, msg);
     vprintf(msg, args);
 }
-
+#ifdef DEBUG
+void info2(const char* msg, ...){
+#else
 void info(const char* msg, ...){
+#endif
     printf(ANSI_FONT_BOLD);
     printf(ANSI_COLOR_BLUE "\n[Info] ");
     printf(ANSI_COLOR_RESET);
@@ -71,7 +78,11 @@ void info(const char* msg, ...){
     vprintf(msg, args);
 }
 
+#ifdef DEBUG
+void err2(const char* msg, ...){
+#else
 void err(const char* msg, ...){
+#endif
     printf(ANSI_FONT_BOLD);
     printf(ANSI_COLOR_RED "\n[Error] ");
     printf(ANSI_COLOR_RESET);
@@ -80,7 +91,11 @@ void err(const char* msg, ...){
     vprintf(msg,args);
 }
 
+#ifdef DEBUG
+void warn2(const char* msg, ...){
+#else
 void warn(const char* msg, ...){
+#endif
     printf(ANSI_FONT_BOLD);
     printf(ANSI_COLOR_YELLOW "\n[Warning] ");
     printf(ANSI_COLOR_RESET);

display.h

@@ -18,11 +18,24 @@ void pylw(const char *msg, ...);
 void pcyn(const char *msg, ...);
 void pmgn(const char *msg, ...);
 
+#ifdef DEBUG
 #define dbg(x, ...) dbg2( ANSI_FONT_BOLD "<%s:%d> " ANSI_COLOR_RESET x, __FILE__, __LINE__, ##__VA_ARGS__)
 void dbg2(const char *msg, ...);
+
+#define err(x, ...) err2( ANSI_FONT_BOLD "<%s:%d> " ANSI_COLOR_RESET x, __FILE__, __LINE__, ##__VA_ARGS__)
+void err2(const char *msg, ...);
+
+#define info(x, ...) info2( ANSI_FONT_BOLD "<%s:%d> " ANSI_COLOR_RESET x, __FILE__, __LINE__, ##__VA_ARGS__)
+void info2(const char *msg, ...);
+
+#define warn(x, ...) warn2( ANSI_FONT_BOLD "<%s:%d> " ANSI_COLOR_RESET x, __FILE__, __LINE__, ##__VA_ARGS__)
+void warn2(const char *msg, ...);
+#else
+void dbg2(const char *msg, ...);
 void err(const char *msg, ...);
 void info(const char *msg, ...);
 void warn(const char *msg, ...);
+#endif
 
 void lnerr(const char *msg, Token t, ...);
 void lnwarn(const char *msg, Token t, ...);

expr.c

@@ -67,10 +67,13 @@ void expr_dispose2(Expression *exp){
 void expr_dispose(){
     for(uint64_t i = 0;i < cache_pointer;i++){
       //  if(cache[i] != NULL)
-      if(cache[i]->type == EXPR_CALL){
+      if(cache[i]->type == EXPR_CALL || cache[i]->type == EXPR_DEFINE){
             free(cache[i]->calex.args);
       }
-            free(cache[i]);
+      else if(cache[i]->type == EXPR_CONSTANT && cache[i]->consex.token.type == TOKEN_string){
+            free(cache[i]->consex.sval);
+      }
+        free(cache[i]);
     }
     free(cache);
 }

lexer.c

@@ -9,9 +9,6 @@
 #include "display.h"
 
 
-/* The code below is for testing and debugging purposes.
- * =====================================================
- */
 
 #ifdef DEBUG
 
@@ -21,13 +18,23 @@ static const char* tokenStrings[] = {
 #undef ET
 };
 
+#endif
+
 void lexer_print_token(Token t, uint8_t printType){
     for(uint64_t i = 0;i < t.length;i++)
         pmgn("%c", t.string[i]);
+#ifdef DEBUG
     if(printType)
         pblue("(%s) \t", tokenStrings[t.type]);
+#endif
 }
 
+/* The code below is for testing and debugging purposes.
+ * =====================================================
+ */
+
+#ifdef DEBUG
+
 void lexer_print_tokens(TokenList list){
     size_t prevLine = 0;
     for(uint64_t i = 0;i < list.count;i++){
@@ -249,6 +256,8 @@ static Token nextToken(uint8_t atStart){
     return makeToken(unknown);
 }
 
+static uint64_t hasErrors = 0;
+
 TokenList tokens_scan(const char* line){
     source = strdup(line);
     length = strlen(source);
@@ -265,6 +274,7 @@ TokenList tokens_scan(const char* line){
             lexer_print_token(t, 0);
             printf("'");
             token_print_source(list.tokens[list.count - 1], 1);
+            hasErrors++;
         }
     }
     if(list.tokens[list.count - 1].type != TOKEN_eof)
@@ -277,3 +287,7 @@ void tokens_free(TokenList list){
     free(list.tokens);
     free(list.source);
 }
+
+uint64_t lexer_has_errors(){
+    return hasErrors;
+}

lexer.h

@@ -30,9 +30,11 @@ typedef struct{
 TokenList tokens_scan(const char *source);
 void tokens_free(TokenList list);
 void token_print_source(Token t, uint8_t reportType);
+void lexer_print_token(Token t, uint8_t printType);
+uint64_t lexer_has_errors();
+
 //#define DEBUG
 
 #ifdef DEBUG
 void lexer_print_tokens(TokenList list);
-void lexer_print_token(Token t, uint8_t printType);
 #endif

main.c

@@ -47,21 +47,26 @@ int main(int argc, char *argv[]){
         exit(EXIT_FAILURE);
     }
     TokenList l = tokens_scan(source);
+#ifdef DEBUG
     lexer_print_tokens(l);
-    
+#endif
     stmt_init();
     expr_init();
 
     BlockStatement s = parse(l);
+#ifdef DEBUG
     blockstmt_print(s);
+#endif
     printf("\n");
     fflush(stdout);
     type_check(s); 
     printf("\n");
-
+    
+    type_dispose();
     blockstmt_dispose(s);
     tokens_free(l);
     free(source);
     stmt_dispose();
+    expr_dispose();
     return 0;
 }

parser.c

@@ -166,7 +166,7 @@ static Expression* _primary(){
             Expression *ex = expr_new(EXPR_REFERENCE);
             ex->refex.token = previousToken;
             advance();
-            ex->refex.refer = expression();
+            ex->refex.refer = _primary();
             switch(ex->refex.refer->type){
                 case EXPR_REFERENCE:
                 case EXPR_VARIABLE:
@@ -389,7 +389,6 @@ static Statement* statement_Container(){
 
 static Statement* statement_Return(){
     Statement *ret = stmt_new2(RETURN);
-    ret->rets.token = previousToken;
     Expression *ex = expression();
     ret->rets.value = ex;
     return ret;
@@ -448,9 +447,15 @@ static Statement* statement(){
         switch(presentToken.type){
 #define KEYWORD(name, a) \
             case TOKEN_##name: \
-                               consume2(TOKEN_##name); \
-            return statement_##name(); \
-            break;
+            { \
+            Token bak = presentToken; \
+            consume2(TOKEN_##name); \
+            Statement *s = statement_##name(); \
+            if(s != NULL) \
+                s->token = bak; \
+            return s; \
+            break; \
+        }
 #include "keywords.h"
 #undef KEYWORD
             default:
@@ -477,3 +482,7 @@ BlockStatement parse(TokenList l){
     }
     return ret;
 }
+
+uint64_t parser_has_errors(){
+    return hasErrors;
+}

parser.h

@@ -6,3 +6,4 @@
 #include <stdbool.h>
 
 BlockStatement parse(TokenList list);
+uint64_t parser_has_errors();

stmt.h

@@ -20,7 +20,6 @@ typedef struct{
 } BlockStatement;
 
 typedef struct IfStatement{
-    Token token;
     Expression *condition;
     BlockStatement thenBlock;
     Statement *elseIf;
@@ -43,7 +42,6 @@ typedef struct{
 } DefineStatement;
 
 typedef struct{
-    Token token;
     Expression *value;
 } ReturnStatement;
 
@@ -70,6 +68,7 @@ typedef enum{
 
 struct Statement{
     StatementType type;
+    Token token;
     union{
         SetStatement sets;
         PrintStatement prints;

tests/typetest.algi

@@ -11,6 +11,11 @@ Container Mine(){
 }
 Structure a = Mine()
 String k = a.mem2.bool
+String s2 = a.mem1.bool
+Boolean right = a.mem1.bool
+Set done = a.mem1.bool
+Set another = 5
+Set a.mem1.bool = another
 Define Function(){
     Integer localVar = i
 }
@@ -20,6 +25,9 @@ Set q = t.localVar
 Container LinkedList(){
     Set value = Null
     Set next = Null
+    Container Another(){
+        Set mem = 0
+    }
 }
 
 Set head = Null
@@ -28,3 +36,34 @@ Define InsertAtBeg(Node){
     Set Node.next = head
     Set head = Node
 }
+
+Define InsertAtEnd(Node){
+    Set temp = head
+    While(temp.next != Null){
+        Set temp = temp.next
+    }
+    Set temp.next = Node
+}
+
+Define MultipleReturn(){
+    Integer iValue = 10
+    String gValue = "Hello World"
+    If(True){
+        Return iValue
+    }
+    Else{
+        Return gValue
+    }
+}
+
+Number ret = MultipleReturn()
+Set c = "What?"
+If(ret < c){
+    Print "Hoorray!"
+}
+
+Define NestedRoutine(){
+    Define Child(){
+        String int = 13
+    }
+}