Changeset 4941716 for src

Timestamp:

Aug 13, 2024, 11:26:54 AM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

661e7b0

Parents:

dee680c

Message:

preclude aggregate/enumeration type declaration in trait body

File:

• src/Parser/parser.yy (modified) (4 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 : Mon Aug 12 10:21:46 2024
-// Update Count     : 6737
+// Last Modified On : Tue Aug 13 11:25:16 2024
+// Update Count     : 6740
 //
 
@@ -952 +952 @@
                 }
         | COUNTOF unary_expression
-                {  $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
+                { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
         | COUNTOF '(' type_no_function ')'
                 { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }
@@ -1626 +1626 @@
 enum_key:
         type_name
-                {       typedefTable.makeTypedef( *$1->symbolic.name, "enum_type_nobody 1" );
-                        $$ = DeclarationNode::newEnum( $1->symbolic.name, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$1->symbolic.name, "enum_type_nobody 1" );
+                        $$ = DeclarationNode::newEnum( $1->symbolic.name, nullptr, false, false );
+                }
         | ENUM identifier
-                {       typedefTable.makeTypedef( *$2, "enum_type_nobody 2" );
-                        $$ = DeclarationNode::newEnum( $2, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$2, "enum_type_nobody 2" );
+                        $$ = DeclarationNode::newEnum( $2, nullptr, false, false );
+                }
         | ENUM type_name
-                {       typedefTable.makeTypedef( *$2->symbolic.name, "enum_type_nobody 3" );
-                        $$ = DeclarationNode::newEnum( $2->symbolic.name, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$2->symbolic.name, "enum_type_nobody 3" );
+                        $$ = DeclarationNode::newEnum( $2->symbolic.name, nullptr, false, false );
+                }
         ;
 
@@ -3238 +3244 @@
 
 trait_declaring_list:                                                                   // CFA
-        type_specifier declarator
+                // Cannot declare an aggregate or enumeration in a trait.
+        type_specifier_nobody declarator
                 { $$ = $2->addType( $1 ); }
         | trait_declaring_list ',' declarator
                 { $$ = $1->set_last( $1->cloneBaseType( $3 ) ); }
+        | error
+                { SemanticError( yylloc, "Possible cause is declaring an aggregate or enumeration type in a trait." ); $$ = nullptr; }
         ;