Changeset 4e13e2a for src/AST

Timestamp:

Sep 17, 2019, 12:56:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8e1467d

Parents:

a6f26ca

Message:

Added setting of result in Comma expression.
Added asserts in candidate finder to catch null pointers earlier.
ForAll substituter now properly uses ShallowCopy.
Added missing makefile.in

Location:

src/AST

Files:

• Expr.hpp (modified) (1 diff)
• ForallSubstitutionTable.cpp (modified) (3 diffs)

src/AST/Expr.hpp

@@ -541 +541 @@
 
         CommaExpr( const CodeLocation & loc, const Expr * a1, const Expr * a2 )
-        : Expr( loc ), arg1( a1 ), arg2( a2 ) {}
+        : Expr( loc ), arg1( a1 ), arg2( a2 ) {
+                this->result = a2->result;
+        }
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/ForallSubstitutionTable.cpp

@@ -19 +19 @@
 #include <vector>
 
+#include "Copy.hpp"                // for shallowCopy
 #include "Decl.hpp"
 #include "Node.hpp"
@@ -26 +27 @@
 namespace ast {
 
-std::vector< ptr< TypeDecl > > ForallSubstitutionTable::clone( 
-        const std::vector< ptr< TypeDecl > > & forall, Visitor & v 
+std::vector< ptr< TypeDecl > > ForallSubstitutionTable::clone(
+        const std::vector< ptr< TypeDecl > > & forall, Visitor & v
 ) {
         std::vector< ptr< TypeDecl > > new_forall;
@@ -34 +35 @@
         for ( const ast::TypeDecl * d : forall ) {
                 // create cloned type decl and insert into substitution map before further mutation
-                auto new_d = new ast::TypeDecl{
-                        d->location, d->name, d->storage, d->base, d->kind, d->sized, d->init };
+                auto new_d = shallowCopy( d );
                 decls.insert( d, new_d );
                 // perform other mutations and add to output