6 files changed, 80 insertions, 1 deletions
diff --git a/src/Makefile.files b/src/Makefile.files
index fbea008..3fcc67a 100644
--- a/src/Makefile.files
+++ b/src/Makefile.files
@@ -100,4 +100,6 @@ SRC = nodes/base/cst.h \
       nodes/expr/loop_expr.h \
       parsers/expr/loop_expr.cpp \
       nodes/expr/nop_expr.h \
-      parsers/expr/nop_expr.cpp
-\ No newline at end of file
+      parsers/expr/nop_expr.cpp \
+      nodes/expr/cond_expr.h \
+      parsers/expr/cond_expr.cpp
+\ No newline at end of file
diff --git a/src/includes/nodeincludes.h b/src/includes/nodeincludes.h
index 0341e77..a1799bc 100644
--- a/src/includes/nodeincludes.h
+++ b/src/includes/nodeincludes.h
@@ -37,3 +37,4 @@
 #include "nodes/expr/indirect_ref.h"
 #include "nodes/expr/loop_expr.h"
 #include "nodes/expr/nop_expr.h"
+#include "nodes/expr/cond_expr.h"
diff --git a/src/includes/nodeshandling.inc b/src/includes/nodeshandling.inc
index 6395d0f..4580f9a 100644
--- a/src/includes/nodeshandling.inc
+++ b/src/includes/nodeshandling.inc
@@ -36,3 +36,4 @@ handleNodeType(NE_EXPR, NeExpr)
 handleNodeType(INDIRECT_REF, IndirectRef)
 handleNodeType(LOOP_EXPR, LoopExpr)
 handleNodeType(NOP_EXPR, NopExpr)
+handleNodeType(COND_EXPR, CondExpr)
diff --git a/src/includes/parserdefines.inc b/src/includes/parserdefines.inc
index 5f4723f..d00b8cc 100644
--- a/src/includes/parserdefines.inc
+++ b/src/includes/parserdefines.inc
@@ -36,3 +36,4 @@ parserDefine(NeExpr);
 parserDefine(IndirectRef);
 parserDefine(LoopExpr);
 parserDefine(NopExpr);
+parserDefine(CondExpr);
diff --git a/src/nodes/expr/cond_expr.h b/src/nodes/expr/cond_expr.h
new file mode 100644
index 0000000..4b2aa93
--- /dev/null
+++ b/src/nodes/expr/cond_expr.h
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2015  Andrei Karas
+ *
+ *  This file is part of AstDumper.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NODES_EXPR_CONDEXPRNODE_H
+#define NODES_EXPR_CONDEXPRNODE_H
+
+#include "nodes/base/expr.h"
+
+#include <string>
+
+struct CondExprNode : public ExprNode
+{
+    CondExprNode() :
+        ExprNode()
+    {
+    }
+};
+
+#endif // NODES_EXPR_CONDEXPRNODE_H
diff --git a/src/parsers/expr/cond_expr.cpp b/src/parsers/expr/cond_expr.cpp
new file mode 100644
index 0000000..36c8fa4
--- /dev/null
+++ b/src/parsers/expr/cond_expr.cpp
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (C) 2015  Andrei Karas
+ *
+ *  This file is part of AstDumper.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes/parserincludes.h"
+
+parserDefine(CondExpr);
+
+#include "parsers/base/expr.h"
+
+#include "nodes/expr/cond_expr.h"
+
+namespace Generic
+{
+
+void parseCondExprNode(CondExprNode *node)
+{
+    fillType(node);
+    Log::log(node);
+
+    fillExprOperands(node);
+}
+
+}