diff options
| author | John Hodge (bugs) <tpg@mutabah.net> | 2017-07-06 17:41:10 +0800 |
|---|---|---|
| committer | John Hodge (bugs) <tpg@mutabah.net> | 2017-07-06 17:41:10 +0800 |
| commit | 48e2c4973d5401c9f7d0ee2bac22ac6015744961 (patch) | |
| tree | b93fb21b85343633e2d0c00c42ea7a388bb6f883 /src/ast/expr.cpp | |
| parent | ce3d36a90b9efd11c94f9084b5e727d65b6509a7 (diff) | |
| parent | c4e88b3c49736e71534c918a83956885c052beb8 (diff) | |
| download | mrust-48e2c4973d5401c9f7d0ee2bac22ac6015744961.tar.gz | |
Merge branch 'master' of https://github.com/thepowersgang/mrustc
# Conflicts:
# src/trans/codegen_c.cpp
Diffstat (limited to 'src/ast/expr.cpp')
| -rw-r--r-- | src/ast/expr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ast/expr.cpp b/src/ast/expr.cpp index dd586683..c1baf9b4 100644 --- a/src/ast/expr.cpp +++ b/src/ast/expr.cpp @@ -69,11 +69,11 @@ ExprNode::~ExprNode() { #define OPT_CLONE(node) (node.get() ? node->clone() : ::AST::ExprNodeP()) namespace { - static inline ExprNodeP mk_exprnodep(const Position& pos, AST::ExprNode* en) { - en->set_pos(pos); + static inline ExprNodeP mk_exprnodep(const Span& pos, AST::ExprNode* en) { + en->set_span(pos); return ExprNodeP(en); } - #define NEWNODE(type, ...) mk_exprnodep(get_pos(), new type(__VA_ARGS__)) + #define NEWNODE(type, ...) mk_exprnodep(span(), new type(__VA_ARGS__)) } NODE(ExprNode_Block, { @@ -453,7 +453,7 @@ NV(ExprNode_Block, { }) NV(ExprNode_Macro, { - BUG(node.get_pos(), "Hit unexpanded macro in expression - " << node); + BUG(node.span(), "Hit unexpanded macro in expression - " << node); }) NV(ExprNode_Asm, { |