Changeset 597ddfeb

Timestamp:

Apr 8, 2025, 11:06:36 PM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2572add

Parents:

9fbc40e

Message:

update code for deprecating old type-parameter names: otype, dtype, and ttype

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 : Thu Mar 13 09:23:21 2025
-// Update Count     : 7255
+// Last Modified On : Tue Apr  8 18:36:20 2025
+// Update Count     : 7259
 //
 
@@ -3118 +3118 @@
 type_parameter:                                                                                 // CFA
         type_class identifier_or_type_name
-                {
-                        typedefTable.addToScope( *$2, TYPEDEFname, "type_parameter 1" );
-                        if ( $1 == ast::TypeDecl::Otype ) { SemanticError( yylloc, "otype keyword is deprecated, use T " ); }
-                        if ( $1 == ast::TypeDecl::Dtype ) { SemanticError( yylloc, "dtype keyword is deprecated, use T &" ); }
-                        if ( $1 == ast::TypeDecl::Ttype ) { SemanticError( yylloc, "ttype keyword is deprecated, use T ..." ); }
-                }
+                { typedefTable.addToScope( *$2, TYPEDEFname, "type_parameter 1" ); }
           type_initializer_opt assertion_list_opt
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
@@ -3161 +3156 @@
 type_class:                                                                                             // CFA
         OTYPE
-                { $$ = ast::TypeDecl::Otype; }
+                { SemanticError( yylloc, "otype keyword is deprecated, use T " ); }
         | DTYPE
-                { $$ = ast::TypeDecl::Dtype; }
+                { SemanticError( yylloc, "dtype keyword is deprecated, use T &" ); }
         | FTYPE
                 { $$ = ast::TypeDecl::Ftype; }
         | TTYPE
-                { $$ = ast::TypeDecl::Ttype; }
+                { SemanticError( yylloc, "ttype keyword is deprecated, use T ..." ); }
         ;
 
@@ -3236 +3231 @@
                         $$ = DeclarationNode::newTrait( $2, $4, nullptr );
                 }
-        | forall TRAIT identifier_or_type_name '{' '}'          // alternate
+        | forall TRAIT identifier_or_type_name '{' '}'          // new alternate
                 { $$ = DeclarationNode::newTrait( $3, $1, nullptr ); }
         | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' trait_declaration_list '}'