Changes in src/ControlStruct/LabelFixer.h [843054c2:1869adf]

File:

• src/ControlStruct/LabelFixer.h (modified) (3 diffs)

src/ControlStruct/LabelFixer.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:31:55 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jun 23 15:47:25 2015
+// Update Count     : 28
 //
 
@@ -53 +53 @@
                 virtual void visit( DeclStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
                 virtual void visit( BranchStmt *branchStmt );
+                virtual void visit( UntypedExpr *untyped );
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );
-                Label setLabelsUsg( Label, Statement *usage = 0 );
+                template< typename UsageNode >
+                void setLabelsUsg( Label, UsageNode *usage = 0 );
 
           private:
                 class Entry {
-                  public:
-                        Entry( Statement *to = 0, Statement *from = 0 );
+                        public:
+                        union UsageLoc {
+                                Statement * stmt;
+                                Expression * expr;
+
+                                void accept( Visitor &visitor );
+                        };
+
+                        Entry( Statement *to ) : definition( to ) {}
+                        Entry( Statement *to, Statement *from );
+                        Entry( Statement *to, Expression *from );
                         bool used() { return ( usage.empty() ); }
                         bool defined() { return ( definition != 0 ); }
@@ -66 +77 @@
 
                         Label get_label() const { return label; }
+                        void set_label( Label lab ) { label = lab; }
+
                         Statement *get_definition() const { return definition; }
-                        std::list< Statement *> &get_uses() { return usage; }
-
-                        void add_use ( Statement *use ) { usage.push_back( use ); }
-                        void add_uses ( std::list<Statement *> uses ) { usage.insert( usage.end(), uses.begin(), uses.end() ); }
                         void set_definition( Statement *def ) { definition = def; }
 
-                        void set_label( Label lab ) { label = lab; }
-                        Label gset_label() const { return label; }
+                        std::list< UsageLoc > &get_uses() { return usage; }
+                        void add_use( Statement *use ) {
+                                UsageLoc loc;
+                                loc.stmt = use;
+                                usage.push_back( loc ); 
+                        }
+                        void add_use( Expression *use ) {
+                                UsageLoc loc;
+                                loc.expr = use;
+                                usage.push_back( loc );                                 
+                        }
+
+                        void add_uses ( Entry &other ) { usage.insert( usage.end(), other.usage.begin(), usage.end() ); }
                   private:
                         Label label;  
                         Statement *definition;
-                        std::list<Statement *> usage;
+                        std::list<UsageLoc> usage;
                 };
                   
                 std::map < Label, Entry *> labelTable;
                 LabelGenerator *generator;
+                Statement * currentStatement;
         };
 } // namespace ControlStruct