Parsing expressions

new_lex.c

@@ -1,5 +1,6 @@
 global Intern_String keyword_if;
 global Intern_String keyword_for;
+global Intern_String keyword_cast;
 global Intern_String keyword_else;
 global Intern_String keyword_sizeof;
 global Intern_String keyword_typeof;
@@ -17,6 +18,7 @@ init_default_keywords(Intern_Table *t){
   keyword_if = intern_string(t, lit("if"));
   first_keyword = keyword_if.s.str;
   
+  keyword_cast = intern_string(t, lit("cast"));
   keyword_for = intern_string(t, lit("for"));
   keyword_else = intern_string(t, lit("else"));
   keyword_sizeof = intern_string(t, lit("sizeof"));
@@ -39,14 +41,37 @@ lex_is_keyword(Intern_String str){
 
 typedef enum Token_Kind{
   TK_End,
+  
   TK_Mul,
   TK_Div,
+  TK_Mod,
+  TK_LeftShift,
+  TK_RightShift,
+  TK_FirstMul = TK_Mul,
+  TK_LastMul = TK_RightShift,
+  
   TK_Add,
   TK_Sub,
-  TK_Mod,
+  TK_FirstAdd = TK_Add,
+  TK_LastAdd = TK_Sub,
+  
+  TK_Equals,
+  TK_LesserThenOrEqual,
+  TK_GreaterThenOrEqual,
+  TK_LesserThen,
+  TK_GreaterThen,
+  TK_NotEquals,
+  TK_FirstCompare = TK_Equals,
+  TK_LastCompare = TK_NotEquals,
+  
   TK_BitAnd,
   TK_BitOr,
   TK_BitXor,
+  TK_And,
+  TK_Or,
+  TK_FirstLogical = TK_BitAnd,
+  TK_LastLogical = TK_Or,
+  
   TK_Neg,
   TK_Not,
   TK_OpenParen,
@@ -61,8 +86,7 @@ typedef enum Token_Kind{
   TK_ThreeDots,
   TK_Semicolon,
   TK_Dot,
-  TK_LesserThen,
-  TK_GreaterThen,
+  
   TK_Colon,
   TK_Assign,
   TK_DivAssign,
@@ -81,14 +105,7 @@ typedef enum Token_Kind{
   TK_Increment,
   TK_PostDecrement,
   TK_PostIncrement,
-  TK_LesserThenOrEqual,
-  TK_GreaterThenOrEqual,
-  TK_Equals,
-  TK_And,
-  TK_Or,
-  TK_NotEquals,
-  TK_LeftShift,
-  TK_RightShift,
+  
   TK_Arrow,
   TK_ExprSizeof,
   TK_DocComment,
@@ -488,7 +505,7 @@ lex_test(){
     TK_ThreeDots, TK_Dot, TK_Arrow, TK_Comma, TK_DoubleColon, TK_Colon,
     TK_StringLit, TK_Identifier, TK_StringLit, TK_AddAssign, TK_SubAssign,
     TK_Equals, TK_Int, TK_Int, TK_Int, TK_Keyword, TK_Keyword, 
-    TK_Keyword, TK_Keyword
+    TK_Keyword, TK_Keyword, TK_End
   };
   String strs[] = {
     lit("18446744073709551616"),lit("{"),lit("}"),lit(")"),lit("("),
@@ -496,7 +513,7 @@ lex_test(){
     lit("..."),lit("."),lit("->"),lit(","),lit("::"),lit(":"),
     lit("Thing"),lit("Thingy"),lit("Test_Meme"), lit("+="),lit("-="),
     lit("=="),lit("42524"),lit("4294967295"),lit("18446744073709551615"),
-    lit("for"), lit("if"), lit("while"), lit("switch"),
+    lit("for"), lit("if"), lit("while"), lit("switch"), lit(""),
   };
   U64 vals[] = {
     42524, 4294967295, 18446744073709551615llu
@@ -504,7 +521,7 @@ lex_test(){
   
   int i = 0;
   int ui = 0;
-  for(Token *t = token_array_iter_begin(&array); t; t = token_array_iter_next(&array)){
+  for(Token *t = token_array_iter_begin(&array); t->kind != TK_End; t = token_array_iter_next(&array)){
     assert(t->kind == kind[i]);
     assert(string_compare(t->string, strs[i++]));
     if(t->kind == TK_Int){
@@ -514,3 +531,71 @@ lex_test(){
   arena_end_scratch();
   
 }
+
+//-----------------------------------------------------------------------------
+// Token metadata
+//-----------------------------------------------------------------------------
+global const char *token_kind_string[] = {
+  [TK_End] = "End of stream",
+  [TK_Mul] = "*",
+  [TK_Div] = "/",
+  [TK_Add] = "+",
+  [TK_Sub] = "-",
+  [TK_Mod] = "%",
+  [TK_BitAnd] = "&",
+  [TK_BitOr] = "|",
+  [TK_BitXor] = "^",
+  [TK_Neg] = "~",
+  [TK_Not] = "!",
+  [TK_OpenParen] = "(",
+  [TK_CloseParen] = " ",
+  [TK_OpenBrace] = "{",
+  [TK_CloseBrace] = "}",
+  [TK_OpenBracket] = "[",
+  [TK_CloseBracket] = "]",
+  [TK_Comma] = ",",
+  [TK_Pound] = "#",
+  [TK_Question] = "?",
+  [TK_ThreeDots] = "...",
+  [TK_Semicolon] = ";",
+  [TK_Dot] = ".",
+  [TK_LesserThen] = "<",
+  [TK_GreaterThen] = ">",
+  [TK_Colon] = ":",
+  [TK_Assign] = "=",
+  [TK_DivAssign] = "/=",
+  [TK_MulAssign] = "*=",
+  [TK_ModAssign] = "%=",
+  [TK_SubAssign] = "-=",
+  [TK_AddAssign] = "+=",
+  [TK_AndAssign] = "&=",
+  [TK_OrAssign] = "|=",
+  [TK_XorAssign] = "^=",
+  [TK_LeftShiftAssign] = "<<=",
+  [TK_RightShiftAssign] = ">>=",
+  [TK_DoubleColon] = "::",
+  [TK_At] = "@",
+  [TK_Decrement] = "--",
+  [TK_Increment] = "++",
+  [TK_PostDecrement] = "--",
+  [TK_PostIncrement] = "++",
+  [TK_LesserThenOrEqual] = "<=",
+  [TK_GreaterThenOrEqual] = ">=",
+  [TK_Equals] = "==",
+  [TK_And] = "&&",
+  [TK_Or] = "||",
+  [TK_NotEquals] = "!=",
+  [TK_LeftShift] = "<<",
+  [TK_RightShift] = ">>",
+  [TK_Arrow] = "->",
+  [TK_ExprSizeof] = "sizeof",
+  [TK_DocComment] = "DocComment",
+  [TK_Comment] = "Comment",
+  [TK_Identifier] = "Identifier",
+  [TK_StringLit] = "StringLit",
+  [TK_Character] = "Character",
+  [TK_Error] = "Error",
+  [TK_Float] = "Float",
+  [TK_Int] = "Int",
+  [TK_Keyword] = "Keyword",
+};