Changeset 02c80cdc for src/Validate

Timestamp:

Apr 19, 2024, 11:30:55 AM (4 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

358e1152, 4e08a54

Parents:

d4264e8 (diff), 19313be5 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Validate

Files:

• GenericParameter.cpp (modified) (1 diff)
• ImplementEnumFunc.cpp (modified) (5 diffs)
• ReplaceTypedef.cpp (modified) (1 diff)

src/Validate/GenericParameter.cpp

@@ -289 +289 @@
                 return new ast::TypeExpr( expr->location,
                         new ast::ArrayType(
-                                new ast::BasicType( ast::BasicType::Char ),
+                                new ast::BasicType( ast::BasicKind::Char ),
                                 expr,
                                 ast::VariableLen,

src/Validate/ImplementEnumFunc.cpp

@@ -156 +156 @@
                                          const ast::ObjectDecl* dstParam,
                                          const ast::ObjectDecl* srcParam) {
-        // const CodeLocation& location = func->location;
-        // auto& params = func->params;
-        // assert(2 == params.size());
-        // auto dstParam = params.front().strict_as<ast::ObjectDecl>();
-        // auto srcParam = params.back().strict_as<ast::ObjectDecl>();
         return new ast::CompoundStmt(
             location,
@@ -301 +296 @@
         {new ast::ObjectDecl(getLocation(), "_i", new ast::EnumInstType(decl))},
         {new ast::ObjectDecl(getLocation(), "_ret",
-                             new ast::EnumAttrType(new ast::EnumInstType(decl),
-                                                   ast::EnumAttribute::Posn))});
+            new ast::BasicType(ast::BasicKind::UnsignedInt))});
 }
 
@@ -311 +305 @@
         {new ast::ObjectDecl(
             getLocation(), "_ret",
-            new ast::PointerType(new ast::BasicType{ast::BasicType::Char}))});
+            new ast::PointerType(new ast::BasicType{ast::BasicKind::Char}))});
 }
 
@@ -364 +358 @@
         attr == ast::EnumAttribute::Value
             ? decl->base
-            : new ast::PointerType(new ast::BasicType{ast::BasicType::Char}),
+            : new ast::PointerType(new ast::BasicType{ast::BasicKind::Char}),
         ast::ConstantExpr::from_int(decl->location, decl->members.size()),
         ast::LengthFlag::FixedLen, ast::DimensionFlag::DynamicDim);
@@ -440 +434 @@
 
     auto addOneExpr = ast::UntypedExpr::createCall( location,
-        "?+?",
+        succ? "?+?": "?-?",
         {new ast::VariableExpr(location, param),
         ast::ConstantExpr::from_int(location, 1)}

src/Validate/ReplaceTypedef.cpp

@@ -349 +349 @@
                 // Perhaps this should be a warning instead.
                 translationUnit.global.sizeType =
-                        new ast::BasicType( ast::BasicType::LongUnsignedInt );
+                        new ast::BasicType( ast::BasicKind::LongUnsignedInt );
         }
 }