summaryrefslogtreecommitdiff
path: root/tools/standalone_miri/module_tree.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2018-05-12 19:05:54 +0800
committerJohn Hodge <tpg@mutabah.net>2018-05-12 19:05:54 +0800
commitd8928895e318b026f106a30f145d6a41be74cb0f (patch)
tree4c099c70bb7fff13c2bacaa022fff7d4037f70e3 /tools/standalone_miri/module_tree.cpp
parent5de0393d29ac0e7eb3ede52fe665fd49ac412f21 (diff)
downloadmrust-d8928895e318b026f106a30f145d6a41be74cb0f.tar.gz
Standalone MIRI - Fiddling around
Diffstat (limited to 'tools/standalone_miri/module_tree.cpp')
-rw-r--r--tools/standalone_miri/module_tree.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/standalone_miri/module_tree.cpp b/tools/standalone_miri/module_tree.cpp
index f6b681cf..a75cfa8f 100644
--- a/tools/standalone_miri/module_tree.cpp
+++ b/tools/standalone_miri/module_tree.cpp
@@ -147,13 +147,14 @@ bool Parser::parse_one()
// TODO: Figure out how to create this allocation...
//s.val.allocation.alloc().relocations.push_back({ ofs, AllocationPtr::new_string(reloc_str) });
}
- else if( lex.next() == "::" )
+ else if( lex.next() == "::" || lex.next() == "<" )
{
auto reloc_path = parse_path();
s.val.allocation.alloc().relocations.push_back({ ofs, AllocationPtr::new_fcn(reloc_path) });
}
else
{
+ LOG_FATAL(lex << "Unexepcted token " << lex.next() << " in relocation value");
throw "ERROR";
}
if( ! lex.consume_if(',') ) {