Changeset 0c327ce for src

Timestamp:

Jul 12, 2024, 3:30:06 PM (5 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

76b507d

Parents:

9c447e2

Message:

1. Add bound check to Serial function: now compiler generates the unchecked functions in ImplementEnumFunc?, and enum.hfa implements the bound check on top. Todo: Wrapped the checked version into a trait; 2. countof is now works on any type that implement Countof(). Because Countof() is implemented in enum.hfa for all CfaEnum?, we can call countof on { T | CfaEnum?(T) }

Location:

src

Files:

• AST/Expr.cpp (modified) (1 diff)
• AST/Expr.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Print.cpp (modified) (1 diff)
• ControlStruct/TranslateEnumRange.cpp (modified) (1 diff)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• Validate/ImplementEnumFunc.cpp (modified) (2 diffs)

src/AST/Expr.cpp

@@ -284 +284 @@
 // --- CountExpr
 
+CountExpr::CountExpr( const CodeLocation & loc, const Expr * e )
+: Expr( loc, new BasicType( BasicKind::LongUnsignedInt) ), expr(e), type( nullptr ) {}
+
 CountExpr::CountExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, new BasicType( BasicKind::LongUnsignedInt) ), type( t ) {}
+: Expr( loc, new BasicType( BasicKind::LongUnsignedInt) ), expr(nullptr), type( t ) {}
 
 // --- AlignofExpr

src/AST/Expr.hpp

@@ -496 +496 @@
 class CountExpr final : public Expr {
 public:
+        ptr<Expr> expr;
         ptr<Type> type;
 
+        CountExpr( const CodeLocation & loc, const Expr * t );
         CountExpr( const CodeLocation & loc, const Type * t );
 

src/AST/Pass.impl.hpp

@@ -1339 +1339 @@
                         maybe_accept( node, &CountExpr::result );
                 }
-                maybe_accept( node, &CountExpr::type );
+                if ( node->type ) {
+                        maybe_accept( node, &CountExpr::type );
+                } else {
+                        maybe_accept( node, &CountExpr::expr );
+                }
         }
         VISIT_END( Expr, node );

src/AST/Print.cpp

@@ -1146 +1146 @@
                 os << "Count Expression on: ";
                 ++indent;
-                node->type->accept( *this );
+                if ( node->type ) node->type->accept( *this );
+                else safe_print( node->expr );
                 --indent;
                 postprint( node );

src/ControlStruct/TranslateEnumRange.cpp

@@ -81 +81 @@
             ast::UntypedExpr::createCall( location, "upperBound", {} )  });
     auto increment = ast::UntypedExpr::createCall( location, 
-        stmt->is_inc? "succ": "pred",
+        stmt->is_inc? "succ_unsafe": "pred_unsafe",
         { new ast::NameExpr( location, indexName ) });
     auto assig = ast::UntypedExpr::createAssign( location, new ast::NameExpr( location, indexName ), increment );

src/Parser/parser.yy

@@ -970 +970 @@
                         // $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) );
                 }
+        | COUNTOF unary_expression
+                {  $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
         | COUNTOF '(' type_no_function ')'
                 { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }
-        | COUNTOF unary_expression
-                { SemanticError( yylloc, "countof for expressions is currently unimplemented. "); $$ = nullptr; }
         ;
 

src/ResolvExpr/CandidateFinder.cpp

@@ -1485 +1485 @@
 
         void Finder::postvisit( const ast::CountExpr * countExpr ) {
-                assert( countExpr->type );
-                auto enumInst = countExpr->type.as<ast::EnumInstType>();
-                if ( !enumInst ) {
-                        SemanticError( countExpr, "Count Expression only supports Enum Type as operand: ");
-                }
-                addCandidate( ast::ConstantExpr::from_ulong(countExpr->location, enumInst->base->members.size()), tenv );
+                const ast::UntypedExpr * untyped;
+                if ( countExpr->type ) {
+                        auto enumInst = countExpr->type.as<ast::EnumInstType>();
+                        if ( enumInst ) {
+                                addCandidate( ast::ConstantExpr::from_ulong(countExpr->location, enumInst->base->members.size()), tenv );
+                                return;
+                        }
+                        auto untypedFirst = ast::UntypedExpr::createCall( countExpr->location, "lowerBound", {} );
+                        auto castFirst = new ast::CastExpr( countExpr->location, untypedFirst , countExpr->type );
+                        untyped = ast::UntypedExpr::createCall(
+                                countExpr->location, "Countof", { castFirst }
+                        );
+                }
+                if (!untyped) untyped = ast::UntypedExpr::createCall(
+                                countExpr->location, "Countof", { countExpr->expr }
+                );
+                CandidateFinder finder( context, tenv );
+                finder.find( untyped );
+                CandidateList winners = findMinCost( finder.candidates );
+                if ( winners.size() == 0 ) {
+                        SemanticError( countExpr->expr, "Countof is not implemented for operand: " );
+                }
+                if ( winners.size() !=  1 ) {
+                        SemanticError( countExpr->expr, "Ambiguous expression in countof operand: " );
+                }
+                CandidateRef & choice = winners.front();
+                choice->expr = referenceToRvalueConversion( choice->expr, choice->cost );
+                addCandidate( *choice, choice->expr );
         }
 

src/Validate/ImplementEnumFunc.cpp

@@ -228 +228 @@
 ast::FunctionDecl* EnumAttrFuncGenerator::genFromIntProto() const {
         return genProto(
-                "fromInt",
+                "fromInt_unsafe",
                 {new ast::ObjectDecl(getLocation(), "_i", new ast::BasicType(ast::BasicKind::UnsignedInt))},
                 {new ast::ObjectDecl(getLocation(), "_ret", new ast::EnumInstType(decl))}
@@ -313 +313 @@
                 genFromIntProto(),
                 genFromInstanceProto(),
-                genInstToInstFuncProto("succ"),
-                genInstToInstFuncProto("pred")
+                genInstToInstFuncProto("succ_unsafe"),
+                genInstToInstFuncProto("pred_unsafe")
         };
         for (auto& proto: protos) produceForwardDecl(proto);