diff options
| author | John Hodge <tpg@mutabah.net> | 2016-04-02 12:29:06 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-04-02 12:29:06 +0800 |
| commit | 23b9d62d2adf8eb272aea3ce7ca63380873931fc (patch) | |
| tree | 1ae84ca28c5db98f4c27081a7c1d673786d0440e | |
| parent | c47ac13386ac5a597ec822ea6d73bf62ca009954 (diff) | |
| download | mrust-23b9d62d2adf8eb272aea3ce7ca63380873931fc.tar.gz | |
Logging - Reduce the verbosity of Macro and TokenTree printing
| -rw-r--r-- | src/macros.cpp | 46 | ||||
| -rw-r--r-- | src/parse/tokentree.hpp | 4 |
2 files changed, 24 insertions, 26 deletions
diff --git a/src/macros.cpp b/src/macros.cpp index 9256b7b7..0624d8b2 100644 --- a/src/macros.cpp +++ b/src/macros.cpp @@ -831,28 +831,28 @@ SERIALISE_TYPE_S(MacroPatEnt, { });
::std::ostream& operator<<(::std::ostream& os, const MacroPatEnt& x)
{
- os << "MacroPatEnt(";
switch(x.type)
{
- case MacroPatEnt::PAT_TOKEN: os << "token "; break;
- case MacroPatEnt::PAT_TT: os << "tt "; break;
- case MacroPatEnt::PAT_PAT: os << "pat "; break;
- case MacroPatEnt::PAT_IDENT: os << "ident "; break;
- case MacroPatEnt::PAT_PATH: os << "path "; break;
- case MacroPatEnt::PAT_TYPE: os << "type "; break;
- case MacroPatEnt::PAT_EXPR: os << "expr "; break;
- case MacroPatEnt::PAT_STMT: os << "stmt "; break;
- case MacroPatEnt::PAT_BLOCK: os << "block "; break;
- case MacroPatEnt::PAT_META: os << "meta "; break;
- case MacroPatEnt::PAT_LOOP: os << "loop "; break;
+ case MacroPatEnt::PAT_TOKEN: os << "=" << x.tok; break;
+ case MacroPatEnt::PAT_LOOP: os << "loop w/ " << x.tok << " [" << x.subpats << "]"; break;
+ default:
+ os << "$" << x.name << ":";
+ switch(x.type)
+ {
+ case MacroPatEnt::PAT_TOKEN: throw "";
+ case MacroPatEnt::PAT_LOOP: throw "";
+ case MacroPatEnt::PAT_TT: os << "tt"; break;
+ case MacroPatEnt::PAT_PAT: os << "pat"; break;
+ case MacroPatEnt::PAT_IDENT: os << "ident"; break;
+ case MacroPatEnt::PAT_PATH: os << "path"; break;
+ case MacroPatEnt::PAT_TYPE: os << "type"; break;
+ case MacroPatEnt::PAT_EXPR: os << "expr"; break;
+ case MacroPatEnt::PAT_STMT: os << "stmt"; break;
+ case MacroPatEnt::PAT_BLOCK: os << "block"; break;
+ case MacroPatEnt::PAT_META: os << "meta"; break;
+ }
+ break;
}
- if(x.name.size())
- os << "'"<<x.name<<"'";
- else if( x.subpats.size() )
- os << x.tok << " [" << x.subpats << "]";
- else
- os << x.tok;
- os << ")";
return os;
}
@@ -864,13 +864,11 @@ SERIALISE_TYPE_S(MacroRuleEnt, { ::std::ostream& operator<<(::std::ostream& os, const MacroRuleEnt& x)
{
- os << "MacroRuleEnt(";
if(x.name.size())
- os << "'"<<x.name<<"'";
+ os << "$"<<x.name;
else if( x.subpats.size() )
- os << x.tok << " [" << x.subpats << "]";
+ os << "expand w/ " << x.tok << " [" << x.subpats << "]";
else
- os << x.tok;
- os << ")";
+ os << "=" << x.tok;
return os;
}
diff --git a/src/parse/tokentree.hpp b/src/parse/tokentree.hpp index 257bd6ad..1dacbd9b 100644 --- a/src/parse/tokentree.hpp +++ b/src/parse/tokentree.hpp @@ -35,9 +35,9 @@ public: friend ::std::ostream& operator<<(::std::ostream& os, const TokenTree& tt) {
if( tt.m_subtrees.size() == 0 )
- return os << "TokenTree(" << tt.m_tok << ")";
+ return os << tt.m_tok;
else
- return os << "TokenTree([" << tt.m_subtrees << "])";
+ return os << "TT([" << tt.m_subtrees << "])";
}
SERIALISABLE_PROTOTYPES();
|