Changeset 3ca540f for src/SymTab/Autogen.cc

Timestamp:

Dec 1, 2017, 2:55:41 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a40d503

Parents:

882ad37 (diff), 5da9d6a (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' into with-statement

File:

• src/SymTab/Autogen.cc (modified) (6 diffs)

src/SymTab/Autogen.cc

@@ -264 +264 @@
                 Type::StorageClasses scs = functionNesting > 0 ? Type::StorageClasses() : Type::StorageClasses( Type::Static );
                 LinkageSpec::Spec spec = isIntrinsic ? LinkageSpec::Intrinsic : LinkageSpec::AutoGen;
-                FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt( noLabels ),
+                FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt(),
                                                                                                 std::list< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) );
                 decl->fixUniqueId();
@@ -299 +299 @@
                                 assert( assignType->returnVals.size() == 1 );
                                 ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.front() );
-                                dcl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( dstParam ) ) );
+                                dcl->statements->push_back( new ReturnStmt( new VariableExpr( dstParam ) ) );
                         }
                         resolve( dcl );
@@ -468 +468 @@
                 copy->args.push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
                 copy->args.push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
-                *out++ = new ExprStmt( noLabels, copy );
+                *out++ = new ExprStmt( copy );
         }
 
@@ -544 +544 @@
                         callExpr->get_args().push_back( new VariableExpr( dstParam ) );
                         callExpr->get_args().push_back( new VariableExpr( srcParam ) );
-                        funcDecl->statements->push_back( new ExprStmt( noLabels, callExpr ) );
+                        funcDecl->statements->push_back( new ExprStmt( callExpr ) );
                 } else {
                         // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
@@ -569 +569 @@
                 expr->args.push_back( new CastExpr( new VariableExpr( dst ), new ReferenceType( Type::Qualifiers(), typeDecl->base->clone() ) ) );
                 if ( src ) expr->args.push_back( new CastExpr( new VariableExpr( src ), typeDecl->base->clone() ) );
-                dcl->statements->kids.push_back( new ExprStmt( noLabels, expr ) );
+                dcl->statements->kids.push_back( new ExprStmt( expr ) );
         };
 
@@ -664 +664 @@
                         untyped->get_args().push_back( new VariableExpr( ftype->get_parameters().back() ) );
                 }
-                function->get_statements()->get_kids().push_back( new ExprStmt( noLabels, untyped ) );
-                function->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
+                function->get_statements()->get_kids().push_back( new ExprStmt( untyped ) );
+                function->get_statements()->get_kids().push_back( new ReturnStmt( UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
         }