Changes in src/Parser/parser.yy [525f7ad:f678c53b]

File:

• src/Parser/parser.yy (modified) (7 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 11 21:32:15 2024
-// Update Count     : 6641
+// Last Modified On : Mon Jun 17 21:43:02 2024
+// Update Count     : 6643
 //
 
@@ -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"
@@ -390 +368 @@
 %token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE COUNT             // GCC
+%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE                   // GCC
 %token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
@@ -990 +968 @@
                         // $$ = 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 ) ) );
-                }
         ;
 
@@ -1626 +1599 @@
                 { SemanticError( yylloc, "syntax error, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; }
 
-        | 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
+        | 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
                 {
                         if ( $3 == OperKinds::LEThan || $3 == OperKinds::GEThan ) {
@@ -1637 +1611 @@
                         SemanticError( yylloc, "Type iterator is currently unimplemented." ); $$ = nullptr;
                 }
+        ;
+
+enum_key:
+        TYPEDEFname
+        | ENUM identifier_or_type_name
         ;
 
@@ -4029 +4008 @@
 //
 // The pattern precludes declaring an array of functions versus a pointer to an array of functions, and returning arrays
-// and functions versus pointers to arrays and functions. In addition, the pattern handles the
-// special meaning of parenthesis around a typedef name:
+// and functions versus pointers to arrays and functions. In addition, the pattern handles the special meaning of
+// parenthesis around a typedef name:
 //
 //              ISO/IEC 9899:1999 Section 6.7.5.3(11) : "In a parameter declaration, a single typedef name in