Merge remote-tracking branch 'remotes/origin/master' into nightly-1.29

3 files changed, 8 insertions, 1 deletions

diff --git a/src/macro_rules/macro_rules_ptr.hpp b/src/macro_rules/macro_rules_ptr.hpp
index fdb01fbe..5dbfd032 100644
--- a/src/macro_rules/macro_rules_ptr.hpp
+++ b/src/macro_rules/macro_rules_ptr.hpp
@@ -14,7 +14,7 @@ class MacroRulesPtr
     MacroRules* m_ptr;
 public:
     MacroRulesPtr(): m_ptr(nullptr) {}
-    MacroRulesPtr(MacroRules* p): m_ptr(p) {}
+    MacroRulesPtr(MacroRules* p);
     MacroRulesPtr(MacroRulesPtr&& x):
         m_ptr(x.m_ptr)
     {
diff --git a/src/macro_rules/mod.cpp b/src/macro_rules/mod.cpp
index e9ecb504..2ad325b8 100644
--- a/src/macro_rules/mod.cpp
+++ b/src/macro_rules/mod.cpp
@@ -168,10 +168,16 @@ bool is_token_vis(eTokenType tt) {
     }
 }
 
+MacroRulesPtr::MacroRulesPtr(MacroRules* p):
+    m_ptr(p)
+{
+    //::std::cout << "MRP new " << m_ptr << ::std::endl;
+}
 MacroRulesPtr::~MacroRulesPtr()
 {
     if(m_ptr)
     {
+        //::std::cout << "MRP delete " << m_ptr << ::std::endl;
         delete m_ptr;
         m_ptr = nullptr;
     }
diff --git a/src/macro_rules/parse.cpp b/src/macro_rules/parse.cpp
index 43ffb097..6a476ef1 100644
--- a/src/macro_rules/parse.cpp
+++ b/src/macro_rules/parse.cpp
@@ -265,6 +265,7 @@ MacroRule Parse_MacroRules_Var(TokenStream& lex)
     {
     case TOK_BRACE_OPEN:    close = TOK_BRACE_CLOSE;    break;
     case TOK_PAREN_OPEN:    close = TOK_PAREN_CLOSE;    break;
+    case TOK_SQUARE_OPEN:   close = TOK_SQUARE_CLOSE;   break;
     default:
         throw ParseError::Unexpected(lex, tok);
     }