Changeset 4b2589a

Timestamp:

Jun 29, 2016, 12:41:56 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

85f0713

Parents:

982d63f

Message:

clean up comments, remove dead code

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• ControlStruct/MLEMutator.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (3 diffs)
• SynTree/Label.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -750 +750 @@
         void CodeGenerator::visit( ReturnStmt *returnStmt ) {
                 output << "return ";
-
-                // xxx -- check for null expression;
-                if ( returnStmt->get_expr() ) {
-                        returnStmt->get_expr()->accept( *this );
-                } // if
+                maybeAccept( returnStmt->get_expr(), *this );
                 output << ";";
         }

src/ControlStruct/MLEMutator.cc

@@ -166 +166 @@
                         throw SemanticError("The label defined in the exit loop statement does not exist: " + originalTarget );  // shouldn't happen (since that's already checked)
                 }
-
-                // xxx - possibly remove this
-                // what about exiting innermost block or switch???
-                // if ( enclosingControlStructures.back() == (*targetEntry) )
-                //      return branchStmt;                              // exit the innermost loop (labels unnecessary)
 
                 // branch error checks, get the appropriate label name and create a goto

src/InitTweak/FixInit.cc

@@ -496 +496 @@
 
                 void ObjDeclCollector::visit( DeclStmt *stmt ) {
+                        // keep track of all variables currently in scope
                         if ( ObjectDecl * objDecl = dynamic_cast< ObjectDecl * > ( stmt->get_decl() ) ) {
                                 curVars.insert( objDecl );
@@ -503 +504 @@
 
                 void LabelFinder::handleStmt( Statement * stmt ) {
+                        // for each label, remember the variables in scope at that label.
                         for ( Label l : stmt->get_labels() ) {
                                 vars[l] = curVars;
@@ -549 +551 @@
                         Parent::visit( compoundStmt );
 
+                        // add destructors for the current scope that we're exiting
                         std::list< Statement * > & statements = compoundStmt->get_kids();
                         insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
-
-                        // xxx - ??
-                        // deleteAll( dtorStmts.back() );
                         reverseDeclOrder.pop_front();
                 }
 
                 void InsertDtors::visit( ReturnStmt * returnStmt ) {
+                        // return exits all scopes, so dump destructors for all scopes
                         for ( OrderedDecls & od : reverseDeclOrder ) {
                                 insertDtors( od.begin(), od.end(), back_inserter( stmtsToAdd ) );

src/SynTree/Label.h

@@ -21 +21 @@
 #include <iostream>
 #include "SynTree.h"
-
-// Label needs to know
-// * how deeply nested it is (scopeLevel)
-// * relative position in a scope compared with other labels (index?)
-// * either the original label it was generated from or the labels it generates (for labelled break/continue)
 
 class Label {