Changeset 5f210c0 for src

Timestamp:

Aug 4, 2024, 9:49:25 PM (5 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

7db4fcd4

Parents:

7ab24fef

Message:

Change enum pos to signed int to avoid underflow; operator on enum will not have range check (but succ and pred still have range check

Location:

src

Files:

• ControlStruct/TranslateEnumRange.cpp (modified) (1 diff)
• Validate/ImplementEnumFunc.cpp (modified) (7 diffs)

src/ControlStruct/TranslateEnumRange.cpp

@@ -51 +51 @@
     // it wraps around and become unsigned max
     ast::UntypedExpr * condition = ast::UntypedExpr::createCall( location,
-        "?<=?",
+        stmt->is_inc? "?<=?": "?>=?",
         {   new ast::NameExpr( location, indexName ),
-            ast::UntypedExpr::createCall( location, "upperBound", {} )  });
+            stmt->is_inc?
+                ast::UntypedExpr::createCall( location, "upperBound", {} ):
+                ast::UntypedExpr::createCall( location, "lowerBound", {} )
+        });
     auto increment = ast::UntypedExpr::createCall( location, 
         stmt->is_inc? "succ_unsafe": "pred_unsafe",

src/Validate/ImplementEnumFunc.cpp

@@ -25 +25 @@
                 : decl(decl),
                   functionNesting{functionNesting},
-                //   quasi_void_decl(new ast::StructDecl(decl->location,
-                //      "quasi_void", ast::AggregateDecl::Struct,
-                //      {}, ast::Linkage::AutoGen)),
                   proto_linkage{ast::Linkage::Cforall} {}
 
@@ -194 +191 @@
         {new ast::ObjectDecl(getLocation(), "_i", new ast::EnumInstType(decl))},
         {new ast::ObjectDecl(getLocation(), "_ret",
-            new ast::BasicType(ast::BasicKind::UnsignedInt))});
+            new ast::BasicType(ast::BasicKind::SignedInt))});
 }
 
@@ -229 +226 @@
         return genProto(
                 "fromInt_unsafe",
-                {new ast::ObjectDecl(getLocation(), "_i", new ast::BasicType(ast::BasicKind::UnsignedInt))},
+                {new ast::ObjectDecl(getLocation(), "_i", new ast::BasicType(ast::BasicKind::SignedInt))},
                 {new ast::ObjectDecl(getLocation(), "_ret", new ast::EnumInstType(decl))}
         );
@@ -238 +235 @@
                 "fromInstance",
                 {new ast::ObjectDecl(getLocation(), "_i", new ast::EnumInstType(decl))},
-                {new ast::ObjectDecl(getLocation(), "_ret", new ast::BasicType(ast::BasicKind::UnsignedInt))}
+                {new ast::ObjectDecl(getLocation(), "_ret", new ast::BasicType(ast::BasicKind::SignedInt))}
         );
 }
@@ -285 +282 @@
                 func->location,
                 new ast::VariableExpr(func->location, param),
-                new ast::BasicType(ast::BasicKind::UnsignedInt),
+                new ast::BasicType(ast::BasicKind::SignedInt),
                 ast::GeneratedFlag::ExplicitCast
         );
@@ -383 +380 @@
                         func->location,
                         new ast::VariableExpr( func->location, func->params.front() ),
-                        new ast::BasicType( ast::BasicKind::UnsignedInt ),
+                        new ast::BasicType( ast::BasicKind::SignedInt ),
                         ast::GeneratedFlag::ExplicitCast
                 )});
@@ -407 +404 @@
                 func->location,
                 new ast::VariableExpr(func->location, func->params.front()),
-                new ast::BasicType( ast::BasicKind::UnsignedInt ),
+                new ast::BasicType( ast::BasicKind::SignedInt ),
                         ast::GeneratedFlag::ExplicitCast);
         func->stmts = new ast::CompoundStmt(