Changeset 99614c2 for src/SynTree

Timestamp:

Feb 14, 2019, 4:27:49 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

43e0949

Parents:

80eefcb

Message:

InitAlternatives? are now in vectors

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• Expression.h (modified) (3 diffs)

src/SynTree/Expression.cc

@@ -698 +698 @@
 }
 
-UntypedInitExpr::UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts ) : expr( expr ), initAlts( initAlts ) {}
+UntypedInitExpr::UntypedInitExpr( Expression * expr, const std::vector<InitAlternative> & initAlts ) : expr( expr ), initAlts( initAlts ) {}
 UntypedInitExpr::UntypedInitExpr( const UntypedInitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), initAlts( other.initAlts ) {}
 UntypedInitExpr::~UntypedInitExpr() {

src/SynTree/Expression.h

@@ -62 +62 @@
         InferredParams inferParams;       ///< Post-resolution inferred parameter slots
         std::vector<UniqueId> resnSlots;  ///< Pre-resolution inferred parameter slots
-        
+
         // xxx - should turn inferParams+resnSlots into a union to save some memory
 
@@ -813 +813 @@
 public:
         Expression * expr;
-        std::list<InitAlternative> initAlts;
-
-        UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
+        std::vector<InitAlternative> initAlts;
+
+        UntypedInitExpr( Expression * expr, const std::vector<InitAlternative> & initAlts );
         UntypedInitExpr( const UntypedInitExpr & other );
         ~UntypedInitExpr();
@@ -822 +822 @@
         UntypedInitExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
 
-        std::list<InitAlternative> & get_initAlts() { return initAlts; }
+        std::vector<InitAlternative> & get_initAlts() { return initAlts; }
 
         virtual UntypedInitExpr * clone() const { return new UntypedInitExpr( * this ); }