Changeset 3c6e417 for src/AST/Type.hpp

Timestamp:

Jun 20, 2019, 1:45:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

54dd994

Parents:

1e5dedc4 (diff), c0f9efe (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Type.hpp (modified) (4 diffs)

src/AST/Type.hpp

@@ -37 +37 @@
 public:
         CV::Qualifiers qualifiers;
-
-        Type( CV::Qualifiers q = {} ) : qualifiers(q) {}
+        std::vector<ptr<Attribute>> attributes;
+
+        Type( CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
+        : qualifiers(q), attributes(std::move(as)) {}
 
         bool is_const() const { return qualifiers.is_const; }
@@ -268 +270 @@
         ForallList forall;
 
-        ParameterizedType( ForallList&& fs = {}, CV::Qualifiers q = {} )
-        : Type(q), forall(std::move(fs)) {}
-        ParameterizedType( CV::Qualifiers q ) : Type(q), forall() {}
+        ParameterizedType( ForallList&& fs = {}, CV::Qualifiers q = {},
+                std::vector<ptr<Attribute>> && as = {} )
+        : Type(q, std::move(as)), forall(std::move(fs)) {}
+
+        ParameterizedType( CV::Qualifiers q, std::vector<ptr<Attribute>> && as = {} )
+        : Type(q, std::move(as)), forall() {}
 
 private:
@@ -311 +316 @@
 public:
         std::vector<ptr<Expr>> params;
-        std::vector<ptr<Attribute>> attributes;
         std::string name;
         bool hoistType = false;
@@ -317 +321 @@
         ReferenceToType( const std::string& n, CV::Qualifiers q = {},
                 std::vector<ptr<Attribute>> && as = {} )
-        : ParameterizedType(q), params(), attributes(std::move(as)), name(n) {}
+        : ParameterizedType(q, std::move(as)), params(), name(n) {}
 
         /// Gets aggregate declaration this type refers to