Changeset 6b6a3b8

Timestamp:

Jan 10, 2020, 11:39:37 AM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

4737d8e

Parents:

50cfa99

Message:

Fixed a memory leak and some line length issues in setLabelsDef.

File:

• src/ControlStruct/LabelFixer.cc (modified) (2 diffs)

src/ControlStruct/LabelFixer.cc

@@ -75 +75 @@
 
 
-        // sets the definition of the labelTable entry to be the provided statement for every label in the list
-        // parameter. Happens for every kind of statement
+        // Sets the definition of the labelTable entry to be the provided statement for every label in
+        // the list parameter. Happens for every kind of statement.
         Label LabelFixer::setLabelsDef( std::list< Label > & llabel, Statement * definition ) {
                 assert( definition != 0 );
                 assert( llabel.size() > 0 );
-
-                Entry * e = new Entry( definition );
 
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
@@ -87 +85 @@
                         l.set_statement( definition ); // attach statement to the label to be used later
                         if ( labelTable.find( l ) == labelTable.end() ) {
-                                // all labels on this statement need to use the same entry, so this should only be created once
+                                // All labels on this statement need to use the same entry,
+                                // so this should only be created once.
                                 // undefined and unused until now, add an entry
-                                labelTable[ l ] =  e;
+                                labelTable[ l ] = new Entry( definition );
                         } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
-                        }       else {
+                                SemanticError( l.get_statement()->location,
+                                        "Duplicate definition of label: " + l.get_name() );
+                        } else {
                                 // used previously, but undefined until now -> link with this entry
+                                // Question: Is changing objects important?
                                 delete labelTable[ l ];
-                                labelTable[ l ] = e;
+                                labelTable[ l ] = new Entry( definition );
                         } // if
                 } // for
 
-                // produce one of the labels attached to this statement to be temporarily used as the canonical label
+                // Produce one of the labels attached to this statement to be temporarily used as the
+                // canonical label.
                 return labelTable[ llabel.front() ]->get_label();
         }