FInished parser but still have one shift/reduce warning

2 files changed, 43 insertions, 7 deletions

diff --git a/c_parser/include/ast_expression.hpp b/c_parser/include/ast_expression.hpp
index 2e223f4..87db997 100644
--- a/c_parser/include/ast_expression.hpp
+++ b/c_parser/include/ast_expression.hpp
@@ -8,9 +8,8 @@
 
 class ast_Expression : public ast_Base {
 private:
-    std::string id;
 public:
-    ast_Expression(const std::string& _id) : id(_id) {}
+    ast_Expression() {}
 
     virtual void print() const {
 	
@@ -22,9 +21,4 @@ public:
     }
 };
 
-class ast_ReturnExpression : public ast_Expression {
-public:
-    ast_ReturnExpression(const std::string& _id) : ast_Expression(_id) {}
-};
-
 #endif
diff --git a/c_parser/include/ast_statement.hpp b/c_parser/include/ast_statement.hpp
index e9864e9..224a809 100644
--- a/c_parser/include/ast_statement.hpp
+++ b/c_parser/include/ast_statement.hpp
@@ -77,4 +77,46 @@ public:
     }
 };
 
+class ast_ExpressionStatement : public ast_Statement {
+public:
+    ast_ExpressionStatement() : ast_Statement() {}
+    ast_ExpressionStatement(const ast_Base* _el) : ast_Statement(_el) {}
+    ast_ExpressionStatement(const ast_Base* _if, const ast_Base* _else) :
+	ast_Statement(_if, _else) {}
+
+    virtual void print() const override {
+	for(size_t i = 0; i < ast_list.size(); ++i) {
+	    ast_list[i]->print();
+	}
+    }
+};
+
+class ast_JumpStatement : public ast_Statement {
+public:
+    ast_JumpStatement() : ast_Statement() {}
+    ast_JumpStatement(const ast_Base* _el) : ast_Statement(_el) {}
+    ast_JumpStatement(const ast_Base* _if, const ast_Base* _else) :
+	ast_Statement(_if, _else) {}
+
+    virtual void print() const override {
+	for(size_t i = 0; i < ast_list.size(); ++i) {
+	    ast_list[i]->print();
+	}
+    }
+};
+
+class ast_IterationStatement : public ast_Statement {
+public:
+    ast_IterationStatement() : ast_Statement() {}
+    ast_IterationStatement(const ast_Base* _el) : ast_Statement(_el) {}
+    ast_IterationStatement(const ast_Base* _if, const ast_Base* _else) :
+	ast_Statement(_if, _else) {}
+
+    virtual void print() const override {
+	for(size_t i = 0; i < ast_list.size(); ++i) {
+	    ast_list[i]->print();
+	}
+    }
+};
+
 #endif