changed type layout to have all necessary information

1 files changed, 23 insertions, 15 deletions

diff --git a/c_compiler/include/expression.hpp b/c_compiler/include/expression.hpp
index 1563211..21e5880 100644
--- a/c_compiler/include/expression.hpp
+++ b/c_compiler/include/expression.hpp
@@ -26,13 +26,11 @@ public:
     virtual void print() const;
     virtual void printXml() const;
     virtual void countArguments(unsigned& argument_count) const;
-    virtual void expressionDepth(unsigned& depth_count) const;
-    
+    virtual void expressionDepth(unsigned& depth_count) const;    
     virtual int postfixStackPosition(VariableStackBindings bindings) const;
     virtual void setPostfixExpression(Expression* postfix_expression);
-
     virtual std::string id() const;
-
+    
     void linkExpression(Expression* next_expression);
     ExpressionPtr nextExpression() const;
 };
@@ -47,21 +45,14 @@ public:
     OperationExpression(Expression* lhs, Expression* rhs);
 
     virtual VariableStackBindings printAsm(VariableStackBindings bindings, unsigned& label_count) const = 0;
+    
     virtual int constantFold() const;
     virtual void expressionDepth(unsigned& depth_count) const;
+    
     void evaluateExpression(VariableStackBindings bindings, unsigned& label_count) const;
 };
 
 
-class PostfixExpression : public Expression
-{
-public:
-    PostfixExpression();
-
-    virtual VariableStackBindings printAsm(VariableStackBindings bindings, unsigned& label_count) const;
-};
-
-
 class PostfixArrayElement : public Expression
 {
 public:
@@ -86,11 +77,28 @@ public:
     void setPostfixExpression(Expression* postfix_expression);
 };
 
+class PostfixPostIncDecExpression : public Expression
+{
+private:
+    std::string operator_;
+    ExpressionPtr postfix_expression_;
+
+public:
+    PostfixPostIncDecExpression(const std::string& _operator, Expression* postfix_expression);
+
+    virtual VariableStackBindings printAsm(VariableStackBindings bindings, unsigned& label_count) const;
+    
+};
+
 
-class UnaryExpression : public Expression
+class UnaryPreIncDecExpression : public Expression
 {
+private:
+    std::string operator_;
+    ExpressionPtr unary_expression_;
+    
 public:
-    UnaryExpression();
+    UnaryPreIncDecExpression(const std::string& _operator, Expression* unary_expression);
 
     virtual VariableStackBindings printAsm(VariableStackBindings bindings, unsigned& label_count) const;
 };