1 files changed, 162 insertions, 162 deletions
diff --git a/src/macro_rules/macro_rules.hpp b/src/macro_rules/macro_rules.hpp
index 337a4707..aed0e8ce 100644
--- a/src/macro_rules/macro_rules.hpp
+++ b/src/macro_rules/macro_rules.hpp
@@ -1,162 +1,162 @@
-/*
- * MRustC - Rust Compiler
- * - By John Hodge (Mutabah/thePowersGang)
- *
- * macro_rules/macro_rules.hpp
- * - Macros by example - `macro_rules!`
- */
-#ifndef MACROS_HPP_INCLUDED
-#define MACROS_HPP_INCLUDED
-
-#include "parse/lex.hpp"
-#include "parse/tokentree.hpp"
-#include <common.hpp>
-#include <map>
-#include <memory>
-#include <cstring>
-#include "macro_rules_ptr.hpp"
-#include <set>
-
-class MacroExpander;
-
-TAGGED_UNION_EX(MacroExpansionEnt, (: public Serialisable), Token, (
-    // TODO: have a "raw" stream instead of just tokens
-    (Token, Token),
-    // TODO: Have a flag on `NamedValue` that indicates that it is the only/last usage of this particular value (at this level)
-    // NOTE: This is a 2:30 bitfield - with the high range indicating $crate
-    (NamedValue, unsigned int),
-    (Loop, struct {
-        /// Contained entries
-        ::std::vector< MacroExpansionEnt>   entries;
-        /// Token used to join iterations
-        Token   joiner;
-        /// List of variables within this loop that control its iteration count
-        /// Boolean is true if the variable will be unconditionally expanded
-        ::std::map< unsigned int, bool>    variables;
-        })
-    ),
-    (),
-    (),
-    (
-    public:
-        SERIALISABLE_PROTOTYPES();
-    )
-    );
-extern ::std::ostream& operator<<(::std::ostream& os, const MacroExpansionEnt& x);
-
-/// Matching pattern entry
-struct MacroPatEnt:
-    public Serialisable
-{
-    ::std::string   name;
-    unsigned int    name_index = 0;
-    Token   tok;
-    
-    ::std::vector<MacroPatEnt>  subpats;
-    
-    enum Type {
-        PAT_TOKEN,  // A token
-        PAT_LOOP,   // $() Enables use of subpats
-        
-        PAT_TT, // :tt
-        PAT_PAT,    // :pat
-        PAT_IDENT,
-        PAT_PATH,
-        PAT_TYPE,
-        PAT_EXPR,
-        PAT_STMT,
-        PAT_BLOCK,
-        PAT_META,
-        PAT_ITEM,   // :item
-    } type;
-
-    MacroPatEnt():
-        tok(TOK_NULL),
-        type(PAT_TOKEN)
-    {
-    }
-    MacroPatEnt(Token tok):
-        tok( mv$(tok) ),
-        type(PAT_TOKEN)
-    {
-    }
-    
-    MacroPatEnt(::std::string name, unsigned int name_index, Type type):
-        name( mv$(name) ),
-        name_index( name_index ),
-        tok(),
-        type(type)
-    {
-    }
-    
-    MacroPatEnt(Token sep, bool need_once, ::std::vector<MacroPatEnt> ents):
-        name( need_once ? "+" : "*" ),
-        tok( mv$(sep) ),
-        subpats( move(ents) ),
-        type(PAT_LOOP)
-    {
-    }
-
-    friend ::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt& x);
-    friend ::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt::Type& x);
-    
-    SERIALISABLE_PROTOTYPES();
-};
-
-/// An expansion arm within a macro_rules! blcok
-struct MacroRulesArm:
-    public Serialisable
-{
-    /// Names for the parameters
-    ::std::vector< ::std::string>   m_param_names;
-    
-    /// Patterns
-    ::std::vector<MacroPatEnt>  m_pattern;
-    
-    /// Rule contents
-    ::std::vector<MacroExpansionEnt> m_contents;
-    
-    MacroRulesArm()
-    {}
-    MacroRulesArm(::std::vector<MacroPatEnt> pattern, ::std::vector<MacroExpansionEnt> contents):
-        m_pattern( mv$(pattern) ),
-        m_contents( mv$(contents) )
-    {}
-    MacroRulesArm(const MacroRulesArm&) = delete;
-    MacroRulesArm& operator=(const MacroRulesArm&) = delete;
-    MacroRulesArm(MacroRulesArm&&) = default;
-    MacroRulesArm& operator=(MacroRulesArm&&) = default;
-    
-    SERIALISABLE_PROTOTYPES();
-};
-
-/// A sigle 'macro_rules!' block
-class MacroRules:
-    public Serialisable
-{
-public:
-    /// Marks if this macro should be exported from the defining crate
-    bool m_exported = false;
-    
-    /// Crate that defined this macro
-    /// - Populated on deserialise if not already set
-    ::std::string   m_source_crate;
-    
-    Ident::Hygiene  m_hygiene;
-    
-    /// Expansion rules
-    ::std::vector<MacroRulesArm>  m_rules;
-    
-    MacroRules()
-    {
-    }
-    virtual ~MacroRules();
-    MacroRules(MacroRules&&) = default;
-    
-    SERIALISABLE_PROTOTYPES();
-};
-
-extern ::std::unique_ptr<TokenStream>   Macro_InvokeRules(const char *name, const MacroRules& rules, TokenTree input, AST::Module& mod);
-extern MacroRulesPtr    Parse_MacroRules(TokenStream& lex);
-
-#endif // MACROS_HPP_INCLUDED
+/*
+ * MRustC - Rust Compiler
+ * - By John Hodge (Mutabah/thePowersGang)
+ *
+ * macro_rules/macro_rules.hpp
+ * - Macros by example - `macro_rules!`
+ */
+#ifndef MACROS_HPP_INCLUDED
+#define MACROS_HPP_INCLUDED
+
+#include "parse/lex.hpp"
+#include "parse/tokentree.hpp"
+#include <common.hpp>
+#include <map>
+#include <memory>
+#include <cstring>
+#include "macro_rules_ptr.hpp"
+#include <set>
+
+class MacroExpander;
+
+TAGGED_UNION_EX(MacroExpansionEnt, (: public Serialisable), Token, (
+    // TODO: have a "raw" stream instead of just tokens
+    (Token, Token),
+    // TODO: Have a flag on `NamedValue` that indicates that it is the only/last usage of this particular value (at this level)
+    // NOTE: This is a 2:30 bitfield - with the high range indicating $crate
+    (NamedValue, unsigned int),
+    (Loop, struct {
+        /// Contained entries
+        ::std::vector< MacroExpansionEnt>   entries;
+        /// Token used to join iterations
+        Token   joiner;
+        /// List of variables within this loop that control its iteration count
+        /// Boolean is true if the variable will be unconditionally expanded
+        ::std::map< unsigned int, bool>    variables;
+        })
+    ),
+    (),
+    (),
+    (
+    public:
+        SERIALISABLE_PROTOTYPES();
+    )
+    );
+extern ::std::ostream& operator<<(::std::ostream& os, const MacroExpansionEnt& x);
+
+/// Matching pattern entry
+struct MacroPatEnt:
+    public Serialisable
+{
+    ::std::string   name;
+    unsigned int    name_index = 0;
+    Token   tok;
+
+    ::std::vector<MacroPatEnt>  subpats;
+
+    enum Type {
+        PAT_TOKEN,  // A token
+        PAT_LOOP,   // $() Enables use of subpats
+
+        PAT_TT, // :tt
+        PAT_PAT,    // :pat
+        PAT_IDENT,
+        PAT_PATH,
+        PAT_TYPE,
+        PAT_EXPR,
+        PAT_STMT,
+        PAT_BLOCK,
+        PAT_META,
+        PAT_ITEM,   // :item
+    } type;
+
+    MacroPatEnt():
+        tok(TOK_NULL),
+        type(PAT_TOKEN)
+    {
+    }
+    MacroPatEnt(Token tok):
+        tok( mv$(tok) ),
+        type(PAT_TOKEN)
+    {
+    }
+
+    MacroPatEnt(::std::string name, unsigned int name_index, Type type):
+        name( mv$(name) ),
+        name_index( name_index ),
+        tok(),
+        type(type)
+    {
+    }
+
+    MacroPatEnt(Token sep, bool need_once, ::std::vector<MacroPatEnt> ents):
+        name( need_once ? "+" : "*" ),
+        tok( mv$(sep) ),
+        subpats( move(ents) ),
+        type(PAT_LOOP)
+    {
+    }
+
+    friend ::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt& x);
+    friend ::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt::Type& x);
+
+    SERIALISABLE_PROTOTYPES();
+};
+
+/// An expansion arm within a macro_rules! blcok
+struct MacroRulesArm:
+    public Serialisable
+{
+    /// Names for the parameters
+    ::std::vector< ::std::string>   m_param_names;
+
+    /// Patterns
+    ::std::vector<MacroPatEnt>  m_pattern;
+
+    /// Rule contents
+    ::std::vector<MacroExpansionEnt> m_contents;
+
+    MacroRulesArm()
+    {}
+    MacroRulesArm(::std::vector<MacroPatEnt> pattern, ::std::vector<MacroExpansionEnt> contents):
+        m_pattern( mv$(pattern) ),
+        m_contents( mv$(contents) )
+    {}
+    MacroRulesArm(const MacroRulesArm&) = delete;
+    MacroRulesArm& operator=(const MacroRulesArm&) = delete;
+    MacroRulesArm(MacroRulesArm&&) = default;
+    MacroRulesArm& operator=(MacroRulesArm&&) = default;
+
+    SERIALISABLE_PROTOTYPES();
+};
+
+/// A sigle 'macro_rules!' block
+class MacroRules:
+    public Serialisable
+{
+public:
+    /// Marks if this macro should be exported from the defining crate
+    bool m_exported = false;
+
+    /// Crate that defined this macro
+    /// - Populated on deserialise if not already set
+    ::std::string   m_source_crate;
+
+    Ident::Hygiene  m_hygiene;
+
+    /// Expansion rules
+    ::std::vector<MacroRulesArm>  m_rules;
+
+    MacroRules()
+    {
+    }
+    virtual ~MacroRules();
+    MacroRules(MacroRules&&) = default;
+
+    SERIALISABLE_PROTOTYPES();
+};
+
+extern ::std::unique_ptr<TokenStream>   Macro_InvokeRules(const char *name, const MacroRules& rules, TokenTree input, AST::Module& mod);
+extern MacroRulesPtr    Parse_MacroRules(TokenStream& lex);
+
+#endif // MACROS_HPP_INCLUDED