Changeset 38093ae for src/Parser/parser.yy

Timestamp:

Apr 18, 2024, 8:44:24 PM (6 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• src/Parser/parser.yy (modified) (2 diffs)

src/Parser/parser.yy

@@ -55 +55 @@
 #include "TypedefTable.h"
 #include "TypeData.h"
+#include "AST/Type.hpp"                                 // for BasicType, BasicKind
 #include "Common/SemanticError.h"                                               // error_str
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
@@ -260 +261 @@
         ast::ConstantExpr * constant = dynamic_cast<ast::ConstantExpr *>(type->expr.get());
         if ( constant && (constant->rep == "0" || constant->rep == "1") ) {
-                type = new ExpressionNode( new ast::CastExpr( location, maybeMoveBuild(type), new ast::BasicType( ast::BasicType::SignedInt ) ) );
+                type = new ExpressionNode( new ast::CastExpr( location, maybeMoveBuild(type), new ast::BasicType( ast::BasicKind::SignedInt ) ) );
         } // if
         DeclarationNode * initDecl = distAttr(