Changes in / [9d6082c:006d4c4]

Location:

src/Parser

Files:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (7 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jun 20 16:54:05 2024
- * Update Count     : 778
+ * Last Modified On : Sat Feb 24 11:47:24 2024
+ * Update Count     : 777
  */
 
@@ -321 +321 @@
 __signed__              { KEYWORD_RETURN(SIGNED); }                             // GCC
 sizeof                  { KEYWORD_RETURN(SIZEOF); }
-countof                 { KEYWORD_RETURN(COUNTOF); }                    // GCC
+__count_e__             { KEYWORD_RETURN(COUNT); }                              // GCC
 static                  { KEYWORD_RETURN(STATIC); }
 _Static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C11

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 20 21:34:49 2024
-// Update Count     : 6654
+// Last Modified On : Mon Jun 17 21:43:02 2024
+// Update Count     : 6643
 //
 
@@ -302 +302 @@
                 } // if
         } else {
-                assert( false );
+                SemanticError( yylloc, "syntax error, loop-index name missing. Expression disallowed." ); return nullptr;
         } // if
 } // enumRangeCtrl
@@ -390 +390 @@
 %token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE COUNTOF   // GCC
+%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE COUNT             // GCC
 %token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
@@ -508 +508 @@
 %type<decl> elaborated_type elaborated_type_nobody
 
-%type<decl> enumerator_list enum_type enum_type_nobody enum_key enumerator_type
+%type<decl> enumerator_list enum_type enum_type_nobody enumerator_type
 %type<init> enumerator_value_opt
 
@@ -990 +990 @@
                         // $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) );
                 }
-        | COUNTOF '(' type_no_function ')'
-                { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }
-        | COUNTOF unary_expression
-                { SemanticError( yylloc, "countof for expressions is currently unimplemented. "); $$ = nullptr; }
+        | COUNT '(' type ')'
+                {
+                        // SemanticError( yylloc, "Count is currently unimplemented. "); $$ = nullptr;
+                        $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) );
+                }
         ;
 
@@ -1625 +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
-                {
-                        $$ = enumRangeCtrl( $1, new ExpressionNode( new ast::TypeExpr( yylloc, $3->buildType() ) ) );
-                }
-        | 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 ) {
@@ -1636 +1637 @@
                         SemanticError( yylloc, "Type iterator is currently unimplemented." ); $$ = nullptr;
                 }
-        ;
-
-enum_key:
-        type_name
-                { $$ = DeclarationNode::newEnum( $1->symbolic.name, nullptr, false, false ); }
-        | ENUM identifier
-                { $$ = DeclarationNode::newEnum( $2, nullptr, false, false ); }
-        | ENUM type_name
-                { $$ = DeclarationNode::newEnum( $2->symbolic.name, nullptr, false, false ); }
         ;