Changes in src/Validate/ImplementEnumFunc.cpp [af746cc:19313be5]

File:

• src/Validate/ImplementEnumFunc.cpp (modified) (6 diffs)

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)}
@@ -516 +510 @@
     ast::EnumInstType enumInst(enumDecl->name);
     enumInst.base = enumDecl;
-    // ast::EnumAttrType attr = ast::EnumAttrType(&enumInst);
-    // EnumAttrFuncGenerator gen(enumDecl, &enumInst functionNesting);
+
     EnumAttrFuncGenerator gen(enumDecl, &enumInst, functionNesting);
     gen.generateAndAppendFunctions(declsToAddAfter);