From d3e4d1de113a95123de98c2694d039566dd88d7b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 13 Jun 2015 17:35:31 +0300 Subject: Add parsing node UNION_TYPE. --- src/Makefile.files | 4 +++- src/includes/nodeincludes.h | 1 + src/includes/nodeshandling.inc | 1 + src/includes/parserdefines.inc | 1 + src/nodes/type/union_type.h | 42 ++++++++++++++++++++++++++++++++++ src/parsers/type/union_type.cpp | 50 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/nodes/type/union_type.h create mode 100644 src/parsers/type/union_type.cpp diff --git a/src/Makefile.files b/src/Makefile.files index 44390ac..0f72dc9 100644 --- a/src/Makefile.files +++ b/src/Makefile.files @@ -221,4 +221,6 @@ SRC = analysis/analysis.cpp \ nodes/expr/tryfinally_expr.h \ parsers/expr/tryfinally_expr.cpp \ nodes/cst/string_cst.h \ - parsers/cst/string_cst.cpp \ No newline at end of file + parsers/cst/string_cst.cpp \ + nodes/type/union_type.h \ + parsers/type/union_type.cpp \ No newline at end of file diff --git a/src/includes/nodeincludes.h b/src/includes/nodeincludes.h index bec2720..4b8590d 100644 --- a/src/includes/nodeincludes.h +++ b/src/includes/nodeincludes.h @@ -90,3 +90,4 @@ #include "nodes/expr/label_expr.h" #include "nodes/expr/tryfinally_expr.h" #include "nodes/cst/string_cst.h" +#include "nodes/type/union_type.h" diff --git a/src/includes/nodeshandling.inc b/src/includes/nodeshandling.inc index 954fa09..7bd0389 100644 --- a/src/includes/nodeshandling.inc +++ b/src/includes/nodeshandling.inc @@ -89,3 +89,4 @@ handleNodeType(FOR_STMT, ForStmt) handleNodeType(LABEL_EXPR, LabelExpr) handleNodeType(TRY_FINALLY_EXPR, TryFinallyExpr) handleNodeType(STRING_CST, StringCst) +handleNodeType(UNION_TYPE, UnionType) diff --git a/src/includes/parserdefines.inc b/src/includes/parserdefines.inc index 509f07f..0703f58 100644 --- a/src/includes/parserdefines.inc +++ b/src/includes/parserdefines.inc @@ -89,3 +89,4 @@ parserDefine(ForStmt); parserDefine(LabelExpr); parserDefine(TryFinallyExpr); parserDefine(StringCst); +parserDefine(UnionType); diff --git a/src/nodes/type/union_type.h b/src/nodes/type/union_type.h new file mode 100644 index 0000000..fc664fa --- /dev/null +++ b/src/nodes/type/union_type.h @@ -0,0 +1,42 @@ +/* + * 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 . + */ + +#ifndef NODES_TYPE_UNIONTYPENODE_H +#define NODES_TYPE_UNIONTYPENODE_H + +#include "nodes/base/type.h" + +#include "nodes/base/decl.h" + +#include + +struct UnionTypeNode : public TypeNode +{ + UnionTypeNode() : + TypeNode(), + fields(), + methods(nullptr) + { + } + + std::vector fields; + Node *methods; +}; + +#endif // NODES_TYPE_UNIONTYPENODE_H diff --git a/src/parsers/type/union_type.cpp b/src/parsers/type/union_type.cpp new file mode 100644 index 0000000..c429f66 --- /dev/null +++ b/src/parsers/type/union_type.cpp @@ -0,0 +1,50 @@ +/* + * 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 . + */ + +#include "includes/parserincludes.h" + +parserDefine(UnionType); + +#include "parsers/base/type.h" + +#include "nodes/type/union_type.h" + +namespace Generic +{ + +void parseUnionTypeNode(UnionTypeNode *node) +{ + fillType(node); + Log::dump(node); + + fillTypeName(node); + fillTypeAttributes(node); + + FOR_CHAIN(node->gccNode, it, TYPE_FIELDS, DECL_CHAIN) + { + node->fields.push_back(static_cast( + createParseNode(node, it, "field"))); + } + node->methods = createParseNode( + node, + TYPE_METHODS(node->gccNode), + "type methods"); +} + +} -- cgit v1.2.3-70-g09d2