diff options
author | John Hodge <tpg@mutabah.net> | 2016-11-02 19:38:45 +0800 |
---|---|---|
committer | John Hodge <tpg@mutabah.net> | 2016-11-02 19:38:45 +0800 |
commit | 983ff1c26e15a13e6a1e0e4bb1e964ec496a4777 (patch) | |
tree | bc39e1e44e63b9440dd186c2781e4ad02f82c2c5 /src/ast | |
parent | 739c2f5a2124e9aa4fcc01e8fc1dbfe147a37254 (diff) | |
download | mrust-983ff1c26e15a13e6a1e0e4bb1e964ec496a4777.tar.gz |
Parse - Rework hygiene (with spelling fix) for take 2
Diffstat (limited to 'src/ast')
-rw-r--r-- | src/ast/path.cpp | 2 | ||||
-rw-r--r-- | src/ast/path.hpp | 6 | ||||
-rw-r--r-- | src/ast/pattern.hpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ast/path.cpp b/src/ast/path.cpp index 25c0c208..ac023c8f 100644 --- a/src/ast/path.cpp +++ b/src/ast/path.cpp @@ -162,7 +162,7 @@ AST::Path::Path(const Path& x): m_class = Class::make_Local({ent.name}); ), (Relative, - m_class = Class::make_Relative({ent.hygine, ent.nodes}); + m_class = Class::make_Relative({ent.hygiene, ent.nodes}); ), (Self, m_class = Class::make_Self({ent.nodes}); diff --git a/src/ast/path.hpp b/src/ast/path.hpp index 5c2481a0..b45767a2 100644 --- a/src/ast/path.hpp +++ b/src/ast/path.hpp @@ -162,7 +162,7 @@ public: ::std::string name; } ), (Relative, struct { // General relative - Ident::Hygine hygine; // Taken from the first ident + Ident::Hygiene hygiene; ::std::vector<PathNode> nodes; } ), (Self, struct { // Module-relative @@ -226,8 +226,8 @@ public: // RELATIVE struct TagRelative {}; - Path(TagRelative, Ident::Hygine hygine, ::std::vector<PathNode> nodes): - m_class( Class::make_Relative({ mv$(hygine), mv$(nodes) }) ) + Path(TagRelative, Ident::Hygiene hygiene, ::std::vector<PathNode> nodes): + m_class( Class::make_Relative({ mv$(hygiene), mv$(nodes) }) ) {} // SELF struct TagSelf {}; diff --git a/src/ast/pattern.hpp b/src/ast/pattern.hpp index 0dff4071..a2df7b59 100644 --- a/src/ast/pattern.hpp +++ b/src/ast/pattern.hpp @@ -35,7 +35,7 @@ public: unsigned int m_slot; PatternBinding(): - m_name({0,{}}, ""), + m_name({}, ""), m_type(Type::MOVE), m_mutable(false), m_slot( ~0u ) |