moved CppTemplateArg from cppast to parser

satya-das · Nov 12, 2024 · aa2175d · aa2175d
1 parent f6f2ff8
commit aa2175d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 26 deletions.
diff --git a/cppast/include/cppast/cpp_entities.h b/cppast/include/cppast/cpp_entities.h
@@ -25,7 +25,6 @@
 #include "cppast/cpp_preprocessor_unrecognized.h"
 #include "cppast/cpp_preprocessor_warning.h"
 #include "cppast/cpp_return_statement.h"
-#include "cppast/cpp_template_arg.h"
 #include "cppast/cpp_throw_statement.h"
 #include "cppast/cpp_try_block.h"
 #include "cppast/cpp_type_alias.h"

diff --git a/cppast/include/cppast/cpp_entity_ptr_defs.h b/cppast/include/cppast/cpp_entity_ptr_defs.h
@@ -62,7 +62,6 @@ using CppReturnStatementEPtr           = helper::CppEntityPtr<CppReturnStatement
 using CppStaticCastExprEPtr            = helper::CppEntityPtr<CppStaticCastExpr>;
 using CppStringLiteralExprEPtr         = helper::CppEntityPtr<CppStringLiteralExpr>;
 using CppSwitchBlockEPtr               = helper::CppEntityPtr<CppSwitchBlock>;
-using CppTemplateArgEPtr               = helper::CppEntityPtr<CppTemplateArg>;
 using CppThrowStatementEPtr            = helper::CppEntityPtr<CppThrowStatement>;
 using CppTrinomialExprEPtr             = helper::CppEntityPtr<CppTrinomialExpr>;
 using CppTryBlockEPtr                  = helper::CppEntityPtr<CppTryBlock>;
@@ -132,7 +131,6 @@ using CppConstReturnStatementEPtr           = helper::CppEntityPtr<const CppRetu
 using CppConstStaticCastExprEPtr            = helper::CppEntityPtr<const CppStaticCastExpr>;
 using CppConstStringLiteralExprEPtr         = helper::CppEntityPtr<const CppStringLiteralExpr>;
 using CppConstSwitchBlockEPtr               = helper::CppEntityPtr<const CppSwitchBlock>;
-using CppConstTemplateArgEPtr               = helper::CppEntityPtr<const CppTemplateArg>;
 using CppConstThrowStatementEPtr            = helper::CppEntityPtr<const CppThrowStatement>;
 using CppConstTrinomialExprEPtr             = helper::CppEntityPtr<const CppTrinomialExpr>;
 using CppConstTryBlockEPtr                  = helper::CppEntityPtr<const CppTryBlock>;

diff --git a/cppast/include/cppast/cpp_template_arg.h b/cppast/include/cppast/cpp_template_arg.h
diff --git a/cppparser/src/parser.y b/cppparser/src/parser.y
@@ -129,6 +129,12 @@ extern int yylex();
 
 using namespace cppast;
 
+// FIXME: Improve template arg parsing.
+// Template argument needs more robust support.
+// As of now we are treating them just as string.
+// But for parsing we need to have a type.
+class CppTemplateArg;
+
 %}
 
 %union {
@@ -170,7 +176,7 @@ using namespace cppast;
   bool                                             inheritType;
   std::vector<std::string>*                        identifierList;
   std::vector<std::string>*                        funcThrowSpec;
-  cppast::CppTemplateArg*                          templateArg;
+  class CppTemplateArg*                            templateArg;
   cppast::CppAsmBlock*                             asmBlock;
   cppast::CppCompoundType                          compoundType;
   unsigned short                                   ptrLevel;