Changeset 525f7ad for src/Parser

Timestamp:

Jun 19, 2024, 3:20:39 PM (18 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

57e43cd

Parents:

1725989

Message:

1. Add count_e( enum_name ), a pseudo function that return the number of element in an enum; 2. Implementation of enum range loop.

Location:

src/Parser

Files:

• StatementNode.cpp (modified) (1 diff)
• StatementNode.hpp (modified) (1 diff)
• lex.ll (modified) (1 diff)
• parser.yy (modified) (5 diffs)

src/Parser/StatementNode.cpp

@@ -211 +211 @@
         buildMoveList( forctl->init, astinit );
 
+        if ( forctl->range_over ) {
+                ast::Expr * range_over = maybeMoveBuild( forctl->range_over );
+                delete forctl;
+                return new ast::ForStmt( location,
+                        std::move( astinit ),
+                        range_over,
+                        buildMoveSingle( stmt ),
+                        buildMoveOptional( else_ )
+                );
+        }
+
         ast::Expr * astcond = nullptr;                                          // maybe empty
         astcond = maybeMoveBuild( forctl->condition );

src/Parser/StatementNode.hpp

@@ -63 +63 @@
 struct ForCtrl {
         ForCtrl( StatementNode * stmt, ExpressionNode * condition, ExpressionNode * change ) :
-                init( stmt ), condition( condition ), change( change ) {}
+                init( stmt ), condition( condition ), change( change ), range_over( nullptr ) {}
+        ForCtrl( StatementNode * decl, ExpressionNode * _range_over) :
+                init( decl ), condition( nullptr ), change( nullptr ),  range_over( _range_over ) {}
 
         StatementNode * init;
         ExpressionNode * condition;
         ExpressionNode * change;
+        ExpressionNode * range_over;
 };
 

src/Parser/lex.ll

@@ -321 +321 @@
 __signed__              { KEYWORD_RETURN(SIGNED); }                             // GCC
 sizeof                  { KEYWORD_RETURN(SIZEOF); }
+__count_e__             { KEYWORD_RETURN(COUNT); }                              // GCC
 static                  { KEYWORD_RETURN(STATIC); }
 _Static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C11

src/Parser/parser.yy

@@ -284 +284 @@
 } // forCtrl
 
+ForCtrl * enumRangeCtrl( ExpressionNode * index_expr, ExpressionNode * range_over_expr ) {
+        if ( auto identifier = dynamic_cast<ast::NameExpr *>(index_expr->expr.get()) ) {
+                DeclarationNode * indexDecl =
+                        DeclarationNode::newName( new std::string(identifier->name) );
+                assert( range_over_expr );
+                auto node = new StatementNode( indexDecl ); // <- this cause this error
+                return new ForCtrl( node, range_over_expr );
+        } else if (auto commaExpr = dynamic_cast<ast::CommaExpr *>( index_expr->expr.get() )) {
+                if ( auto identifier = commaExpr->arg1.as<ast::NameExpr>() ) {
+                        assert( range_over_expr );
+                        DeclarationNode * indexDecl = distAttr(
+                                DeclarationNode::newTypeof( range_over_expr, true ),
+                                DeclarationNode::newName( new std::string( identifier->name) ) );
+                        return new ForCtrl( new StatementNode( indexDecl ), range_over_expr );
+                } else {
+                        SemanticError( yylloc, "syntax error, loop-index name missing. Expression disallowed." ); return nullptr;
+                } // if
+        } else {
+                SemanticError( yylloc, "syntax error, loop-index name missing. Expression disallowed." ); return nullptr;
+        } // if
+} // enumRangeCtrl
+
 static void IdentifierBeforeIdentifier( string & identifier1, string & identifier2, const char * kind ) {
         SemanticError( yylloc, "syntax error, adjacent identifiers \"%s\" and \"%s\" are not meaningful in an %s.\n"
@@ -368 +390 @@
 %token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE                   // GCC
+%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE COUNT             // GCC
 %token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
@@ -968 +990 @@
                         // $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) );
                 }
+        | COUNT '(' type ')'
+                {
+                        // SemanticError( yylloc, "Count is currently unimplemented. "); $$ = nullptr;
+                        $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) );
+                }
         ;
 
@@ -1599 +1626 @@
                 { SemanticError( yylloc, "syntax error, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; }
 
-        | comma_expression ';' enum_key                                         // CFA, enum type
-                {
-                        SemanticError( yylloc, "Type iterator is currently unimplemented." ); $$ = nullptr;
-                        //$$ = forCtrl( new ExpressionNode( build_varref( $3 ) ), $1, nullptr, OperKinds::Range, nullptr, nullptr );
-                }
-        | comma_expression ';' downupdowneq enum_key            // CFA, enum type, reverse direction
+        | comma_expression ';' enum_type                                        // CFA, enum type
+                {
+                        $$ = enumRangeCtrl( $1, new ExpressionNode( new ast::TypeExpr(yylloc, $3->buildType() ) ) );
+                }
+        | comma_expression ';' downupdowneq enum_type           // CFA, enum type, reverse direction
                 {
                         if ( $3 == OperKinds::LEThan || $3 == OperKinds::GEThan ) {
@@ -1611 +1637 @@
                         SemanticError( yylloc, "Type iterator is currently unimplemented." ); $$ = nullptr;
                 }
-        ;
-
-enum_key:
-        TYPEDEFname
-        | ENUM identifier_or_type_name
         ;