added branching to compiler and comment generation

1 files changed, 94 insertions, 44 deletions

diff --git a/Compiler/gen/CGrammarLexer.cs b/Compiler/gen/CGrammarLexer.cs
index 3bb49f2..8d6ed18 100644
--- a/Compiler/gen/CGrammarLexer.cs
+++ b/Compiler/gen/CGrammarLexer.cs
@@ -36,7 +36,10 @@ public partial class CGrammarLexer : Lexer {
 		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
 		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
 		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, ID=26, INT=27;
+		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
+		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
+		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45, 
+		ID=46, INT=47, WS=48, COMMENT=49;
 	public static string[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -49,7 +52,9 @@ public partial class CGrammarLexer : Lexer {
 		"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
 		"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
 		"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24", 
-		"ID", "INT"
+		"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32", 
+		"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", 
+		"T__41", "T__42", "T__43", "T__44", "ID", "INT", "WS", "COMMENT"
 	};
 
 
@@ -63,14 +68,18 @@ public partial class CGrammarLexer : Lexer {
 	}
 
 	private static readonly string[] _LiteralNames = {
-		null, "'int'", "'('", "')'", "'{'", "'}'", "'return'", "';'", "'!'", "'~'", 
-		"'*'", "'/'", "'%'", "'+'", "'-'", "'<'", "'>'", "'<='", "'>='", "'=='", 
-		"'!='", "'&'", "'|'", "'^'", "'&&'", "'||'"
+		null, "'int'", "'('", "')'", "'{'", "'}'", "'return'", "';'", "'if'", 
+		"'else'", "'='", "'!'", "'~'", "'++'", "'--'", "'*'", "'/'", "'%'", "'+'", 
+		"'-'", "'<'", "'>'", "'<='", "'>='", "'=='", "'!='", "'&'", "'|'", "'^'", 
+		"'<<'", "'>>'", "'&&'", "'||'", "'*='", "'/='", "'%='", "'+='", "'-='", 
+		"'&='", "'|='", "'^='", "'<<='", "'>>='", "','", "'?'", "':'"
 	};
 	private static readonly string[] _SymbolicNames = {
 		null, null, null, null, null, null, null, null, null, null, null, null, 
 		null, null, null, null, null, null, null, null, null, null, null, null, 
-		null, null, "ID", "INT"
+		null, null, null, null, null, null, null, null, null, null, null, null, 
+		null, null, null, null, null, null, null, null, null, null, "ID", "INT", 
+		"WS", "COMMENT"
 	};
 	public static readonly IVocabulary DefaultVocabulary = new Vocabulary(_LiteralNames, _SymbolicNames);
 
@@ -100,46 +109,87 @@ public partial class CGrammarLexer : Lexer {
 		}
 	}
 	private static int[] _serializedATN = {
-		4,0,27,130,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,
+		4,0,49,255,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,
 		6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,
 		7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,
-		7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2,26,7,26,1,0,1,0,1,0,1,0,
-		1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,
-		7,1,7,1,8,1,8,1,9,1,9,1,10,1,10,1,11,1,11,1,12,1,12,1,13,1,13,1,14,1,14,
-		1,15,1,15,1,16,1,16,1,16,1,17,1,17,1,17,1,18,1,18,1,18,1,19,1,19,1,19,
-		1,20,1,20,1,21,1,21,1,22,1,22,1,23,1,23,1,23,1,24,1,24,1,24,1,25,1,25,
-		5,25,121,8,25,10,25,12,25,124,9,25,1,26,4,26,127,8,26,11,26,12,26,128,
-		0,0,27,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25,13,
-		27,14,29,15,31,16,33,17,35,18,37,19,39,20,41,21,43,22,45,23,47,24,49,25,
-		51,26,53,27,1,0,3,3,0,65,90,95,95,97,122,4,0,48,57,65,90,95,95,97,122,
-		1,0,48,57,131,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,
-		0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,
-		21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,
-		0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,
-		0,43,1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,
-		1,0,0,0,1,55,1,0,0,0,3,59,1,0,0,0,5,61,1,0,0,0,7,63,1,0,0,0,9,65,1,0,0,
-		0,11,67,1,0,0,0,13,74,1,0,0,0,15,76,1,0,0,0,17,78,1,0,0,0,19,80,1,0,0,
-		0,21,82,1,0,0,0,23,84,1,0,0,0,25,86,1,0,0,0,27,88,1,0,0,0,29,90,1,0,0,
-		0,31,92,1,0,0,0,33,94,1,0,0,0,35,97,1,0,0,0,37,100,1,0,0,0,39,103,1,0,
-		0,0,41,106,1,0,0,0,43,108,1,0,0,0,45,110,1,0,0,0,47,112,1,0,0,0,49,115,
-		1,0,0,0,51,118,1,0,0,0,53,126,1,0,0,0,55,56,5,105,0,0,56,57,5,110,0,0,
-		57,58,5,116,0,0,58,2,1,0,0,0,59,60,5,40,0,0,60,4,1,0,0,0,61,62,5,41,0,
-		0,62,6,1,0,0,0,63,64,5,123,0,0,64,8,1,0,0,0,65,66,5,125,0,0,66,10,1,0,
-		0,0,67,68,5,114,0,0,68,69,5,101,0,0,69,70,5,116,0,0,70,71,5,117,0,0,71,
-		72,5,114,0,0,72,73,5,110,0,0,73,12,1,0,0,0,74,75,5,59,0,0,75,14,1,0,0,
-		0,76,77,5,33,0,0,77,16,1,0,0,0,78,79,5,126,0,0,79,18,1,0,0,0,80,81,5,42,
-		0,0,81,20,1,0,0,0,82,83,5,47,0,0,83,22,1,0,0,0,84,85,5,37,0,0,85,24,1,
-		0,0,0,86,87,5,43,0,0,87,26,1,0,0,0,88,89,5,45,0,0,89,28,1,0,0,0,90,91,
-		5,60,0,0,91,30,1,0,0,0,92,93,5,62,0,0,93,32,1,0,0,0,94,95,5,60,0,0,95,
-		96,5,61,0,0,96,34,1,0,0,0,97,98,5,62,0,0,98,99,5,61,0,0,99,36,1,0,0,0,
-		100,101,5,61,0,0,101,102,5,61,0,0,102,38,1,0,0,0,103,104,5,33,0,0,104,
-		105,5,61,0,0,105,40,1,0,0,0,106,107,5,38,0,0,107,42,1,0,0,0,108,109,5,
-		124,0,0,109,44,1,0,0,0,110,111,5,94,0,0,111,46,1,0,0,0,112,113,5,38,0,
-		0,113,114,5,38,0,0,114,48,1,0,0,0,115,116,5,124,0,0,116,117,5,124,0,0,
-		117,50,1,0,0,0,118,122,7,0,0,0,119,121,7,1,0,0,120,119,1,0,0,0,121,124,
-		1,0,0,0,122,120,1,0,0,0,122,123,1,0,0,0,123,52,1,0,0,0,124,122,1,0,0,0,
-		125,127,7,2,0,0,126,125,1,0,0,0,127,128,1,0,0,0,128,126,1,0,0,0,128,129,
-		1,0,0,0,129,54,1,0,0,0,3,0,122,128,0
+		7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,
+		7,28,2,29,7,29,2,30,7,30,2,31,7,31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,
+		7,35,2,36,7,36,2,37,7,37,2,38,7,38,2,39,7,39,2,40,7,40,2,41,7,41,2,42,
+		7,42,2,43,7,43,2,44,7,44,2,45,7,45,2,46,7,46,2,47,7,47,2,48,7,48,1,0,1,
+		0,1,0,1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,
+		1,6,1,6,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,10,1,10,1,11,1,11,1,
+		12,1,12,1,12,1,13,1,13,1,13,1,14,1,14,1,15,1,15,1,16,1,16,1,17,1,17,1,
+		18,1,18,1,19,1,19,1,20,1,20,1,21,1,21,1,21,1,22,1,22,1,22,1,23,1,23,1,
+		23,1,24,1,24,1,24,1,25,1,25,1,26,1,26,1,27,1,27,1,28,1,28,1,28,1,29,1,
+		29,1,29,1,30,1,30,1,30,1,31,1,31,1,31,1,32,1,32,1,32,1,33,1,33,1,33,1,
+		34,1,34,1,34,1,35,1,35,1,35,1,36,1,36,1,36,1,37,1,37,1,37,1,38,1,38,1,
+		38,1,39,1,39,1,39,1,40,1,40,1,40,1,40,1,41,1,41,1,41,1,41,1,42,1,42,1,
+		43,1,43,1,44,1,44,1,45,1,45,5,45,225,8,45,10,45,12,45,228,9,45,1,46,4,
+		46,231,8,46,11,46,12,46,232,1,47,4,47,236,8,47,11,47,12,47,237,1,47,1,
+		47,1,48,1,48,1,48,1,48,5,48,246,8,48,10,48,12,48,249,9,48,1,48,3,48,252,
+		8,48,1,48,1,48,1,247,0,49,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,
+		21,11,23,12,25,13,27,14,29,15,31,16,33,17,35,18,37,19,39,20,41,21,43,22,
+		45,23,47,24,49,25,51,26,53,27,55,28,57,29,59,30,61,31,63,32,65,33,67,34,
+		69,35,71,36,73,37,75,38,77,39,79,40,81,41,83,42,85,43,87,44,89,45,91,46,
+		93,47,95,48,97,49,1,0,5,3,0,65,90,95,95,97,122,4,0,48,57,65,90,95,95,97,
+		122,1,0,48,57,3,0,9,10,13,13,32,32,1,1,10,10,258,0,1,1,0,0,0,0,3,1,0,0,
+		0,0,5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,
+		0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,
+		0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,
+		1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,
+		0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,55,1,0,0,0,0,57,1,0,0,0,0,59,
+		1,0,0,0,0,61,1,0,0,0,0,63,1,0,0,0,0,65,1,0,0,0,0,67,1,0,0,0,0,69,1,0,0,
+		0,0,71,1,0,0,0,0,73,1,0,0,0,0,75,1,0,0,0,0,77,1,0,0,0,0,79,1,0,0,0,0,81,
+		1,0,0,0,0,83,1,0,0,0,0,85,1,0,0,0,0,87,1,0,0,0,0,89,1,0,0,0,0,91,1,0,0,
+		0,0,93,1,0,0,0,0,95,1,0,0,0,0,97,1,0,0,0,1,99,1,0,0,0,3,103,1,0,0,0,5,
+		105,1,0,0,0,7,107,1,0,0,0,9,109,1,0,0,0,11,111,1,0,0,0,13,118,1,0,0,0,
+		15,120,1,0,0,0,17,123,1,0,0,0,19,128,1,0,0,0,21,130,1,0,0,0,23,132,1,0,
+		0,0,25,134,1,0,0,0,27,137,1,0,0,0,29,140,1,0,0,0,31,142,1,0,0,0,33,144,
+		1,0,0,0,35,146,1,0,0,0,37,148,1,0,0,0,39,150,1,0,0,0,41,152,1,0,0,0,43,
+		154,1,0,0,0,45,157,1,0,0,0,47,160,1,0,0,0,49,163,1,0,0,0,51,166,1,0,0,
+		0,53,168,1,0,0,0,55,170,1,0,0,0,57,172,1,0,0,0,59,175,1,0,0,0,61,178,1,
+		0,0,0,63,181,1,0,0,0,65,184,1,0,0,0,67,187,1,0,0,0,69,190,1,0,0,0,71,193,
+		1,0,0,0,73,196,1,0,0,0,75,199,1,0,0,0,77,202,1,0,0,0,79,205,1,0,0,0,81,
+		208,1,0,0,0,83,212,1,0,0,0,85,216,1,0,0,0,87,218,1,0,0,0,89,220,1,0,0,
+		0,91,222,1,0,0,0,93,230,1,0,0,0,95,235,1,0,0,0,97,241,1,0,0,0,99,100,5,
+		105,0,0,100,101,5,110,0,0,101,102,5,116,0,0,102,2,1,0,0,0,103,104,5,40,
+		0,0,104,4,1,0,0,0,105,106,5,41,0,0,106,6,1,0,0,0,107,108,5,123,0,0,108,
+		8,1,0,0,0,109,110,5,125,0,0,110,10,1,0,0,0,111,112,5,114,0,0,112,113,5,
+		101,0,0,113,114,5,116,0,0,114,115,5,117,0,0,115,116,5,114,0,0,116,117,
+		5,110,0,0,117,12,1,0,0,0,118,119,5,59,0,0,119,14,1,0,0,0,120,121,5,105,
+		0,0,121,122,5,102,0,0,122,16,1,0,0,0,123,124,5,101,0,0,124,125,5,108,0,
+		0,125,126,5,115,0,0,126,127,5,101,0,0,127,18,1,0,0,0,128,129,5,61,0,0,
+		129,20,1,0,0,0,130,131,5,33,0,0,131,22,1,0,0,0,132,133,5,126,0,0,133,24,
+		1,0,0,0,134,135,5,43,0,0,135,136,5,43,0,0,136,26,1,0,0,0,137,138,5,45,
+		0,0,138,139,5,45,0,0,139,28,1,0,0,0,140,141,5,42,0,0,141,30,1,0,0,0,142,
+		143,5,47,0,0,143,32,1,0,0,0,144,145,5,37,0,0,145,34,1,0,0,0,146,147,5,
+		43,0,0,147,36,1,0,0,0,148,149,5,45,0,0,149,38,1,0,0,0,150,151,5,60,0,0,
+		151,40,1,0,0,0,152,153,5,62,0,0,153,42,1,0,0,0,154,155,5,60,0,0,155,156,
+		5,61,0,0,156,44,1,0,0,0,157,158,5,62,0,0,158,159,5,61,0,0,159,46,1,0,0,
+		0,160,161,5,61,0,0,161,162,5,61,0,0,162,48,1,0,0,0,163,164,5,33,0,0,164,
+		165,5,61,0,0,165,50,1,0,0,0,166,167,5,38,0,0,167,52,1,0,0,0,168,169,5,
+		124,0,0,169,54,1,0,0,0,170,171,5,94,0,0,171,56,1,0,0,0,172,173,5,60,0,
+		0,173,174,5,60,0,0,174,58,1,0,0,0,175,176,5,62,0,0,176,177,5,62,0,0,177,
+		60,1,0,0,0,178,179,5,38,0,0,179,180,5,38,0,0,180,62,1,0,0,0,181,182,5,
+		124,0,0,182,183,5,124,0,0,183,64,1,0,0,0,184,185,5,42,0,0,185,186,5,61,
+		0,0,186,66,1,0,0,0,187,188,5,47,0,0,188,189,5,61,0,0,189,68,1,0,0,0,190,
+		191,5,37,0,0,191,192,5,61,0,0,192,70,1,0,0,0,193,194,5,43,0,0,194,195,
+		5,61,0,0,195,72,1,0,0,0,196,197,5,45,0,0,197,198,5,61,0,0,198,74,1,0,0,
+		0,199,200,5,38,0,0,200,201,5,61,0,0,201,76,1,0,0,0,202,203,5,124,0,0,203,
+		204,5,61,0,0,204,78,1,0,0,0,205,206,5,94,0,0,206,207,5,61,0,0,207,80,1,
+		0,0,0,208,209,5,60,0,0,209,210,5,60,0,0,210,211,5,61,0,0,211,82,1,0,0,
+		0,212,213,5,62,0,0,213,214,5,62,0,0,214,215,5,61,0,0,215,84,1,0,0,0,216,
+		217,5,44,0,0,217,86,1,0,0,0,218,219,5,63,0,0,219,88,1,0,0,0,220,221,5,
+		58,0,0,221,90,1,0,0,0,222,226,7,0,0,0,223,225,7,1,0,0,224,223,1,0,0,0,
+		225,228,1,0,0,0,226,224,1,0,0,0,226,227,1,0,0,0,227,92,1,0,0,0,228,226,
+		1,0,0,0,229,231,7,2,0,0,230,229,1,0,0,0,231,232,1,0,0,0,232,230,1,0,0,
+		0,232,233,1,0,0,0,233,94,1,0,0,0,234,236,7,3,0,0,235,234,1,0,0,0,236,237,
+		1,0,0,0,237,235,1,0,0,0,237,238,1,0,0,0,238,239,1,0,0,0,239,240,6,47,0,
+		0,240,96,1,0,0,0,241,242,5,47,0,0,242,243,5,47,0,0,243,247,1,0,0,0,244,
+		246,9,0,0,0,245,244,1,0,0,0,246,249,1,0,0,0,247,248,1,0,0,0,247,245,1,
+		0,0,0,248,251,1,0,0,0,249,247,1,0,0,0,250,252,7,4,0,0,251,250,1,0,0,0,
+		252,253,1,0,0,0,253,254,6,48,1,0,254,98,1,0,0,0,6,0,226,232,237,247,251,
+		2,6,0,0,0,1,0
 	};
 
 	public static readonly ATN _ATN =