Adaugă suport pentru if și while la tema 2 TC

tc/tema2/HelloWorld.java

@@ -7,9 +7,16 @@ public static void main(String[] args) {
 
         String myString = "Test";
         int x = 5;
-        System.out.println(myString);
+        if (x > 3) {
+            System.out.println(myString);
+        }
 
         System.out.println(HelperClass.compute(convert(x)));
+
+        while (x < 10) {
+            x = x + 1;
+            System.out.println("Hello!");
+        }
     }
 
     // This is a private static method

tc/tema2/java-lexer.ypp

@@ -42,6 +42,8 @@ private return yy::parser::make_PRIVATE_KEYWORD();
 final return yy::parser::make_FINAL_KEYWORD();
 static return yy::parser::make_STATIC_KEYWORD();
 
+if return yy::parser::make_IF_KEYWORD();
+while return yy::parser::make_WHILE_KEYWORD();
 return return yy::parser::make_RETURN_KEYWORD();
 
 "(" return yy::parser::make_OPEN_PARENS();
@@ -54,6 +56,10 @@ return return yy::parser::make_RETURN_KEYWORD();
 "," return yy::parser::make_COMMA();
 ";" return yy::parser::make_SEMICOLON();
 "." return yy::parser::make_DOT();
+"+" return yy::parser::make_PLUS();
+"-" return yy::parser::make_MINUS();
+"<" return yy::parser::make_LESS_THAN();
+">" return yy::parser::make_GREATER_THAN();
 
 {INTEGER} return yy::parser::make_NUMBER(std::stoi(yytext));
 

tc/tema2/java-parser.ypp

@@ -31,6 +31,8 @@
 %token FINAL_KEYWORD;
 %token STATIC_KEYWORD;
 
+%token IF_KEYWORD;
+%token WHILE_KEYWORD;
 %token RETURN_KEYWORD;
 
 %token OPEN_PARENS;
@@ -43,6 +45,12 @@
 %token COMMA;
 %token SEMICOLON;
 %token DOT;
+%token PLUS;
+%token MINUS;
+%token LESS_THAN;
+%token GREATER_THAN;
+
+%left PLUS MINUS;
 
 %token <std::string> IDENTIFIER;
 %token <int> NUMBER;
@@ -97,8 +105,28 @@ statement:
     variable_declaration
     | assignment
     | method_call SEMICOLON
+    | if_statement
+    | while_statement
     | return_statement
 
+if_statement:
+    IF_KEYWORD condition block
+    {
+        std::cout << "if block\n";
+    }
+
+while_statement:
+    WHILE_KEYWORD condition block
+    {
+        std::cout << "while block\n";
+    }
+
+condition:
+    OPEN_PARENS expression CLOSE_PARENS
+
+block:
+    OPEN_BRACKET statements CLOSE_BRACKET
+
 variable_declaration:
     type_identifier name optional_initializer SEMICOLON
     {
@@ -107,6 +135,9 @@ variable_declaration:
 
 assignment:
     name initializer SEMICOLON
+    {
+        std::cout << "Assigning to variable " << $1 << '\n';
+    }
 
 method_call:
     method_reference
@@ -127,9 +158,17 @@ actual_parameters:
 value:
     name | expression
 
+%nterm expression;
 expression:
-    literal
+    expression binary_operator expression
     | method_call
+    | name
+    | literal
+
+%nterm binary_operator;
+binary_operator:
+    PLUS | MINUS
+    | LESS_THAN | GREATER_THAN | EQUALS
 
 %nterm <std::string> method_reference;
 method_reference:
@@ -181,10 +220,7 @@ optional_initializer:
     %empty | initializer
 
 initializer:
-    EQUALS literal
-    {
-        std::cout << "Initializing to " << $2 << '\n';
-    }
+    EQUALS expression
 
 %nterm <std::string> literal;
 literal: