URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-17 Maxime van Noppen &lt;yabo(a)lrde.epita.fr&gt; Update the pretty printer regarding C++ AST changements * CxxDecl.str, * CxxExp.str: Replace CxxAffect by CxxAssign. * CxxId.str: Use the CxxId constructor. * CxxType.str: Update CxxFun constructor signature. CxxDecl.str | 2 +- CxxExp.str | 4 ++-- CxxId.str | 3 +++ CxxType.str | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxId.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxId.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxId.str (revision 88) @@ -9,4 +9,7 @@ where <is-string> x CxxIdToAbox: + CxxId(idf) -> S(idf) + + CxxIdToAbox: x -> <CxxTypeToAbox> x Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 88) @@ -23,10 +23,10 @@ CxxKeyword(idf, exp) -> <concat-strings> [idf, " ", <CxxExpToStr> exp] CxxExpToStr: - CxxAffect(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] + CxxAssign(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] CxxExpToStr: - CxxFunCall(idf, args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] + CxxFunCall([], idf, args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] CxxExpToStr: CxxProgram(exp) -> exp Index: branches/scool-ng/src/pp-cxx/CxxDecl.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxDecl.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxDecl.str (revision 88) @@ -18,7 +18,7 @@ // Declare a pointer on method : base_type (class::*idf)(); CxxTopLevelToAbox: - CxxAffect(CxxDecl(base_type, class, idf, args), exp) -> + CxxAssign(CxxDecl(base_type, class, idf, args), exp) -> H hs=0 [ H hs=1 [ ~<CxxTypeToAbox> base_type Index: branches/scool-ng/src/pp-cxx/CxxType.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxType.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxType.str (revision 88) @@ -23,7 +23,7 @@ Typename -> S("typename") CxxTypeToAbox: - CxxFunCall(idf, args) -> H hs=0 [ ~<CxxIdToAbox>idf "(" H hs=1 [ ~*<CxxListToAbox(CxxTypeToAbox <+ CxxExpToAbox|",")>args ] ")"] + CxxFunCall([], 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 / (___ (_____/ \_____)