Changeset 28e88d7 for src

Timestamp:

Dec 17, 2020, 9:55:18 AM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

19de7864, 7a70fb2

Parents:

c8025a21 (diff), a00a2c1 (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/Decl.hpp (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)

src/AST/Decl.hpp

@@ -127 +127 @@
         std::vector<ptr<DeclWithType>> params;
         std::vector<ptr<DeclWithType>> returns;
+        std::vector<ptr<TypeDecl>> type_params;
+        std::vector<ptr<DeclWithType>> assertions;
         // declared type, derived from parameter declarations
         ptr<FunctionType> type;
@@ -132 +134 @@
         std::vector< ptr<Expr> > withExprs;
 
-        std::vector<ptr<TypeDecl>> type_params;
-        std::vector<ptr<DeclWithType>> assertions;
 
         FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,

src/ResolvExpr/Resolver.cc

@@ -1538 +1538 @@
         const PtrType * handlePtrType( const PtrType * type, const ast::SymbolTable & symtab ) {
                 if ( type->dimension ) {
-                        #warning should use new equivalent to Validate::SizeType rather than sizeType here
-                        ast::ptr< ast::Type > sizeType = new ast::BasicType{ ast::BasicType::LongUnsignedInt };
+                        ast::ptr< ast::Type > sizeType = ast::sizeType;
                         ast::mutate_field(
                                 type, &PtrType::dimension,