Changeset c2b3243 for src

Timestamp:

Oct 18, 2022, 9:13:33 PM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

9511841

Parents:

5408b59 (diff), ce7d197 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• GenPoly/ScrubTyVars.h (modified) (1 diff)
• Parser/ParseNode.h (modified) (2 diffs)
• Parser/lex.ll (modified) (2 diffs)
• Parser/parser.yy (modified) (8 diffs)

src/AST/Pass.hpp

@@ -167 +167 @@
         const ast::Expr *             visit( const ast::UntypedExpr          * ) override final;
         const ast::Expr *             visit( const ast::NameExpr             * ) override final;
-        const ast::Expr *                         visit( const ast::QualifiedNameExpr    * ) override final;
+        const ast::Expr *             visit( const ast::QualifiedNameExpr        * ) override final;
         const ast::Expr *             visit( const ast::AddressExpr          * ) override final;
         const ast::Expr *             visit( const ast::LabelAddressExpr     * ) override final;

src/GenPoly/ScrubTyVars.h

@@ -116 +116 @@
                 node_t const * target, const TypeVarMap & typeVars ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubTypeVars<ast::Node>( target ) );
+                        scrubTypeVars<ast::Node>( target, typeVars ) );
 }
 

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 09:15:49 2022
-// Update Count     : 905
+// Last Modified On : Tue Oct 18 14:15:37 2022
+// Update Count     : 936
 //
 
@@ -465 +465 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< NodeType * >( cur->get_next() );
+                const ParseNode * temp = (cur->get_next());
+                cur = dynamic_cast< const NodeType * >( temp ); // should not return nullptr
+                if ( ! cur && temp ) {                                                  // non-homogeneous nodes ?
+                        SemanticError( cur->location, "internal error, non-homogeneous nodes founds in buildList processing." );
+                } // if
         } // while
         if ( ! errors.isEmpty() ) {

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Sep 20 21:18:55 2022
- * Update Count     : 762
+ * Last Modified On : Thu Oct 13 20:46:04 2022
+ * Update Count     : 764
  */
 
@@ -331 +331 @@
 __uint128_t             { KEYWORD_RETURN(UINT128); }                    // GCC
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
-__builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC
+__builtin_va_arg { KEYWORD_RETURN(VA_ARG); }                    // GCC
+__builtin_va_list { KEYWORD_RETURN(VA_LIST); }                  // GCC
 virtual                 { KEYWORD_RETURN(VIRTUAL); }                    // CFA
 void                    { KEYWORD_RETURN(VOID); }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  8 08:21:18 2022
-// Update Count     : 5709
+// Last Modified On : Fri Oct 14 14:04:43 2022
+// Update Count     : 5751
 //
 
@@ -305 +305 @@
 %token TYPEDEF
 %token EXTERN STATIC AUTO REGISTER
-%token THREADLOCALGCC THREADLOCALC11                                            // GCC, C11
+%token THREADLOCALGCC THREADLOCALC11                                    // GCC, C11
 %token INLINE FORTRAN                                                                   // C99, extension ISO/IEC 9899:1999 Section J.5.9(1)
 %token NORETURN                                                                                 // C11
@@ -318 +318 @@
 %token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token SIZEOF TYPEOF VALIST AUTO_TYPE                                   // GCC
+%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE                   // GCC
 %token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
@@ -409 +409 @@
 // declarations
 %type<decl> abstract_declarator abstract_ptr abstract_array abstract_function array_dimension multi_array_dimension
-%type<decl> abstract_parameter_declarator abstract_parameter_ptr abstract_parameter_array abstract_parameter_function array_parameter_dimension array_parameter_1st_dimension
+%type<decl> abstract_parameter_declarator_opt abstract_parameter_declarator abstract_parameter_ptr abstract_parameter_array abstract_parameter_function array_parameter_dimension array_parameter_1st_dimension
 %type<decl> abstract_parameter_declaration
 
@@ -698 +698 @@
         primary_expression
         | postfix_expression '[' assignment_expression ',' tuple_expression_list ']'
-                        // Historic, transitional: Disallow commas in subscripts.
-                        // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
-                        // Current: Commas in subscripts make tuples.
+                // Historic, transitional: Disallow commas in subscripts.
+                // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
+                // Current: Commas in subscripts make tuples.
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, new ExpressionNode( build_tuple( (ExpressionNode *)($3->set_last( $5 ) ) )) ) ); }
         | postfix_expression '[' assignment_expression ']'
@@ -720 +720 @@
         | postfix_expression '(' argument_expression_list_opt ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
+        | VA_ARG '(' primary_expression ',' declaration_specifier_nobody abstract_parameter_declarator_opt ')'
+                // { SemanticError( yylloc, "va_arg is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( new string( "__builtin_va_arg") ) ),
+                                                                                           (ExpressionNode *)($3->set_last( (ExpressionNode *)($6 ? $6->addType( $5 ) : $5) )) ) ); }
         | postfix_expression '`' identifier                                     // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( build_postfix_name( $3 ) ) ), $1 ) ); }
@@ -2156 +2160 @@
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | VALIST                                                                                        // GCC, __builtin_va_list
+        | VA_LIST                                                                                       // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         | AUTO_TYPE
@@ -3676 +3680 @@
 // functions.
 
+abstract_parameter_declarator_opt:
+        // empty
+                { $$ = nullptr; }
+        | abstract_parameter_declarator
+        ;
+
 abstract_parameter_declarator:
         abstract_parameter_ptr