URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-19 Maxime van Noppen &lt;yabo(a)lrde.epita.fr&gt; Use CxxId in the pretty-printer * pp-cxx/CxxExp.str, * pp-cxx/CxxType.str: Use CxxId instead of a string litteral. CxxExp.str | 10 ++++++---- CxxType.str | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 91) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 92) @@ -26,14 +26,11 @@ CxxAssign(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] CxxExpToStr: - CxxFunCall([], idf, args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] + CxxFunCall([], CxxId(idf), args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] CxxExpToStr: CxxProgram(exp) -> exp - CxxExpToAbox: - CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] - CxxExpToStr: x -> x where <is-string> x @@ -41,6 +38,11 @@ CxxExpToStr: CxxId(idf) -> idf + + + CxxExpToAbox: + CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] + CxxExpToAbox: x -> S(<CxxExpToStr> x) Index: branches/scool-ng/src/pp-cxx/CxxType.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxType.str (revision 91) +++ branches/scool-ng/src/pp-cxx/CxxType.str (revision 92) @@ -23,7 +23,7 @@ Typename -> S("typename") CxxTypeToAbox: - CxxFunCall([], idf, args) -> H hs=0 [ ~<CxxIdToAbox>idf "(" H hs=1 [ ~*<CxxListToAbox(CxxTypeToAbox <+ CxxExpToAbox|",")>args ] ")"] + CxxFunCall([], CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox>idf "(" H hs=1 [ ~*<CxxListToAbox(CxxTypeToAbox <+ CxxExpToAbox|",")>args ] ")"] CxxTypeToAbox: CxxScope(idf1, idf2) -> H hs=0 [ ~<CxxTypeToAbox> idf1 "::" ~<CxxIdToAbox> idf2 ] -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)