summaryrefslogtreecommitdiff
path: root/src/mir/from_hir.hpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-12-28 14:39:59 +1100
committerJohn Hodge <tpg@mutabah.net>2016-12-28 14:39:59 +1100
commit583686bd2ebef786e1396ecaff4c61a984135b74 (patch)
tree713480e2d3e1eb34419bcb29e59166a878e1f2fe /src/mir/from_hir.hpp
parent45eaa2b6b40a501c4eea7e3c3e04ba9de2dd7f5d (diff)
downloadmrust-583686bd2ebef786e1396ecaff4c61a984135b74.tar.gz
MIR Gen - Spaces removed, misc thinking
Diffstat (limited to 'src/mir/from_hir.hpp')
-rw-r--r--src/mir/from_hir.hpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mir/from_hir.hpp b/src/mir/from_hir.hpp
index aae19d97..b89e8750 100644
--- a/src/mir/from_hir.hpp
+++ b/src/mir/from_hir.hpp
@@ -46,15 +46,15 @@ enum class InvalidType {
Descoped,
};
TAGGED_UNION(VarState, Uninit,
-// Currently invalid
-(Invalid, InvalidType),
-// Partially valid (Map of field states, Box is assumed to have one field)
-(Partial, ::std::vector<VarState>),
-// Optionally valid (integer indicates the drop flag index)
-(Optional, unsigned int),
-// Fully valid
-(Valid, struct {}),
-)
+ // Currently invalid
+ (Invalid, InvalidType),
+ // Partially valid (Map of field states, Box is assumed to have one field)
+ (Partial, ::std::vector<VarState>),
+ // Optionally valid (integer indicates the drop flag index)
+ (Optional, unsigned int),
+ // Fully valid
+ (Valid, struct {}),
+ )
#endif
// TODO: Replace the first three states with just one (and flags for init/moved)
@@ -91,6 +91,7 @@ TAGGED_UNION(ScopeType, Variables,
::std::vector<SplitArm> arms;
}),
(Loop, struct {
+ ::std::vector<SplitArm> exit_states;
})
);