Rework macro handling to (hopefully) correctly handle nested repetions

8 files changed, 346 insertions, 132 deletions

diff --git a/src/macros.cpp b/src/macros.cpp
index 1dd4f16b..fe833dde 100644
--- a/src/macros.cpp
+++ b/src/macros.cpp
@@ -17,40 +17,140 @@ TokenTree   g_crate_path_tt = TokenTree({
     TokenTree(Token(TOK_STRING, "--CRATE--")),

     });

 

-class MacroExpander:

-    public TokenStream

+class ParameterMappings

 {

-public:

     // MultiMap (layer, name) -> TokenTree

     // - Multiple values are only allowed for layer>0

-    typedef ::std::pair<unsigned,const char*>   t_mapping_key;

-

-    struct cmp_mk {

-        bool operator()(const t_mapping_key& a, const t_mapping_key& b) const {

-            if( a.first < b.first )

-                return true;

-            if( a.first == b.first ) {

-                if( ::std::strcmp(a.second, b.second) < 0 )

-                    return true;

-            }

+    typedef ::std::pair<unsigned, unsigned> t_mapping_block;

+    struct t_mapping_key {

+        t_mapping_block block;

+        const char*     name;

+        

+        bool operator<(const t_mapping_key& x) const {

+            if( block < x.block )   return true;

+            if( block > x.block )   return false;

+            int cmp = ::std::strcmp(name, x.name);

+            if( cmp < 0 )   return true;

+            if( cmp > 0 )   return false;

+            // Equal

             return false;

         }

+        friend ::std::ostream& operator<<(::std::ostream& os, const t_mapping_key& x) {

+            os << "(" << x.block.first << ", " << x.block.second << " - '"<<x.name<<"')";

+            return os;

+        }

     };

-    typedef ::std::multimap<t_mapping_key, TokenTree, cmp_mk>    t_mappings;

+

+    ::std::vector<unsigned int> m_layer_indexes;

+    ::std::multimap<t_mapping_key, TokenTree>   m_inner;

+    ::std::map<t_mapping_block, unsigned int> m_counts;

+    

+public:

+    ParameterMappings()

+    {

+    }

+    

+    const ::std::multimap<t_mapping_key, TokenTree>& inner_() const {

+        return m_inner;

+    }

+    

+    size_t layer_count() const {

+        return m_layer_indexes.size();

+    }

+    

+    void prep_layer(unsigned int layer) {

+        // Need to ensure that [layer] is valid for insert

+        while( m_layer_indexes.size() <= layer )

+            m_layer_indexes.push_back(0);

+    }

+    void inc_layer(unsigned int layer) {

+        m_layer_indexes.at(layer) ++;

+    }

+    

+    void insert(unsigned int layer, const char *name, TokenTree data) {

+        unsigned int iteration = (layer > 0 ? m_layer_indexes.at(layer-1) : 0);

+        m_inner.insert( ::std::make_pair(

+            t_mapping_key { {layer, iteration}, name },

+            ::std::move(data)

+            ) );

+    }

+    

+    void calculate_counts()

+    {

+        assert( m_counts.size() == 0 );

+        auto ins_it = m_counts.begin();

+        const char* name = nullptr;

+        for( const auto& p : m_inner )

+        {

+            // If the first iteration, or the block changes

+            if( ins_it == m_counts.end() || ins_it->first < p.first.block )

+            {

+                ins_it = m_counts.insert(ins_it, ::std::make_pair(p.first.block, 1));

+                name = p.first.name;

+            }

+            else if( ::std::strcmp(name, p.first.name) == 0 )

+            {

+                ins_it->second ++;

+            }

+            else

+            {

+                // Ignore, the name has changed

+            }

+        }

+    }

+    

+    unsigned int iter_count(unsigned int layer, unsigned int parent_iteration) const {

+        t_mapping_block block = {layer, parent_iteration};

+        DEBUG("block = " << block);

+        const auto it = m_counts.find( block );

+        if( it == m_counts.end() ) {

+            DEBUG("m_counts = " << m_counts);

+            return 0;

+        }

+        return it->second;

+    }

+    

+    const TokenTree* get(unsigned int layer, unsigned int iteration, const char *name, unsigned int idx) const

+    {

+        const auto it_range = m_inner.equal_range( t_mapping_key { {layer, iteration}, name } );

+        if( it_range.first == it_range.second ) {

+            DEBUG("m_mappings = " << m_inner);

+            DEBUG("Can't find mapping");

+            return nullptr;

+        }

+        

+        size_t i = 0;

+        for( auto it = it_range.first; it != it_range.second; it ++ )

+        {

+            if( i == idx )

+            {

+                DEBUG(name << " #" << i);

+                return &it->second;

+            }

+            i ++;

+        }

+        DEBUG("Not enough mappings for name " << name << " at layer " << layer << " PI " << iteration);

+        return nullptr;

+    }

+};

+

+class MacroExpander:

+    public TokenStream

+{

+public:

 

 private:

     const TokenStream&  m_olex;

     const TokenTree&    m_crate_path;

     const ::std::vector<MacroRuleEnt>&  m_root_contents;

-    const t_mappings    m_mappings;

+    const ParameterMappings m_mappings;

     

     /// Layer states : Index and Iteration

     ::std::vector< ::std::pair<size_t,size_t> >   m_offsets;

+    ::std::vector< size_t > m_layer_iters;

     

     /// Cached pointer to the current layer

     const ::std::vector<MacroRuleEnt>*  m_cur_ents;  // For faster lookup.

-    /// Iteration counts for each layer

-    ::std::vector<size_t>   m_layer_counts;

 

     Token   m_next_token;   // used for inserting a single token into the stream

     ::std::unique_ptr<TTStream>   m_ttstream;

@@ -66,7 +166,7 @@ public:
     {

         prep_counts();

     }

-    MacroExpander(const TokenStream& olex, const ::std::vector<MacroRuleEnt>& contents, t_mappings mappings, const TokenTree& crate_path):

+    MacroExpander(const TokenStream& olex, const ::std::vector<MacroRuleEnt>& contents, ParameterMappings mappings, const TokenTree& crate_path):

         m_olex(olex),

         m_crate_path(crate_path),

         m_root_contents(contents),

@@ -170,10 +270,71 @@ void Macro_InitDefaults()
     }

 }

 

-void Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int layer, MacroExpander::t_mappings& bound_tts)

+bool Macro_TryPattern(TTStream& lex, const MacroPatEnt& pat)

+{

+    DEBUG("pat = " << pat);

+    switch(pat.type)

+    {

+    case MacroPatEnt::PAT_TOKEN:

+        return LOOK_AHEAD(lex) == pat.tok.type();

+    case MacroPatEnt::PAT_LOOP:

+        if( pat.name == "*" )

+            return true;

+        return Macro_TryPattern(lex, pat.subpats[0]);

+    case MacroPatEnt::PAT_BLOCK:

+        return LOOK_AHEAD(lex) == TOK_BRACE_OPEN;

+    case MacroPatEnt::PAT_IDENT:

+        return LOOK_AHEAD(lex) == TOK_IDENT;

+    case MacroPatEnt::PAT_TT:

+        return LOOK_AHEAD(lex) != TOK_EOF;

+    case MacroPatEnt::PAT_PATH:

+        return LOOK_AHEAD(lex) == TOK_IDENT

+            || LOOK_AHEAD(lex) == TOK_DOUBLE_COLON

+            || LOOK_AHEAD(lex) == TOK_RWORD_SUPER;

+    case MacroPatEnt::PAT_TYPE:

+        try {

+            TTStream slex = lex;

+            Parse_TT_Type(slex);

+            return true;

+        }

+        catch( const ParseError::Base& e ) {

+            return false;

+        }

+    case MacroPatEnt::PAT_EXPR:

+        return Parse_IsTokValue( LOOK_AHEAD(lex) );

+    case MacroPatEnt::PAT_STMT:

+        try {

+            TTStream slex = lex;

+            Parse_TT_Stmt(slex);

+            return true;

+        }

+        catch( const ParseError::Base& e ) {

+            return false;

+        }

+    case MacroPatEnt::PAT_PAT:

+        try {

+            TTStream slex = lex;

+            Parse_TT_Pattern(slex);

+            return true;

+        }

+        catch( const ParseError::Base& e ) {

+            return false;

+        }

+    }

+    throw ParseError::Todo(lex, FMT("Macro_TryPattern : " << pat));

+}

+

+bool Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int layer, ParameterMappings& bound_tts)

 {

+    TRACE_FUNCTION_F("layer = " << layer);

     Token   tok;

     TokenTree   val;

+    

+    if( !Macro_TryPattern(lex, pat) ) {

+        DEBUG("FAIL");

+        return false;

+    }

+    

     switch(pat.type)

     {

     case MacroPatEnt::PAT_TOKEN:

@@ -182,42 +343,38 @@ void Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int lay
         break;

     case MacroPatEnt::PAT_LOOP:

     //case MacroPatEnt::PAT_OPTLOOP:

-        if( layer )

         {

-            throw ParseError::BugCheck("Nested macro loop");

-        }

-        else

+        unsigned int match_count = 0;

+        DEBUG("Loop");

+        for(;;)

         {

-            DEBUG("Loop");

-            for(;;)

+            bound_tts.prep_layer(layer+1);

+            if( ! Macro_TryPattern(lex, pat.subpats[0]) )

             {

-                DEBUG("Try");

-                TTStream    saved = lex;

-                try {

-                    Macro_HandlePattern(lex, pat.subpats[0], layer+1, bound_tts);

-                }

-                catch(const ParseError::Base& e) {

-                    DEBUG("Breakout");

-                    lex = saved;

-                    break;

-                }

-                for( unsigned int i = 1; i < pat.subpats.size(); i ++ )

-                {

-                    Macro_HandlePattern(lex, pat.subpats[i], layer+1, bound_tts);

+                DEBUG("break");

+                break;

+            }

+            for( unsigned int i = 0; i < pat.subpats.size(); i ++ )

+            {

+                if( !Macro_HandlePattern(lex, pat.subpats[i], layer+1, bound_tts) ) {

+                    DEBUG("Ent " << i << " failed");

+                    return false;

                 }

-                DEBUG("succ");

-                if( pat.tok.type() != TOK_NULL )

+            }

+            bound_tts.inc_layer(layer+1);

+            match_count += 1;

+            DEBUG("succ");

+            if( pat.tok.type() != TOK_NULL )

+            {

+                if( GET_TOK(tok, lex) != pat.tok.type() )

                 {

-                    if( GET_TOK(tok, lex) != pat.tok.type() )

-                    {

-                        lex.putback(tok);

-                        break;

-                    }

+                    lex.putback(tok);

+                    break;

                 }

             }

-            DEBUG("Done");

         }

-        break;

+        DEBUG("Done (" << match_count << " matches)");

+        break; }

     

     case MacroPatEnt::PAT_TT:

         DEBUG("TT");

@@ -250,13 +407,13 @@ void Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int lay
             GET_CHECK_TOK(tok, lex, TOK_IDENT);

             val = TokenTree(tok);

         }

-        bound_tts.insert( ::std::make_pair( ::std::make_pair(layer, pat.name.c_str()), ::std::move(val) ) );

+        bound_tts.insert( layer, pat.name.c_str(), ::std::move(val) );

         break;

     

     //default:

     //    throw ParseError::Todo("full macro pattern matching");

     }

-

+    return true;

 }

 

 ::std::unique_ptr<TokenStream> Macro_InvokeInt(const TokenStream& olex, const char *name, const MacroRules& rules, TokenTree input)

@@ -282,23 +439,32 @@ void Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int lay
             throw ParseError::Unexpected(lex, tok);

         }

         */

-        MacroExpander::t_mappings   bound_tts;

+        ParameterMappings   bound_tts;

         // Parse according to rules

         try

         {

             for(const auto& pat : rule.m_pattern)

             {

-                Macro_HandlePattern(lex, pat, 0, bound_tts);

+                if( !Macro_HandlePattern(lex, pat, 0, bound_tts) )

+                    throw ParseError::Generic(lex, "Macro pattern failed");

             }

             

             //GET_CHECK_TOK(tok, lex, close);

             GET_CHECK_TOK(tok, lex, TOK_EOF);

-            DEBUG( rule.m_contents.size() << " rule contents bound to " << bound_tts.size() << " values - " << name );

-            for( const auto& v : bound_tts )

+            DEBUG( rule.m_contents.size() << " rule contents bound to " << bound_tts.inner_().size() << " values - " << name );

+            for( const auto& v : bound_tts.inner_() )

             {

-                DEBUG("- " << v.first.first << "#" << v.first.second << " = [" << v.second << "]");

+                DEBUG("- " << v.first << " = [" << v.second << "]");

             }

-            return ::std::unique_ptr<TokenStream>( (TokenStream*)new MacroExpander(olex, rule.m_contents, bound_tts, g_crate_path_tt) );

+            

+            // Count the number of repetitions

+            bound_tts.calculate_counts();

+            

+            TokenStream* ret_ptr = new MacroExpander(olex, rule.m_contents, bound_tts, g_crate_path_tt);

+            // HACK! Disable nested macro expansion

+            //ret_ptr->parse_state().no_expand_macros = true;

+            

+            return ::std::unique_ptr<TokenStream>( ret_ptr );

         }

         catch(const ParseError::Base& e)

         {

@@ -364,6 +530,7 @@ void Macro_HandlePattern(TTStream& lex, const MacroPatEnt& pat, unsigned int lay
     throw ParseError::Generic(olex, FMT("Macro '" << name << "' was not found") );

 }

 

+

 Position MacroExpander::getPosition() const

 {

     DEBUG("olex.getPosition() = " << m_olex.getPosition());

@@ -391,55 +558,51 @@ Token MacroExpander::realGetToken()
     // Check offset of lowest layer

     while(m_offsets.size() > 0)

     {

-        assert(m_offsets.size() > 0);

         unsigned int layer = m_offsets.size() - 1;

-        // - If that layer has hit its limit

         const auto& ents = *m_cur_ents;

+        

+        // Obtain current read position in layer, and increment

         size_t idx = m_offsets.back().first;

         m_offsets.back().first ++;

-    

-        //DEBUG("ents = " << ents);

         

         // Check if limit has been reached

         if( idx < ents.size() )

         {

-            const auto& ent = ents[idx];

             // - If not, just handle the next entry

+            const auto& ent = ents[idx];

             // Check type of entry

-            if( ent.name == "*crate" ) {

-                // HACK: Handle $crate with a special name

+            // - XXX: Hack for $crate special name

+            if( ent.name == "*crate" )

+            {

                 DEBUG("Crate name hack");

                 m_ttstream.reset( new TTStream(m_crate_path) );

                 return m_ttstream->getToken();

             }

+            // - Expand to a parameter

             else if( ent.name != "" )

             {

-                // - Name

+                unsigned int parent_iter = (layer > 0 ? m_layer_iters.at(layer-1) : 0);

                 const size_t iter_idx = m_offsets.back().second;

-                DEBUG("m_mappings = " << m_mappings);

-                const auto tt_i = m_mappings.equal_range( ::std::make_pair(layer, ent.name.c_str()) );

-                if( tt_i.first == tt_i.second ) {

-                    throw ParseError::Generic(*this, FMT("Cannot find mapping name: " << ent.name << " for layer " << layer) );

+                const TokenTree* tt = m_mappings.get(layer, parent_iter, ent.name.c_str(), iter_idx);

+                if( ! tt )

+                {

+                    throw ParseError::Generic(*this, FMT("Cannot find '" << ent.name << "' for " << layer));

                 }

-                

-                size_t i = 0;

-                for( auto it = tt_i.first; it != tt_i.second; it ++ )

+                else

                 {

-                    if( i == iter_idx )

-                    {

-                        DEBUG(ent.name << " #" << i << " - Setting TT");

-                        m_ttstream.reset( new TTStream(it->second) );

-                        return m_ttstream->getToken();

-                    }

-                    i ++;

+                    m_ttstream.reset( new TTStream(*tt) );

+                    return m_ttstream->getToken();

                 }

-                throw ParseError::Generic( FMT("Too few instances of " << ent.name << " at layer " << layer) );

             }

+            // - Descend into a repetition

             else if( ent.subpats.size() != 0 )

             {

+                DEBUG("desc: layer = " << layer << ", m_layer_iters = " << m_layer_iters);

+                unsigned int layer_iter = m_layer_iters.at(layer);

+                unsigned int num_repeats = m_mappings.iter_count(layer+1, layer_iter);

                 // New layer

-                DEBUG("- NL = " << layer+1 << ", count = " << m_layer_counts.size() );

-                if( layer+1 < m_layer_counts.size() && m_layer_counts.at(layer+1) > 0 )

+                DEBUG("- NL = " << layer+1 << ", count = " << num_repeats );

+                if( num_repeats > 0 )

                 {

                     // - Push an offset

                     m_offsets.push_back( ::std::make_pair(0, 0) );

@@ -452,20 +615,26 @@ Token MacroExpander::realGetToken()
                     // Layer empty

                     DEBUG("Layer " << layer+1 << " is empty");

                 }

+                // VVV fall through and continue loop

             }

+            // - Emit a raw token

             else

             {

-                // Raw token

                 return ent.tok;

             }

             // Fall through for loop

         }

-        else

+        else if( layer > 0 )

         {

             // - Otherwise, restart/end loop and fall through

-            unsigned int layer_max = (layer < m_layer_counts.size() ? m_layer_counts.at(layer) : 0);

+            DEBUG("layer = " << layer << ", m_layer_iters = " << m_layer_iters);

+            unsigned int parent_layer_iter = m_layer_iters.at(layer-1);

+            unsigned int layer_max = m_mappings.iter_count(layer, parent_layer_iter);

+            DEBUG("Layer #" << layer << " Cur: " << m_offsets.back().second << ", Max: " << layer_max);

             if( m_offsets.back().second + 1 < layer_max )

             {

+                m_layer_iters.at(layer) ++;

+                

                 DEBUG("Restart layer");

                 m_offsets.back().first = 0;

                 m_offsets.back().second ++;

@@ -489,6 +658,12 @@ Token MacroExpander::realGetToken()
                 m_cur_ents = getCurLayer();

             }

         }

+        else

+        {

+            DEBUG("Terminate evaluation");

+            m_offsets.pop_back();

+            assert( m_offsets.size() == 0 );

+        }

     } // while( m_offsets NONEMPTY )

     

     DEBUG("EOF");

@@ -498,33 +673,7 @@ Token MacroExpander::realGetToken()
 /// Count the number of names at each layer

 void MacroExpander::prep_counts()

 {

-    struct TMP {

-        size_t  count;

-        const char *first_name;

-    };

-    ::std::vector<TMP>  counts;

-    

-    for( const auto& ent : m_mappings )

-    {

-        unsigned int layer = ent.first.first;

-        const char *name = ent.first.second;

-    

-        if( layer >= counts.size() )

-        {

-            counts.resize(layer+1);

-        }

-        auto& l = counts[layer];

-        if( l.first_name == NULL || ::std::strcmp(l.first_name, name) == 0 )

-        {

-            l.first_name = name;

-            l.count += 1;

-        }

-    }

-    

-    for( const auto& l : counts )

-    {

-        m_layer_counts.push_back(l.count);

-    }

+    m_layer_iters.resize(m_mappings.layer_count(), 0);

 }

 const MacroRuleEnt& MacroExpander::getCurLayerEnt() const

 {

@@ -534,10 +683,8 @@ const MacroRuleEnt& MacroExpander::getCurLayerEnt() const
     for( unsigned int i = 0; i < m_offsets.size()-2; i ++ )

     {

         unsigned int ofs = m_offsets[i].first;

-        //DEBUG(i << " ofs=" << ofs << " / " << ents->size());

         assert( ofs > 0 && ofs <= ents->size() );

         ents = &(*ents)[ofs-1].subpats;

-        //DEBUG("ents = " << ents);

     }

     return (*ents)[m_offsets[m_offsets.size()-2].first-1];

     

diff --git a/src/macros.hpp b/src/macros.hpp
index 05c337b0..1111b2f2 100644
--- a/src/macros.hpp
+++ b/src/macros.hpp
@@ -101,6 +101,19 @@ struct MacroPatEnt:
 

     friend ::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt& x) {

         os << "MacroPatEnt(";

+        switch(x.type)

+        {

+        case PAT_TOKEN: os << "token "; break;

+        case PAT_TT:    os << "tt ";    break;

+        case PAT_PAT:   os << "pat ";   break;

+        case PAT_IDENT: os << "ident "; break;

+        case PAT_PATH:  os << "path ";  break;

+        case PAT_TYPE:  os << "type ";  break;

+        case PAT_EXPR:  os << "expr ";  break;

+        case PAT_STMT:  os << "stmt ";  break;

+        case PAT_BLOCK: os << "block "; break;

+        case PAT_LOOP:  os << "loop ";  break;

+        }

         if(x.name.size())

             os << "'"<<x.name<<"'";

         else if( x.subpats.size() )

diff --git a/src/parse/common.hpp b/src/parse/common.hpp
index 3fb5a9ec..da6a7009 100644
--- a/src/parse/common.hpp
+++ b/src/parse/common.hpp
@@ -42,4 +42,6 @@ extern AST::Function    Parse_FunctionDefWithCode(TokenStream& lex, ::std::strin
 extern AST::Expr   Parse_Expr(TokenStream& lex, bool const_only);

 extern AST::Expr   Parse_ExprBlock(TokenStream& lex);

 

+extern bool Parse_IsTokValue(eTokenType tok_type);

+

 #endif // PARSE_COMMON_HPP_INCLUDED

diff --git a/src/parse/expr.cpp b/src/parse/expr.cpp
index 8a3490d3..fdedcb1b 100644
--- a/src/parse/expr.cpp
+++ b/src/parse/expr.cpp
@@ -829,6 +829,11 @@ bool Parse_IsTokValue(eTokenType tok_type)
     case TOK_RWORD_SUPER:

     case TOK_RWORD_BOX:

     case TOK_PAREN_OPEN:

+    

+    case TOK_MACRO:

+    

+    case TOK_STAR:

+    case TOK_AMP:

         return true;

     default:

         return false;

@@ -1267,23 +1272,33 @@ ExprNodeP Parse_ExprVal(TokenStream& lex)
         }

         throw ParseError::BugCheck(lex, "Array literal fell");

     case TOK_MACRO:

+        if( CHECK_PARSE_FLAG(lex, no_expand_macros) )

         {

-        TokenTree tt = Parse_TT(lex, true);

-        if( tt.is_token() ) {

-            throw ParseError::Unexpected(lex, tt.tok());

-        }

-        ::std::string name = tok.str();

-        

-        if( name == "format_args" )

-        {

-            TTStream    slex(tt);

-            return Parse_FormatArgs(slex);

+            ::std::string name = tok.str();

+            TokenTree tt = Parse_TT(lex, true);

+            if( tt.is_token() ) {

+                throw ParseError::Unexpected(lex, tt.tok());

+            }

+            return NEWNODE(AST::ExprNode_Macro, ::std::move(name), ::std::move(tt));

         }

         else

         {

-            auto expanded_macro = Macro_Invoke(lex, name, tt);

-            return Parse_Expr0(*expanded_macro);

-        }

+            TokenTree tt = Parse_TT(lex, true);

+            if( tt.is_token() ) {

+                throw ParseError::Unexpected(lex, tt.tok());

+            }

+            ::std::string name = tok.str();

+            

+            if( name == "format_args" )

+            {

+                TTStream    slex(tt);

+                return Parse_FormatArgs(slex);

+            }

+            else

+            {

+                auto expanded_macro = Macro_Invoke(lex, name, tt);

+                return Parse_Expr0(*expanded_macro);

+            }

         }

     default:

         throw ParseError::Unexpected(lex, tok);

@@ -1373,6 +1388,7 @@ TokenTree Parse_TT_Type(TokenStream& lex)
 {

     TRACE_FUNCTION;

     TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

     

     // discard result

     Parse_Type(wlex);

@@ -1385,6 +1401,8 @@ TokenTree Parse_TT_Path(TokenStream& lex, bool mode_expr)
 {

     TRACE_FUNCTION;

     TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

+    

     Token   tok;

     

     if( GET_TOK(tok, wlex) == TOK_DOUBLE_COLON ) {

@@ -1402,6 +1420,7 @@ TokenTree Parse_TT_Expr(TokenStream& lex)
 {

     TRACE_FUNCTION;

     TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

     

     Parse_Expr1(wlex);

     

@@ -1411,6 +1430,7 @@ TokenTree Parse_TT_Pattern(TokenStream& lex)
 {

     TRACE_FUNCTION;

     TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

     

     Parse_Pattern(wlex);

     

@@ -1418,9 +1438,17 @@ TokenTree Parse_TT_Pattern(TokenStream& lex)
 }

 TokenTree Parse_TT_Stmt(TokenStream& lex)

 {

+    TRACE_FUNCTION;

+    TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

+    

     throw ParseError::Todo("Parse_TT_Stmt");

 }

 TokenTree Parse_TT_Block(TokenStream& lex)

 {

+    TRACE_FUNCTION;

+    TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

+    

     throw ParseError::Todo("Parse_TT_Block");

 }

diff --git a/src/parse/lex.cpp b/src/parse/lex.cpp
index 648792e9..78d2aa7e 100644
--- a/src/parse/lex.cpp
+++ b/src/parse/lex.cpp
@@ -578,6 +578,8 @@ uint32_t Lexer::parseEscape(char enclosing)
         return '\\';
     case '\'':
         return '\'';
+    case '"':
+        return '"';
     case 'r':
         return '\r';
     case 'n':
@@ -691,7 +693,21 @@ SERIALISE_TYPE_S(Token, {
 
 ::std::ostream&  operator<<(::std::ostream& os, const Token& tok)
 {
-    os << Token::typestr(tok.type()) << "\"" << tok.str() << "\"";
+    os << Token::typestr(tok.type());
+    switch(tok.type())
+    {
+    case TOK_STRING:
+    case TOK_IDENT:
+    case TOK_MACRO:
+    case TOK_LIFETIME:
+        os << "\"" << tok.str() << "\"";
+        break;
+    case TOK_INTEGER:
+        os << tok.intval();
+        break;
+    default:
+        break;
+    }
     return os;
 }
 ::std::ostream& operator<<(::std::ostream& os, const Position& p)
@@ -814,6 +830,7 @@ eTokenType TokenStream::lookahead(unsigned int i)
         m_lookahead.push_back( this->innerGetToken() );
     }
     
+    DEBUG("lookahead(" << i << ") = " << m_lookahead[i]);
     return m_lookahead[i].type();
 }
 
diff --git a/src/parse/lex.hpp b/src/parse/lex.hpp
index 47c2db60..a32a569b 100644
--- a/src/parse/lex.hpp
+++ b/src/parse/lex.hpp
@@ -79,10 +79,12 @@ extern ::std::ostream&  operator<<(::std::ostream& os, const Token& tok);
 struct ParseState
 {
     bool disallow_struct_literal = false;
+    bool no_expand_macros = false;
     
     friend ::std::ostream& operator<<(::std::ostream& os, const ParseState& ps) {
         os << "ParseState {";
         if(ps.disallow_struct_literal)  os << " disallow_struct_literal";
+        if(ps.no_expand_macros)  os << " no_expand_macros";
         os << " }";
         return os;
     }
diff --git a/src/parse/root.cpp b/src/parse/root.cpp
index 8b8f3b2f..c88b51a5 100644
--- a/src/parse/root.cpp
+++ b/src/parse/root.cpp
@@ -939,7 +939,7 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::Path, ::std::string)>
             case TOK_PAREN_OPEN:

                 if( allow_sub )

                 {

-                    auto subpat = Parse_MacroRules_Pat(lex, false, TOK_PAREN_OPEN, TOK_PAREN_CLOSE);

+                    auto subpat = Parse_MacroRules_Pat(lex, true, TOK_PAREN_OPEN, TOK_PAREN_CLOSE);

                     enum eTokenType joiner = TOK_NULL;

                     GET_TOK(tok, lex);

                     if( tok.type() != TOK_PLUS && tok.type() != TOK_STAR )

@@ -965,7 +965,7 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::Path, ::std::string)>
                 }

                 else

                 {

-                    throw ParseError::Generic(FMT("Nested repetitions in macro"));

+                    throw ParseError::Generic(lex, FMT("Nested repetitions in macro"));

                 }

                 break;

             default:

@@ -1015,9 +1015,12 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::Path, ::std::string)>
         {

             GET_TOK(tok, lex);

             

-            if( allow_sub && tok.type() == TOK_PAREN_OPEN )

-            {

-                auto content = Parse_MacroRules_Cont(lex, false, TOK_PAREN_OPEN, TOK_PAREN_CLOSE);

+            if( tok.type() == TOK_PAREN_OPEN )

+            {   

+                if( !allow_sub )

+                    throw ParseError::Unexpected(lex, tok);

+                

+                auto content = Parse_MacroRules_Cont(lex, true, TOK_PAREN_OPEN, TOK_PAREN_CLOSE);

                 

                 GET_TOK(tok, lex);

                 enum eTokenType joiner = TOK_NULL;

diff --git a/src/parse/types.cpp b/src/parse/types.cpp
index b9cf3cc1..3752dc85 100644
--- a/src/parse/types.cpp
+++ b/src/parse/types.cpp
@@ -164,7 +164,9 @@ TypeRef Parse_Type(TokenStream& lex)
             GET_CHECK_TOK(tok, lex, TOK_LIFETIME);
             ::std::string   lifetime = tok.str();   
             GET_CHECK_TOK(tok, lex, TOK_PAREN_CLOSE);
-            throw ParseError::Todo(lex, "Type lifetime bounds");
+            // TODO: Actually use lifetime bound
+            DEBUG("TODO: Use lifetime bound '" << lifetime << " on type " << inner);
+            return ::std::move(inner);
         }
         else
         {