Added almost all expr operators

new_ast.c

@@ -41,11 +41,13 @@ typedef enum Expr_Kind{
   EK_Int,
   EK_String,
   EK_Identifier,
+  EK_Paren, 
+  EK_PostfixUnary, 
   EK_Unary, 
   EK_Binary, 
   EK_Ternary,
   EK_Cast,
-  EK_List, 
+  EK_Field,
   EK_Call, 
   EK_Index,
   EK_Sizeof,
@@ -59,18 +61,24 @@ struct Expr {
     U64 int_val;
     Intern_String intern_val;
     double float_val;
+    struct {
+      Expr *expr;
+    } paren;
     
     struct {
       Typespec *type;
       Expr* expr;
     } cast;
-    struct {
-      Expr *first;
-      Expr *last;
-    } list;
+    
+    struct{
+      Intern_String name;
+      Expr *expr;
+    }field;
+    
     struct {
       Expr *atom;
-      Expr *list;
+      Expr *first;
+      Expr *last;
     } call;
     struct {
       Expr *atom;
@@ -80,6 +88,10 @@ struct Expr {
       Token_Kind op;
       Expr* expr;
     } unary;
+    struct {
+      Token_Kind op;
+      Expr *expr;
+    } postfix_unary;
     struct {
       Token_Kind op;
       Expr* left;
@@ -90,6 +102,7 @@ struct Expr {
       Expr* on_true;
       Expr* on_false;
     } ternary;
+    
     struct{
       Expr_Sizeof_Kind kind;
       union{
@@ -128,13 +141,37 @@ expr_str(Arena *p, Token *token){
 }
 
 function Expr *
-expr_name(Arena *p, Token *token){
+expr_identifier(Arena *p, Token *token){
   assert(token->kind == TK_Identifier);
   Expr *expr = expr_new(p, EK_Identifier, token);
   expr->intern_val = token->intern_val;
   return expr;
 }
 
+function Expr *
+expr_field(Arena *p, Token *token, Expr *inexpr){
+  assert(token->kind == TK_Identifier);
+  Expr *expr = expr_new(p, EK_Field, token);
+  expr->field.expr = inexpr;
+  expr->field.name = token->intern_val;
+  return expr;
+}
+
+function Expr *
+expr_paren(Arena *p, Token *token, Expr *inexpr){
+  Expr *expr = expr_new(p, EK_Paren, token);
+  expr->paren.expr = inexpr;
+  return expr;
+}
+
+function Expr *
+expr_postfix_unary(Arena *p, Token *op, Expr *exp){
+  Expr *expr = expr_new(p, EK_PostfixUnary, op);
+  expr->unary.op = op->kind;
+  expr->unary.expr = exp;
+  return expr;
+}
+
 function Expr *
 expr_unary(Arena *p, Token *op, Expr *exp){
   Expr *expr = expr_new(p, EK_Unary, op);
@@ -162,10 +199,9 @@ expr_ternary(Arena *p, Token *op, Expr *cond, Expr *on_true, Expr *on_false){
 }
 
 function Expr *
-expr_call(Arena *p, Token *token, Expr *atom, Expr *list){
+expr_call(Arena *p, Token *token, Expr *atom){
   Expr *expr = expr_new(p, EK_Call, token);
   expr->call.atom = atom;
-  expr->call.list = list;
   return expr;
 }
 
@@ -201,104 +237,7 @@ expr_sizeof_expr(Arena *p, Token *token, Expr *in_expr){
   return expr;
 }
 
-function Expr *
-expr_list(Arena *p, Token *token){
-  Expr *expr = expr_new(p, EK_List, token);
-  return expr;
-}
-
 function void
-expr_list_push(Expr *list, Expr *expr){
-  SLLQueuePush(list->list.first, list->list.last, expr);
+expr_call_push(Expr *list, Expr *expr){
+  SLLQueuePush(list->call.first, list->call.last, expr);
 }
-
-//-----------------------------------------------------------------------------
-// 
-//-----------------------------------------------------------------------------
-function void
-token_print(Token *token){
-  printf("%.*s", (S32)token->len, token->str);
-}
-
-function void
-expr_print(Expr *expr){
-  switch(expr->kind) {
-    case EK_Int: 
-    case EK_String: {
-      token_print(expr->token);
-    } break;
-    
-    case EK_Sizeof:{
-      printf("sizeof(");
-      if(expr->size_of.kind == SIZEOF_Expr){
-        expr_print(expr->size_of.expr);
-      }
-      else{
-        assert(expr->size_of.kind == SIZEOF_Type);
-        //print_typespec(expr->size_of.type);
-      }
-      printf(")");
-    }break;
-    
-    case EK_Binary:{
-      printf("(");
-      expr_print(expr->binary.left);
-      token_print(expr->token);
-      expr_print(expr->binary.right);
-      printf(")");
-    } break;
-    case EK_Unary:{
-      printf("(");
-      token_print(expr->token);
-      expr_print(expr->unary.expr);
-      printf(")");
-    } break;
-    
-    case EK_Ternary:{
-      printf("(");
-      expr_print(expr->ternary.cond);
-      printf("?");
-      expr_print(expr->ternary.on_true);
-      printf(":");
-      expr_print(expr->ternary.on_false);
-      printf(")");
-    } break;
-    case EK_List:{
-      printf("(");
-      for(Expr *n = expr->list.first; n; n=n->next){
-        expr_print(n);
-        if(n!=expr->list.last) printf(",");
-      }
-      printf(")");
-    }break;
-    
-    case EK_Cast:{
-      printf("(");
-      printf("(");
-      //print_typespec(expr->cast.type);
-      printf(")");
-      expr_print(expr->cast.expr);
-      printf(")");
-    } break;
-    
-    case EK_Index:{
-      expr_print(expr->index.atom);
-      printf("[");
-      expr_print(expr->index.index);
-      printf("]");
-    }break;
-    
-    case EK_Call:{
-      expr_print(expr->call.atom);
-      printf("(");
-      expr_print(expr->call.list);
-      printf(")");
-    }break;
-    default: {invalid_codepath;} break;
-  }
-}
-
-function void
-test_ast(){
-  
-}