History

Convert static members to constexpr getters. This is hopefully going to avoid the built issues on Mac.

arr committed 9 years ago

Commit b0ff2261 parent c55b47f2 files · +44 −44Browse files

Showing the changes to src/asm (1 of 2 files). Show all

Unified · Split

src/asm/type_signature.cpp+3−18
@@ -34,8 +34,6 @@ namespace · 33 unmodified lines
3434 }
3535 }
3636
37−const char sig_stream_t::delim = ',';
38−
3937 uint32_t sig_stream_t::compute_signature_hash(const char *sig)
4038 {
4139 std::string sig_local{ sig };
@@ -142,12 +140,6 @@ sig_stream_t &disvm::assembly::sigkind::operator<<(sig_stream_t &os, const Tm &m · 100 unmodified lines
142140 return os << m._s;
143141 }
144142
145−template<> const char Ttuple::begin = '(';
146−template<> const char Ttuple::end = ')';
147−
148−template<> const char Tmodule::begin = '{';
149−template<> const char Tmodule::end = '}';
150−
151143 sig_stream_t &disvm::assembly::sigkind::operator<<(sig_stream_t &os, const Ttuple &t)
152144 {
153145 return os << t._s;
@@ -158,25 +150,21 @@ sig_stream_t &disvm::assembly::sigkind::operator<<(sig_stream_t &os, const Tmodu · 4 unmodified lines
158150 return os << m._s;
159151 }
160152
161−const char *Tadt_pick_tag::tag_delim = "=>";
162−const char Tadt_pick_tag::begin = '(';
163−const char Tadt_pick_tag::end = ')';
164−
165153 Tadt_pick_tag Tadt_pick_tag::create(const char *pick_tag, uint32_t adt_ref, std::initializer_list<const Tm> tms)
166154 {
167155 sig_stream_t ss;
168− ss << pick_tag << Tadt_pick_tag::tag_delim << Tbasic_type::id << Tadt_pick_tag::begin;
156+ ss << pick_tag << Tadt_pick_tag::tag_delim() << Tbasic_type::id << Tadt_pick_tag::begin();
169157
170158 auto tm = tms.begin();
171159 for (auto c = 0; tm != tms.end(); tm++, c++)
172160 {
173161 if (c > 0)
174− ss << sig_stream_t::delim;
162+ ss << sig_stream_t::delim();
175163
176164 ss << *tm;
177165 }
178166
179− ss << Tadt_pick_tag::end << Tref::id << adt_ref;
167+ ss << Tadt_pick_tag::end() << Tref::id << adt_ref;
180168
181169 return Tadt_pick_tag{ ss };
182170 }
@@ -186,9 +174,6 @@ sig_stream_t &disvm::assembly::sigkind::operator<<(sig_stream_t &os, const Tadt_ · 3 unmodified lines
186174 return os << t._s;
187175 }
188176
189−template<> const char Tnested_aggregate_type<type_id_t::adt>::begin = '(';
190−template<> const char Tnested_aggregate_type<type_id_t::adt>::end = ')';
191−
192177 sig_stream_t &disvm::assembly::sigkind::operator<<(sig_stream_t &os, const Tnested_aggregate_type<type_id_t::adt> &a)
193178 {
194179 return os << a._s;