Changeset cd5eb4b


Ignore:
Timestamp:
Jan 30, 2023, 1:39:21 PM (14 months ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
82b96953
Parents:
418882a (diff), ad861ef (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:
5 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Node.hpp

    r418882a rcd5eb4b  
    1919#include <cstddef>     // for nullptr_t
    2020#include <iosfwd>
    21 #include <type_traits> // for remove_reference
    2221
    2322#include "Common/ErrorObjects.h"  // for SemanticErrorException
     
    3635        Node(const Node&) : strong_count(0), weak_count(0) {}
    3736        Node(Node&&) : strong_count(0), weak_count(0) {}
    38         Node& operator= (const Node&) = delete;
    39         Node& operator= (Node&&) = delete;
     37        Node& operator=(const Node&) = delete;
     38        Node& operator=(Node&&) = delete;
    4039        virtual ~Node() {}
    4140
  • src/GenPoly/GenPoly.cc

    r418882a rcd5eb4b  
    2424#include <vector>                       // for vector
    2525
     26#include "AST/Expr.hpp"
    2627#include "AST/Type.hpp"
     28#include "AST/TypeSubstitution.hpp"
    2729#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
    2830#include "ResolvExpr/typeops.h"         // for flatten
  • src/Parser/lex.ll

    r418882a rcd5eb4b  
    1010 * Created On       : Sat Sep 22 08:58:10 2001
    1111 * Last Modified By : Peter A. Buhr
    12  * Last Modified On : Thu Oct 13 20:46:04 2022
    13  * Update Count     : 764
     12 * Last Modified On : Fri Jan 20 12:08:37 2023
     13 * Update Count     : 766
    1414 */
    1515
     
    340340vtable                  { KEYWORD_RETURN(VTABLE); }                             // CFA
    341341waitfor                 { KEYWORD_RETURN(WAITFOR); }                    // CFA
     342waituntil               { KEYWORD_RETURN(WAITUNTIL); }                  // CFA
    342343when                    { KEYWORD_RETURN(WHEN); }                               // CFA
    343344while                   { KEYWORD_RETURN(WHILE); }
  • src/Parser/parser.yy

    r418882a rcd5eb4b  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Nov 21 22:34:30 2022
    13 // Update Count     : 5848
     12// Last Modified On : Fri Jan 20 12:11:56 2023
     13// Update Count     : 5855
    1414//
    1515
     
    331331%token ATTRIBUTE EXTENSION                                                              // GCC
    332332%token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
    333 %token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR    // CFA
     333%token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA
    334334%token DISABLE ENABLE TRY THROW THROWRESUME AT                  // CFA
    335335%token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
     
    19391939        TYPEDEF type_specifier declarator
    19401940                {
     1941                        // if type_specifier is an anon aggregate => name
    19411942                        typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
    19421943                        $$ = $3->addType( $2 )->addTypedef();
     
    24732474        | EXTENSION type_specifier field_declaring_list_opt ';' // GCC
    24742475                { $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
     2476        | STATIC type_specifier field_declaring_list_opt ';' // CFA
     2477                { SemanticError( yylloc, "STATIC aggregate field qualifier currently unimplemented." ); $$ = nullptr; }
    24752478        | INLINE type_specifier field_abstract_list_opt ';'     // CFA
    24762479                {
  • src/ResolvExpr/typeops.h

    r418882a rcd5eb4b  
    1818#include <vector>
    1919
    20 #include "Cost.h"
    21 #include "TypeEnvironment.h"
    22 #include "WidenMode.h"
    23 #include "AST/Fwd.hpp"
    24 #include "AST/Node.hpp"
    25 #include "AST/SymbolTable.hpp"
    2620#include "AST/Type.hpp"
    27 #include "AST/TypeEnvironment.hpp"
    28 #include "SynTree/SynTree.h"
    2921#include "SynTree/Type.h"
    3022
     
    3426
    3527namespace ResolvExpr {
     28        class TypeEnvironment;
     29
    3630        // combos: takes a list of sets and returns a set of lists representing every possible way of forming a list by
    3731        // picking one element out of each set
Note: See TracChangeset for help on using the changeset viewer.