>>> cpp-parser <<<  alternative-nameser[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-parser/ref/alternative-names.err 2007-06-02 20:19:31.000000000 +0200 +++ /tmp/mouline-err.24386.0 2007-06-02 21:33:36.000000000 +0200 @@ -1 +1 @@ -__ROOT_DIR__/cpp-parser_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/cpp-parser/cpp-parser: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++  argument-substitution[ OK ]  buggy-nop[ OK ]  code[ OK ]  comma-in-args[ OK ]  comma-in-expansion[ OK ]  comment[ OK ]  empty-macro-function[ OK ]  empty-macro-param[ OK ]  empty-macro[ OK ]  empty[ OK ]  if-defined-parens[ OK ]  if-defined[ OK ]  if-false[ OK ]  if-true[ OK ]  ifdef[ OK ]  ifndef-newline-newline[ OK ]  include-layout[ OK ]  include-nonempty[ OK ]  include-recursive[ OK ]  include[ OK ]  macro-def[ OK ]  macro-function-arg-scope[ OK ]  macro-function-def[ OK ]  macro-function-no-args[ OK ]  macro-function-param-with-parens[ OK ]  macro-function-param-with-parens2[ OK ]  macro-function-wrong-narg[ OK ]  macro-function[ OK ]  macro-function2[ OK ]  macro-functions3[ OK ]  macro-functions4[ OK ]  macro-layout[ OK ]  macro-usage-layout[ OK ]  macro-usage[ OK ]  macro-usage2[ OK ]  macro[ OK ]  not-a-macro-function-call[ OK ]  notreplaced[ OK ]  sharp-line[ OK ]  shuffle[ OK ]  simple-ifgroup[ OK ]  simple-sharp-error[ OK ]  simple-sharp-nop[ OK ]  simple-sharp-pragma[ OK ]  simple-sharp-warning[ OK ]  simple-undef[ OK ]  simple-use-of-defined[ OK ]  trans-modified-arg[ OK ] >>> cpp-pp <<<  alternative-nameser[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/alternative-names.err 2007-06-02 20:19:25.000000000 +0200 +++ /tmp/mouline-err.24386.21 2007-06-02 21:33:38.000000000 +0200 @@ -1 +1 @@ -__ROOT_DIR__/cpp-pp_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/cpp-pp: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++  argument-substitutiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/argument-substitution.out 2007-06-01 17:54:16.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:38.000000000 +0200 @@ -1,5 +1,11 @@ -#define C , -#define FOO(X) BAR (A X B) -#define BAR(X, Y) - -FOO (C) +Macro(C, [Comma<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(FOO, [Id(X)<<>>; ], [Id(BAR)<<>>; LPar<< >>; Id(A)<<>>; Id(X)<< >>; Id(B)<< >>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; Id(C)<<>>; RPar<<>>; Eol +<<>>; ])  buggy-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/buggy-nop.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:38.000000000 +0200 @@ -1,3 +1,7 @@ -# 42 "foo" -# -foo +Line([PpNumber(42)<<>>; String(foo)<< >>; ])<<# >> +Code([Eol +<<>>; ]) +Line([])<<#>> +Code([Eol +<<>>; Id(foo)<<>>; Eol +<<>>; ])  codeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/code.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:38.000000000 +0200 @@ -1,4 +1,5 @@ -int main() -{ - return 42; -} +Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol +<<>>; OpOrPunc({)<<>>; Eol +<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol +<<>>; OpOrPunc(})<<>>; Eol +<<>>; ])  comma-in-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/comma-in-args.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:38.000000000 +0200 @@ -1,20 +1,24 @@ -#define FOO(X, Y) foo[X, Y] - -FOO (1, 2) - -FOO ((1, 2), 3) -FOO (1, (2, 3)) - -FOO (,) // undefined behavior (16.3.10) but GCC handles it as expected -FOO ((,),2) // defined behavior: the 1st argument has 3 preprocessing tokens - -#define BAR(X, Y) bar[X, Y] -FOO (BAR (1, 2), 3) - -multine line start: -FOO (1, 2 .. -still 2) -end // watch out for the empty lines!! +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [Id(foo)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; RPar<<>>; Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; Comma<<>>; PpNumber(2)<<>>; RPar<<>>; Eol +<< // defined behavior: the 1st argument has 3 preprocessing tokens +>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [Id(bar)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(BAR)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol +<< +>>; Id(multine)<<>>; Id(line)<< >>; Id(start)<< >>; OpOrPunc(:)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Eol +<<>>; Id(still)<<>>; PpNumber(2)<< >>; RPar<<>>; Eol +<<>>; Id(end)<<>>; Eol +<< // watch out for the empty lines!! /* multine line start: // the following yields an undefined behavior (GCC->error) @@ -22,5 +26,5 @@ # define UHOH :D) end */ - -UHOH :D +>>; Id(UHOH)<<>>; OpOrPunc(:)<< >>; Id(D)<<>>; Eol +<<>>; ])  comma-in-expansiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/comma-in-expansion.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:38.000000000 +0200 @@ -1,3 +1,7 @@ -#define FOO(A, B) -#define ARGS first, second -FOO (ARGS) +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; OpOrPunc(--)<< >>; OpOrPunc(-)<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(ARGS, [Id(first)<<>>; Comma<<>>; Id(second)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(ARGS)<<>>; RPar<<>>; Eol +<<>>; ])  commento[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/comment.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:38.000000000 +0200 @@ -1 +1,2 @@ -/* comment */ +Code([Eol +<>; ])  empty-macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/empty-macro-function.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:38.000000000 +0200 @@ -1,2 +1,4 @@ -#define EMPTY(X) -+EMPTY (42)+ +MacroFunction(EMPTY, [Id(X)<<>>; ], [])<<#>><< >> +Code([Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(+)<<>>; Eol +<<>>; ])  empty-macro-paramo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/empty-macro-param.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:38.000000000 +0200 @@ -1,15 +1,21 @@ -#define FOO(X) -FOO () -#define BAR(X, Y) -BAR (51, 42) -BAR (,) -BAR (, 42) -BAR (51, ) -#define QUX(X, Y, Z) -QUX (42, 51, 69) -QUX (, 51, 69) -QUX (42, 51, ) -QUX (42, , 69) -QUX (, , 69) -QUX (, 51, ) -QUX (42, , ) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; RPar<<>>; Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; RPar<< >>; Eol +<<>>; ]) +MacroFunction(QUX, [Id(X)<<>>; Id(Y)<< >>; Id(Z)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Z)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; RPar<< >>; Eol +<<>>; ])  empty-macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/empty-macro.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:39.000000000 +0200 @@ -1,2 +1,4 @@ -#define EMPTY -+EMPTY+ +Macro(EMPTY, [])<<#>><< >> +Code([Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; OpOrPunc(+)<<>>; Eol +<<>>; ])  empty[ OK ]  if-defined-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/if-defined-parens.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:39.000000000 +0200 @@ -1,6 +1,6 @@ -#define FOO -#if defined (FOO) -OK -#else -KO -#endif +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(FOO)<<>>; RPar<<>>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/if-defined.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:39.000000000 +0200 @@ -1,6 +1,6 @@ -#define FOO -#if defined FOO -OK -#else -KO -#endif +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<< >>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-falseo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/if-false.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:39.000000000 +0200 @@ -1,5 +1,3 @@ -#if 0 -KO -#else -OK -#endif +If([Integer(0, )<< >>; ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-trueo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/if-true.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:39.000000000 +0200 @@ -1,5 +1,3 @@ -#if 1 -OK -#else -KO -#endif +If([Integer(1, )<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifdefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/ifdef.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:39.000000000 +0200 @@ -1,6 +1,6 @@ -#define FOO -#ifdefined FOO -OK -#else -KO -#endif +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<<>>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifndef-newline-newlineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/ifndef-newline-newline.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:39.000000000 +0200 @@ -1,4 +1,3 @@ -#if!defined _FOO_H - - -#endif +If([OpOrPunc(!)<<>>; OpOrPunc(defined)<<>>; Id(_FOO_H)<< >>; ], [Code([Eol +<< +>>; ]); ], <<#>><<#>>  include-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/include-layout.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:39.000000000 +0200 @@ -1 +1,3 @@ -#include/* \o/ */"empty.cc" // \o/ +Include(HeaderName(empty.cc, False)<>)<<#>> +Code([Eol +<< // \o/>>; ])  include-nonemptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/include-nonempty.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:39.000000000 +0200 @@ -1,3 +1,5 @@ -#include "code.cc" +Include(HeaderName(code.cc, False)<< >>)<<#>> +Code([Eol +<< -/* include-nonempty.cc */ +/* include-nonempty.cc */>>; ])  include-recursiveo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/include-recursive.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:39.000000000 +0200 @@ -1,3 +1,5 @@ -#include "sub/body.cc" +Include(HeaderName(sub/body.cc, False)<< >>)<<#>> +Code([Eol +<< -/* include-recursive.cc */ +/* include-recursive.cc */>>; ])  includeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/include.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:39.000000000 +0200 @@ -1 +1,3 @@ -#include "empty.cc" +Include(HeaderName(empty.cc, False)<< >>)<<#>> +Code([Eol +<<>>; ])  macro-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-def.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:39.000000000 +0200 @@ -1 +1,3 @@ -#define FOO bar +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  macro-function-arg-scopeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-arg-scope.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:39.000000000 +0200 @@ -1,3 +1,7 @@ -#define FOO X -#define BAR(X) FOO -BAR (42) +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; ], [Id(FOO)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-def.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:39.000000000 +0200 @@ -1 +1,3 @@ -#define YABO(ETS,GYA) TRUE +MacroFunction(YABO, [Id(ETS)<<>>; Id(GYA)<<>>; ], [Id(TRUE)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  macro-function-no-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-no-args.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:39.000000000 +0200 @@ -1,3 +1,5 @@ -#define FOO() 42 - -int i = FOO(); +MacroFunction(FOO, [], [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; Id(FOO)<< >>; LPar<<>>; RPar<<>>; OpOrPunc(;)<<>>; Eol +<<>>; ])  macro-function-param-with-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-param-with-parens.out 2007-06-01 17:54:17.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:39.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO(X) -FOO ((,)) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-param-with-parens2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-param-with-parens2.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO(X) -FOO (((), ...)) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-wrong-nargo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function-wrong-narg.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:40.000000000 +0200 @@ -1,3 +1,5 @@ -#define FOO(A, B) BAR - -FOO(51) +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [Id(BAR)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ])  macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO(X) -FOO (42) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  macro-function2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-function2.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO(X, Y) -FOO (42, 21) +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(21)<< >>; RPar<<>>; Eol +<<>>; ])  macro-functions3o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-functions3.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:40.000000000 +0200 @@ -1,4 +1,8 @@ -#define ANSWER 42 -#define RAND(X) (X+ANSWER) - -RAND (51) +Macro(ANSWER, [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(RAND, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; OpOrPunc(+)<<>>; Id(ANSWER)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(RAND)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ])  macro-functions4o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-functions4.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:40.000000000 +0200 @@ -1,4 +1,10 @@ -#define X 42 -#define FOO(X) -#define Y ... -FOO (51) +Macro(X, [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(Y, [OpOrPunc(...)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ])  macro-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-layout.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -#/* c1 */define/* c2 */FOO/* c3 */bar/* c4 */baz/* c5 */ +Macro(FOO, [Id(bar)<<>>; Id(baz)<>; ])<<#/* c1 */>><><> +Code([Eol +<>; ])  macro-usage-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-usage-layout.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#/* must not be expanded1 */define/* must not be expanded2 */FOO/* must not be expanded3 */42/* must not be expanded4 */ -FOO +Macro(FOO, [PpNumber(42)<<>>; ])<<#/* must not be expanded1 */>><><> +Code([Eol +<>; Id(FOO)<<>>; Eol +<<>>; ])  macro-usageo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-usage.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO bar -FOO +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  macro-usage2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro-usage2.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:40.000000000 +0200 @@ -1,3 +1,7 @@ -#define FOO BAR -#define BAR 42 qux -FOO +Macro(FOO, [Id(BAR)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(BAR, [PpNumber(42)<<>>; Id(qux)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/macro.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -#define FOO bar +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  not-a-macro-function-callo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/not-a-macro-function-call.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:40.000000000 +0200 @@ -1,2 +1,4 @@ -#define FOO X -FOO (42) +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  notreplacedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/notreplaced.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:40.000000000 +0200 @@ -1,9 +1,17 @@ -#define FOO foo -#define BAR #FOO -foo: This is #FOO -FOO -#FOO - -bar: And this is BAR (or #BAR) -BAR -#BAR +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(BAR, [Sharp<<>>; Id(FOO)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; Id(FOO)<<>>; Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ]) +Line([Id(FOO)<<>>; ])<<#>> +Code([Eol +<< +>>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; Id(BAR)<< >>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; Id(BAR)<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; Eol +<<>>; ]) +Line([Id(BAR)<<>>; ])<<#>> +Code([Eol +<<>>; ])  sharp-lineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/sharp-line.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:40.000000000 +0200 @@ -1,4 +1,8 @@ -# 42 "sharp-line.cc" -int; -# 1 "sharp-line.cc" -defined foo +Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ])<<# >> +Code([Eol +<<>>; Id(int)<<>>; OpOrPunc(;)<<>>; Eol +<<>>; ]) +Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ])<<# >> +Code([Eol +<<>>; Id(defined)<<>>; Id(foo)<< >>; Eol +<<>>; ])  shuffleo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/shuffle.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:40.000000000 +0200 @@ -1,5 +1,11 @@ -#define ARGS a, b -#define SHUFFLE(A, B) -#define GEN(X) SHUFFLE(X) - -GEN(ARGS) +Macro(ARGS, [Id(a)<<>>; Comma<<>>; Id(b)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(SHUFFLE, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; Comma<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(GEN, [Id(X)<<>>; ], [Id(SHUFFLE)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(GEN)<<>>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; Eol +<<>>; ])  simple-ifgroupo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-ifgroup.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:40.000000000 +0200 @@ -1,15 +1,9 @@ -//#if ~0xffffffffffffffff // FALSE -#if defined l // ok -# if /*not a keyword!*/ sizeof -choke on me 1 -# else -# if int -choke on me 2 -# endif -# endif -int main () -{ -} -#else // !l -choke on me 3 -#endif /* l */ +Code([Eol +<>; ]) +If([OpOrPunc(defined)<< >>; Id(l)<< >>; ], [If([Id(sizeof)<< /*not a keyword!*/ >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(1)<< >>; Eol +<<>>; ]); ], [If([Id(int)<< >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(2)<< >>; Eol +<<>>; ]); ], <<# >><<# >>; ]<<# >><<# >><<# >>; Code([Id(int)<<>>; Id(main)<< >>; LPar<< >>; RPar<<>>; Eol +<<>>; OpOrPunc({)<<>>; Eol +<<>>; OpOrPunc(})<<>>; Eol +<<>>; ]); ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(3)<< >>; Eol +<<>>; ]); ]<<#>><< // ok>><<#>><< /* l */>><<#>><< // !l>>  simple-sharp-erroro[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-sharp-error.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -#error This file should never be used +Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ])<<#>> +Code([Eol +<<>>; ])  simple-sharp-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-sharp-nop.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -# // CPP's nop. +Line([])<<# // CPP's nop.>> +Code([Eol +<<>>; ])  simple-sharp-pragmao[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-sharp-pragma.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -#pragma GCC system_header // Suppress warnings. +Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ])<<#>><< // Suppress warnings.>> +Code([Eol +<<>>; ])  simple-sharp-warningo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-sharp-warning.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.33 2007-06-02 21:33:40.000000000 +0200 @@ -1 +1,3 @@ -#warning Did you know that #warning is an extension? +Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ])<<#>> +Code([Eol +<<>>; ])  simple-undefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-undef.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:40.000000000 +0200 @@ -1,3 +1,7 @@ -#define FOO foo -#undef FOO -FOO +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Undef(FOO)<<#>><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  simple-use-of-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/simple-use-of-defined.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:41.000000000 +0200 @@ -1,7 +1,8 @@ -before - -#if defined (lint) -lint on -#endif - -after +Code([Id(before)<<>>; Eol +<< +>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(lint)<<>>; RPar<<>>; ], [Code([Id(lint)<<>>; Id(on)<< >>; Eol +<<>>; ]); ], <<#>><<#>> +Code([Eol +<<>>; Id(after)<<>>; Eol +<<>>; ])  trans-modified-argo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cpp-pp/ref/trans-modified-arg.out 2007-06-01 17:54:18.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:41.000000000 +0200 @@ -1,3 +1,5 @@ -#define PAR(X) (X) - -PAR(42) +MacroFunction(PAR, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(PAR)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ]) >>> cxx-parser <<<  alternative-namese[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/alternative-names.err 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-err.24386.3 2007-06-02 21:33:41.000000000 +0200 @@ -1 +1 @@ -__ROOT_DIR__/revcpp_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/../revcpp/revcpp: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++  argument-substitutiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/argument-substitution.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:41.000000000 +0200 @@ -1,12 +1,12 @@ -File(__ROOT_DIR__/data/argument-substitution.cc) -MacroDef(C, ,, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(FOO, ["X"; ], BAR (A X B), '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], , '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[Id(C)<<>>; ]; ], 0)<<>>; FunctionExpansionStart(BAR, [[Id(A)<<>>; Layout<>; ]; [Id(B)<>; ]; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 2)<<>>; Id(A)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; ExpansionStart(C, 1)<<>>; ArgExpansionEnd(BAR, X, 2)<<>>; Comma<<>>; ArgExpansionStart(BAR, Y, 2)<<>>; ExpansionEnd(C, 1)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Id(B)<< >>; ArgExpansionEnd(BAR, Y, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 2)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(C)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Comma)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(C)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  buggy-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/buggy-nop.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:41.000000000 +0200 @@ -1,8 +1,8 @@ -File(__ROOT_DIR__/data/buggy-nop.cc) -Line([PpNumber(42)<<>>; String(foo)<< >>; ], '# ', '') -Code([Eol -<<>>; ]) -Line([], '#', '') -Code([Eol -<<>>; Id(foo)<<>>; Eol +Code([Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(String)<< >>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  codeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/code.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:41.000000000 +0200 @@ -1,6 +1,6 @@ -File(__ROOT_DIR__/data/code.cc) -Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol -<<>>; OpOrPunc({)<<>>; Eol -<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol -<<>>; OpOrPunc(})<<>>; Eol +Code([Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(int)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(main)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc({)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(return)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(;)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(})<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  comma-in-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/comma-in-args.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:41.000000000 +0200 @@ -1,24 +1,24 @@ -File(__ROOT_DIR__/data/comma-in-args.cc) -MacroFunctionDef(FOO, ["X"; "Y"; ], foo[X, Y], '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; ]; ], 0)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 0)<<>>; PpNumber(2)<< >>; ArgExpansionEnd(FOO, Y, 0)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol -<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ]; [PpNumber(3)<< >>; ]; ], 1)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 1)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ArgExpansionEnd(FOO, X, 1)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 1)<<>>; PpNumber(3)<< >>; ArgExpansionEnd(FOO, Y, 1)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 1)<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; ]; ], 2)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 2)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 2)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 2)<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; ArgExpansionEnd(FOO, Y, 2)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 2)<<>>; Eol -<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[]; []; ], 3)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 3)<<>>; ArgExpansionEnd(FOO, X, 3)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 3)<<>>; ArgExpansionEnd(FOO, Y, 3)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 3)<<>>; Layout<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; Comma<<>>; RPar<<>>; ]; [PpNumber(2)<<>>; ]; ], 4)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 4)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; ArgExpansionEnd(FOO, X, 4)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 4)<<>>; PpNumber(2)<<>>; ArgExpansionEnd(FOO, Y, 4)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 4)<<>>; Layout<< // defined behavior: the 1st argument has 3 preprocessing tokens>>; Eol -<<>>; Eol -<<>>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], bar[X, Y], '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[Id(BAR)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ]; [PpNumber(3)<< >>; ]; ], 5)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 5)<<>>; FunctionExpansionStart(BAR, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; ]; ], 6)<<>>; Id(bar)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(BAR, X, 6)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(BAR, X, 6)<<>>; Comma<<>>; ArgExpansionStart(BAR, Y, 6)<<>>; PpNumber(2)<< >>; ArgExpansionEnd(BAR, Y, 6)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(BAR, 6)<<>>; ArgExpansionEnd(FOO, X, 5)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 5)<<>>; PpNumber(3)<< >>; ArgExpansionEnd(FOO, Y, 5)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 5)<<>>; Eol -<<>>; Eol -<<>>; Id(multine)<<>>; Id(line)<< >>; Id(start)<< >>; OpOrPunc(:)<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Eol -<<>>; Id(still)<<>>; PpNumber(2)<< >>; ]; ], 7)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 7)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 7)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 7)<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Id(still)<< >>; PpNumber(2)<< >>; ArgExpansionEnd(FOO, Y, 7)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 7)<<>>; Eol -<<>>; Id(end)<<>>; Layout<< // watch out for the empty lines!!>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc([)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(3)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(3)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; Comma<<>>; PpNumber(2)<<>>; RPar<<>>; Eol>>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<< // defined behavior: the 1st argument has 3 preprocessing tokens>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc([)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(3)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(multine)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(line)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(start)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(:)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(.)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(.)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(still)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(2)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(end)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<< // watch out for the empty lines!!>>; Eol <<>>; Eol <<>>; Layout<error) @@ -26,6 +26,6 @@ # define UHOH :D) end */>>; Eol -<<>>; Eol -<<>>; Id(UHOH)<<>>; OpOrPunc(:)<< >>; Id(D)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(UHOH)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(:)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(D)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  comma-in-expansionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/comma-in-expansion.out 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:41.000000000 +0200 @@ -0,0 +1,8 @@ +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(--)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(-)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Macro)<<>>; LPar<<>>; Id(ARGS)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(first)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(second)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/comma-in-expansion.err 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-err.24386.8 2007-06-02 21:33:41.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given.  commento[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/comment.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:41.000000000 +0200 @@ -1,3 +1,3 @@ -File(__ROOT_DIR__/data/comment.cc) -Code([Layout<>; Eol +Code([Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  empty-macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/empty-macro-function.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:41.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/empty-macro-function.cc) -MacroFunctionDef(EMPTY, ["X"; ], , '#', ' ', '') -Code([Eol -<<>>; OpOrPunc(+)<<>>; FunctionExpansionStart(EMPTY, [[PpNumber(42)<<>>; ]; ], 0)<<>>; FunctionExpansionEnd(EMPTY, 0)<<>>; OpOrPunc(+)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(EMPTY)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(+)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(EMPTY)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(+)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  empty-macro-paramo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/empty-macro-param.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:41.000000000 +0200 @@ -1,22 +1,22 @@ -File(__ROOT_DIR__/data/empty-macro-param.cc) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol -<<>>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(51)<<>>; ]; [PpNumber(42)<< >>; ]; ], 1)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 1)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(BAR, X, 1)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 1)<<>>; PpNumber(42)<< >>; ArgExpansionEnd(BAR, Y, 1)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 1)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[]; []; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 2)<<>>; ArgExpansionEnd(BAR, X, 2)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 2)<<>>; ArgExpansionEnd(BAR, Y, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 2)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[]; [PpNumber(42)<< >>; ]; ], 3)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 3)<<>>; ArgExpansionEnd(BAR, X, 3)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 3)<<>>; PpNumber(42)<< >>; ArgExpansionEnd(BAR, Y, 3)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 3)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(51)<<>>; ]; []; ], 4)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 4)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(BAR, X, 4)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 4)<<>>; ArgExpansionEnd(BAR, Y, 4)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 4)<<>>; Eol -<<>>; ]) -MacroFunctionDef(QUX, ["X"; "Y"; "Z"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; [PpNumber(51)<< >>; ]; [PpNumber(69)<< >>; ]; ], 5)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 5)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 5)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 5)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 5)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 5)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 5)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 5)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; [PpNumber(51)<< >>; ]; [PpNumber(69)<< >>; ]; ], 6)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 6)<<>>; ArgExpansionEnd(QUX, X, 6)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 6)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 6)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 6)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 6)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 6)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; [PpNumber(51)<< >>; ]; []; ], 7)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 7)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 7)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 7)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 7)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 7)<<>>; ArgExpansionEnd(QUX, Z, 7)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 7)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; []; [PpNumber(69)<< >>; ]; ], 8)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 8)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 8)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 8)<<>>; ArgExpansionEnd(QUX, Y, 8)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 8)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 8)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 8)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; []; [PpNumber(69)<< >>; ]; ], 9)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 9)<<>>; ArgExpansionEnd(QUX, X, 9)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 9)<<>>; ArgExpansionEnd(QUX, Y, 9)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 9)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 9)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 9)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; [PpNumber(51)<< >>; ]; []; ], 10)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 10)<<>>; ArgExpansionEnd(QUX, X, 10)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 10)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 10)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 10)<<>>; ArgExpansionEnd(QUX, Z, 10)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 10)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; []; []; ], 11)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 11)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 11)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 11)<<>>; ArgExpansionEnd(QUX, Y, 11)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 11)<<>>; ArgExpansionEnd(QUX, Z, 11)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 11)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(QUX)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Z)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Z)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(69)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(69)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(69)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(69)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(QUX)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  empty-macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/empty-macro.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:42.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/empty-macro.cc) -MacroDef(EMPTY, , '#', ' ', '') -Code([Eol -<<>>; OpOrPunc(+)<<>>; ExpansionStart(EMPTY, 0)<<>>; ExpansionEnd(EMPTY, 0)<<>>; OpOrPunc(+)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(EMPTY)<<>>; Comma<<>>; OpOrPunc([)<< >>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(+)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(EMPTY)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(+)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  emptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/empty.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:42.000000000 +0200 @@ -1 +0,0 @@ -File(__ROOT_DIR__/data/empty.cc)  if-defined-parens[SKIP]  if-defined[SKIP]  if-false[SKIP]  if-true[SKIP]  ifdef[SKIP]  ifndef-newline-newline[SKIP]  include-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/include-layout.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:42.000000000 +0200 @@ -1,5 +1,4 @@ -File(__ROOT_DIR__/data/include-layout.cc) -IncludeStart('/* \o/ */', __ROOT_DIR__/data, empty.cc, False) -IncludeEnd() -Code([Layout<< // \o/>>; Eol +Code([Id(Include)<<>>; LPar<<>>; Id(HeaderName)<<>>; LPar<<>>; Id(empty)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; Comma<<>>; Id(False)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<< // \o/>>; ])>>; Eol <<>>; ])  include-nonemptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/include-nonempty.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:42.000000000 +0200 @@ -1,12 +1,6 @@ -File(__ROOT_DIR__/data/include-nonempty.cc) -IncludeStart(' ', __ROOT_DIR__/data, code.cc, False) -Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol -<<>>; OpOrPunc({)<<>>; Eol -<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol -<<>>; OpOrPunc(})<<>>; Eol -<<>>; ]) -IncludeEnd() -Code([Eol +Code([Id(Include)<<>>; LPar<<>>; Id(HeaderName)<<>>; LPar<<>>; Id(code)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; Comma<<>>; Id(False)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol <<>>; Eol -<<>>; Layout<>; Eol +<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  include-recursiveo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/include-recursive.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:42.000000000 +0200 @@ -1,15 +1,6 @@ -File(__ROOT_DIR__/data/include-recursive.cc) -IncludeStart(' ', __ROOT_DIR__/data, sub/body.cc, False) -IncludeStart(' ', __ROOT_DIR__/data/sub, tail.cc, False) -Code([Layout<>; Eol -<<>>; ]) -IncludeEnd() -Code([Eol -<<>>; Eol -<<>>; Layout<>; Eol -<<>>; ]) -IncludeEnd() -Code([Eol +Code([Id(Include)<<>>; LPar<<>>; Id(HeaderName)<<>>; LPar<<>>; Id(sub)<<>>; OpOrPunc(/)<<>>; Id(body)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; Comma<<>>; Id(False)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol <<>>; Eol -<<>>; Layout<>; Eol +<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  includeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/include.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:42.000000000 +0200 @@ -1,5 +1,4 @@ -File(__ROOT_DIR__/data/include.cc) -IncludeStart(' ', __ROOT_DIR__/data, empty.cc, False) -IncludeEnd() -Code([Eol +Code([Id(Include)<<>>; LPar<<>>; Id(HeaderName)<<>>; LPar<<>>; Id(empty)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; Comma<<>>; Id(False)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-def.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:42.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/macro-def.cc) -MacroDef(FOO, bar, '#', ' ', ' ') -Code([Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function-arg-scopeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-arg-scope.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:42.000000000 +0200 @@ -1,8 +1,8 @@ -File(__ROOT_DIR__/data/macro-function-arg-scope.cc) -MacroDef(FOO, X, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(BAR, ["X"; ], FOO, '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(42)<<>>; ]; ], 0)<<>>; ExpansionStart(FOO, 1)<<>>; Id(X)<<>>; ExpansionEnd(FOO, 1)<<>>; FunctionExpansionEnd(BAR, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function-def[SKIP]  macro-function-no-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-no-args.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:42.000000000 +0200 @@ -1,6 +1,6 @@ -File(__ROOT_DIR__/data/macro-function-no-args.cc) -MacroFunctionDef(FOO, [], 42, '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; FunctionExpansionStart(FOO, [], 0)<<>>; PpNumber(42)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; OpOrPunc(;)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; OpOrPunc(])<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(int)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(i)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(=)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(;)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function-param-with-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-param-with-parens.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:42.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-function-param-with-parens.cc) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; Comma<<>>; RPar<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function-param-with-parens2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-param-with-parens2.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:42.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-function-param-with-parens2.cc) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(...)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function-wrong-nargoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-wrong-narg.out 2007-04-13 19:28:48.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:42.000000000 +0200 @@ -0,0 +1,6 @@ +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function-wrong-narg.err 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-err.24386.23 2007-06-02 21:33:42.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given.  macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:43.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-function.cc) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(42)<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-function2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-function2.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:43.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-function2.cc) -MacroFunctionDef(FOO, ["X"; "Y"; ], , '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(42)<<>>; ]; [PpNumber(21)<< >>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; ArgExpansionStart(FOO, Y, 0)<<>>; PpNumber(21)<< >>; ArgExpansionEnd(FOO, Y, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(21)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-functions3o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-functions3.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:43.000000000 +0200 @@ -1,9 +1,9 @@ -File(__ROOT_DIR__/data/macro-functions3.cc) -MacroDef(ANSWER, 42, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(RAND, ["X"; ], (X+ANSWER), '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; FunctionExpansionStart(RAND, [[PpNumber(51)<<>>; ]; ], 0)<<>>; LPar<<>>; ArgExpansionStart(RAND, X, 0)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(RAND, X, 0)<<>>; OpOrPunc(+)<<>>; ExpansionStart(ANSWER, 1)<<>>; PpNumber(42)<<>>; ExpansionEnd(ANSWER, 1)<<>>; RPar<<>>; FunctionExpansionEnd(RAND, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(ANSWER)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(RAND)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(LPar)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(+)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(ANSWER)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(RAND)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-functions4o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-functions4.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:43.000000000 +0200 @@ -1,11 +1,11 @@ -File(__ROOT_DIR__/data/macro-functions4.cc) -MacroDef(X, 42, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroDef(Y, ..., '#', ' ', ' ') -Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(51)<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Comma<<>>; Layout<< >>; ExpansionStart(Y, 1)<<>>; OpOrPunc(...)<<>>; ExpansionEnd(Y, 1)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(X)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(Y)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Macro)<<>>; LPar<<>>; Id(Y)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(...)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-layout.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:43.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/macro-layout.cc) -MacroDef(FOO, bar/* c4 */baz, '#/* c1 */', '/* c2 */', '/* c3 */') -Code([Layout<>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(baz)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-usage-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-usage-layout.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:43.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-usage-layout.cc) -MacroDef(FOO, 42, '#/* must not be expanded1 */', '/* must not be expanded2 */', '/* must not be expanded3 */') -Code([Layout<>; Eol -<<>>; ExpansionStart(FOO, 0)<<>>; PpNumber(42)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Layout<>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-usageo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-usage.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:43.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/macro-usage.cc) -MacroDef(FOO, bar, '#', ' ', ' ') -Code([Eol -<<>>; ExpansionStart(FOO, 0)<<>>; Id(bar)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macro-usage2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro-usage2.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:43.000000000 +0200 @@ -1,8 +1,8 @@ -File(__ROOT_DIR__/data/macro-usage2.cc) -MacroDef(FOO, BAR, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroDef(BAR, 42 qux, '#', ' ', ' ') -Code([Eol -<<>>; ExpansionStart(FOO, 1)<<>>; ExpansionStart(BAR, 0)<<>>; PpNumber(42)<<>>; Id(qux)<< >>; ExpansionEnd(BAR, 0)<<>>; ExpansionEnd(FOO, 1)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Macro)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(qux)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/macro.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:43.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/macro.cc) -MacroDef(FOO, bar, '#', ' ', ' ') -Code([Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  not-a-macro-function-callo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/not-a-macro-function-call.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:43.000000000 +0200 @@ -1,5 +1,5 @@ -File(__ROOT_DIR__/data/not-a-macro-function-call.cc) -MacroDef(FOO, X, '#', ' ', ' ') -Code([Eol -<<>>; ExpansionStart(FOO, 0)<<>>; Id(X)<<>>; ExpansionEnd(FOO, 0)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  notreplacedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/notreplaced.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:43.000000000 +0200 @@ -1,18 +1,18 @@ -File(__ROOT_DIR__/data/notreplaced.cc) -MacroDef(FOO, foo, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroDef(BAR, #FOO, '#', ' ', ' ') -Code([Eol -<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; ExpansionStart(FOO, 0)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol -<<>>; ExpansionStart(FOO, 1)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 1)<<>>; Eol -<<>>; ]) -Line([Id(FOO)<<>>; ], '#', '') -Code([Eol -<<>>; Eol -<<>>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; Layout<< >>; ExpansionStart(BAR, 3)<<>>; Layout<<#>>; ExpansionStart(FOO, 2)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 2)<<>>; ExpansionEnd(BAR, 3)<<>>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; ExpansionStart(BAR, 5)<<>>; Layout<<#>>; ExpansionStart(FOO, 4)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 4)<<>>; ExpansionEnd(BAR, 5)<<>>; RPar<<>>; Eol -<<>>; ExpansionStart(BAR, 7)<<>>; Layout<<#>>; ExpansionStart(FOO, 6)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 6)<<>>; ExpansionEnd(BAR, 7)<<>>; Eol -<<>>; ]) -Line([Id(BAR)<<>>; ], '#', '') -Code([Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Macro)<<>>; LPar<<>>; Id(BAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Sharp)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(:)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(This)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(is)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Sharp)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(bar)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(:)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(And)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(this)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(is)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(or)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Sharp)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(BAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  sharp-lineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/sharp-line.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:44.000000000 +0200 @@ -1,9 +1,9 @@ -File(__ROOT_DIR__/data/sharp-line.cc) -Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ], '# ', '') -Code([Eol -<<>>; Id(int)<<>>; OpOrPunc(;)<<>>; Eol -<<>>; ]) -Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ], '# ', '') -Code([Eol -<<>>; Id(defined)<<>>; Id(foo)<< >>; Eol +Code([Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(String)<< >>; LPar<<>>; Id(sharp)<<>>; OpOrPunc(-)<<>>; Id(line)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(int)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(;)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(PpNumber)<<>>; LPar<<>>; PpNumber(1)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(String)<< >>; LPar<<>>; Id(sharp)<<>>; OpOrPunc(-)<<>>; Id(line)<<>>; OpOrPunc(.)<<>>; Id(cc)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(defined)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  shuffleo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/shuffle.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:44.000000000 +0200 @@ -1,12 +1,12 @@ -File(__ROOT_DIR__/data/shuffle.cc) -MacroDef(ARGS, a, b, '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(SHUFFLE, ["A"; "B"; ], , '#', ' ', ' ') -Code([Eol -<<>>; ]) -MacroFunctionDef(GEN, ["X"; ], SHUFFLE(X), '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; FunctionExpansionStart(GEN, [[Id(ARGS)<<>>; ]; ], 0)<<>>; FunctionExpansionStart(SHUFFLE, [[Id(a)<>; ]; [Id(b)<< >>; Layout<>; ]; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(SHUFFLE, B, 2)<<>>; Id(b)<< >>; ExpansionEnd(ARGS, 1)<<>>; ArgExpansionEnd(GEN, X, 0)<<>>; ArgExpansionEnd(SHUFFLE, B, 2)<<>>; Comma<<>>; ArgExpansionStart(SHUFFLE, A, 2)<<>>; ArgExpansionStart(GEN, X, 0)<<>>; ExpansionStart(ARGS, 1)<<>>; Id(a)<<>>; ArgExpansionEnd(SHUFFLE, A, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(SHUFFLE, 2)<<>>; FunctionExpansionEnd(GEN, 0)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(ARGS)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(a)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(b)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(SHUFFLE)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(OpOrPunc)<<>>; LPar<<>>; OpOrPunc(<)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(B)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Comma)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(A)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(>)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(MacroFunction)<<>>; LPar<<>>; Id(GEN)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(SHUFFLE)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(GEN)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-ifgroup[SKIP]  simple-sharp-erroro[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/simple-sharp-error.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:44.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/simple-sharp-error.cc) -Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ], '#', '') -Code([Eol +Code([Id(Error)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(This)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(file)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(should)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(never)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(be)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(used)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-sharp-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/simple-sharp-nop.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:44.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/simple-sharp-nop.cc) -Line([], '# // CPP's nop.', '') -Code([Eol +Code([Id(Line)<<>>; LPar<<>>; OpOrPunc([)<<>>; OpOrPunc(])<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; Layout<< // CPP's nop.>>>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-sharp-pragmao[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/simple-sharp-pragma.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:44.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/simple-sharp-pragma.cc) -Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ], '#', ' // Suppress warnings.') -Code([Eol +Code([Id(Pragma)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(GCC)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(system_header)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; Layout<< // Suppress warnings.>>>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-sharp-warningo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/simple-sharp-warning.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:44.000000000 +0200 @@ -1,4 +1,4 @@ -File(__ROOT_DIR__/data/simple-sharp-warning.cc) -Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ], '#', '') -Code([Eol +Code([Id(Warning)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Id)<<>>; LPar<<>>; Id(Did)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(you)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(know)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(that)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Sharp)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(warning)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(is)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(an)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(extension)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(;)<<>>; Id(OpOrPunc)<< >>; LPar<<>>; OpOrPunc(?)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-undefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/simple-undef.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:44.000000000 +0200 @@ -1,8 +1,8 @@ -File(__ROOT_DIR__/data/simple-undef.cc) -MacroDef(FOO, foo, '#', ' ', ' ') -Code([Eol -<<>>; ]) -Undef(FOO, '#') -Code([Eol -<<>>; Id(FOO)<<>>; Eol +Code([Id(Macro)<<>>; LPar<<>>; Id(FOO)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(foo)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol +<<>>; Id(Undef)<<>>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(FOO)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ])  simple-use-of-defined[SKIP]  trans-modified-argo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/cxx-parser/ref/trans-modified-arg.out 2007-06-02 20:19:32.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:44.000000000 +0200 @@ -1,6 +1,6 @@ -File(__ROOT_DIR__/data/trans-modified-arg.cc) -MacroFunctionDef(PAR, ["X"; ], (X), '#', ' ', ' ') -Code([Eol -<<>>; Eol -<<>>; FunctionExpansionStart(PAR, [[PpNumber(42)<<>>; ]; ], 0)<<>>; LPar<<>>; ArgExpansionStart(PAR, X, 0)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(PAR, X, 0)<<>>; RPar<<>>; FunctionExpansionEnd(PAR, 0)<<>>; Eol +Code([Id(MacroFunction)<<>>; LPar<<>>; Id(PAR)<<>>; Comma<<>>; OpOrPunc([)<< >>; Id(Id)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; Comma<<>>; OpOrPunc([)<< >>; Id(LPar)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(X)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; OpOrPunc(<<)<<>>; Sharp<<>>; OpOrPunc(>>)<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<< >>; Eol +<<>>; Id(Code)<<>>; LPar<<>>; OpOrPunc([)<<>>; Id(Eol)<<>>; Eol +<<>>; OpOrPunc(<<)<<>>; Eol +<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Id)<< >>; LPar<<>>; Id(PAR)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(LPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(PpNumber)<< >>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(RPar)<< >>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; Id(Eol)<< >>; Eol +<<>>; OpOrPunc(<<)<<>>; OpOrPunc(>>)<<>>; OpOrPunc(;)<<>>; OpOrPunc(])<< >>; RPar<<>>; Eol <<>>; ]) >>> logic <<<  a-and-a[ OK ]  a-or-a[ OK ]  a-xor-a[ OK ]  and-false[ OK ]  and-true[ OK ]  and1[ OK ]  defined[ OK ]  defined2[ OK ]  false[ OK ]  not_defined[ OK ]  not_defined2[ OK ]  true[ OK ] >>> postprocess <<<  alternative-namese[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/alternative-names.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.22 2007-06-02 21:33:46.000000000 +0200 @@ -1,2 +1,2 @@ -__ROOT_DIR__/revcpp_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/postprocess/../revcpp/revcpp: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ __ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  argument-substitutionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/argument-substitution.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:46.000000000 +0200 @@ -1,12 +0,0 @@ -FILE: __ROOT_DIR__/data/argument-substitution.cc -Macro(C, [Comma<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(FOO, [Id(X)<<>>; ], [Id(BAR)<<>>; LPar<< >>; Id(A)<<>>; Id(X)<< >>; Id(B)<< >>; RPar<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(BAR, [Id(X)<<>>; Id(Y)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; Id(C)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/argument-substitution.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.23 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  buggy-nopoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/buggy-nop.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:46.000000000 +0200 @@ -1,8 +0,0 @@ -FILE: __ROOT_DIR__/data/buggy-nop.cc -Line([PpNumber(42)<<>>; String(foo)<< >>; ])<<# >> -Code([Eol -<<>>; ]) -Line([])<<#>> -Code([Eol -<<>>; Id(foo)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/buggy-nop.err 2007-06-01 17:12:05.000000000 +0200 +++ /tmp/mouline-err.24386.24 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  codeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/code.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:46.000000000 +0200 @@ -1,6 +0,0 @@ -FILE: __ROOT_DIR__/data/code.cc -Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol -<<>>; OpOrPunc({)<<>>; Eol -<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol -<<>>; OpOrPunc(})<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/code.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.25 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  comma-in-argsoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/comma-in-args.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:46.000000000 +0200 @@ -1,30 +0,0 @@ -FILE: __ROOT_DIR__/data/comma-in-args.cc -MacroFunction(FOO, [Id(X)<<>>; Id(Y)<<>>; ], [Id(foo)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Eol -<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; RPar<<>>; Eol -<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; Layout<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; LPar<<>>; Comma<<>>; RPar<<>>; Comma<<>>; PpNumber(2)<<>>; RPar<<>>; Layout<< // defined behavior: the 1st argument has 3 preprocessing tokens>>; Eol -<<>>; Eol -<<>>; ]) -MacroFunction(BAR, [Id(X)<<>>; Id(Y)<<>>; ], [Id(bar)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; Id(BAR)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol -<<>>; Eol -<<>>; Id(multine)<<>>; Id(line)<< >>; Id(start)<< >>; OpOrPunc(:)<<>>; Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Id(still)<< >>; PpNumber(2)<< >>; RPar<<>>; Eol -<<>>; Id(end)<<>>; Layout<< // watch out for the empty lines!!>>; Eol -<<>>; Eol -<<>>; Layout<error) -FOO (1, 2 .. -# define UHOH :D) -end -*/>>; Eol -<<>>; Eol -<<>>; Id(UHOH)<<>>; OpOrPunc(:)<< >>; Id(D)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/comma-in-args.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.26 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  comma-in-expansione[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/comma-in-expansion.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.28 2007-06-02 21:33:46.000000000 +0200 @@ -1,2 +1 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given. __ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  commentoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/comment.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:46.000000000 +0200 @@ -1,3 +0,0 @@ -FILE: __ROOT_DIR__/data/comment.cc -Code([Layout<>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/comment.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.29 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  empty-macro-functionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro-function.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:46.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/empty-macro-function.cc -MacroFunction(EMPTY, [Id(X)<<>>; ], [])<<#>><< >> -Code([Eol -<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(+)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro-function.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.30 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  empty-macro-paramoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro-param.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:46.000000000 +0200 @@ -1,22 +0,0 @@ -FILE: __ROOT_DIR__/data/empty-macro-param.cc -MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; RPar<<>>; Eol -<<>>; ]) -MacroFunction(BAR, [Id(X)<<>>; Id(Y)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(BAR)<<>>; LPar<<>>; PpNumber(51)<<>>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol -<<>>; Id(BAR)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; Eol -<<>>; Id(BAR)<<>>; LPar<<>>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol -<<>>; Id(BAR)<<>>; LPar<<>>; PpNumber(51)<<>>; Comma<<>>; RPar<<>>; Eol -<<>>; ]) -MacroFunction(QUX, [Id(X)<<>>; Id(Y)<<>>; Id(Z)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Z)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(QUX)<<>>; LPar<<>>; PpNumber(42)<<>>; Comma<<>>; Comma<<>>; PpNumber(51)<< >>; PpNumber(69)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; Comma<<>>; Comma<<>>; PpNumber(51)<< >>; PpNumber(69)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; PpNumber(42)<<>>; Comma<<>>; Comma<<>>; PpNumber(51)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; PpNumber(42)<<>>; Comma<<>>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; Comma<<>>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; Comma<<>>; Comma<<>>; PpNumber(51)<< >>; RPar<<>>; Eol -<<>>; Id(QUX)<<>>; LPar<<>>; PpNumber(42)<<>>; Comma<<>>; Comma<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro-param.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.31 2007-06-02 21:33:46.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  empty-macrooe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:46.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/empty-macro.cc -Macro(EMPTY, [])<<#>><< >> -Code([Eol -<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; OpOrPunc(+)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty-macro.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.32 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  emptyoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:47.000000000 +0200 @@ -1 +0,0 @@ -FILE: __ROOT_DIR__/data/empty.cc --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/empty.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.0 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  if-defined-parens[SKIP]  if-defined[SKIP]  if-false[SKIP]  if-true[SKIP]  ifdef[SKIP]  ifndef-newline-newline[SKIP]  include-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-layout.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:47.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/include-layout.cc -Include(HeaderName(empty.cc, False)<>)<<#>> -Code([Layout<< // \o/>>; Eol -<<>>; ]) -FILE: __ROOT_DIR__/data/empty.cc --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-layout.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.1 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  include-nonemptyoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-nonempty.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:47.000000000 +0200 @@ -1,12 +0,0 @@ -FILE: __ROOT_DIR__/data/include-nonempty.cc -Include(HeaderName(code.cc, False)<< >>)<<#>> -Code([Eol -<<>>; Eol -<<>>; Layout<>; Eol -<<>>; ]) -FILE: __ROOT_DIR__/data/code.cc -Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol -<<>>; OpOrPunc({)<<>>; Eol -<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol -<<>>; OpOrPunc(})<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-nonempty.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.2 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  include-recursiveoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-recursive.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:47.000000000 +0200 @@ -1,15 +0,0 @@ -FILE: __ROOT_DIR__/data/include-recursive.cc -Include(HeaderName(sub/body.cc, False)<< >>)<<#>> -Code([Eol -<<>>; Eol -<<>>; Layout<>; Eol -<<>>; ]) -FILE: __ROOT_DIR__/data/sub/body.cc -Include(HeaderName(tail.cc, False)<< >>)<<#>> -Code([Eol -<<>>; Eol -<<>>; Layout<>; Eol -<<>>; ]) -FILE: __ROOT_DIR__/data/sub/tail.cc -Code([Layout<>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include-recursive.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.3 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  includeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:47.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/include.cc -Include(HeaderName(empty.cc, False)<< >>)<<#>> -Code([Eol -<<>>; ]) -FILE: __ROOT_DIR__/data/empty.cc --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/include.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.4 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-defoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-def.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:47.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-def.cc -Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-def.err 2007-04-28 09:22:41.000000000 +0200 +++ /tmp/mouline-err.24386.5 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-arg-scopeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-arg-scope.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:47.000000000 +0200 @@ -1,8 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function-arg-scope.cc -Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(BAR, [Id(X)<<>>; ], [Id(FOO)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(BAR)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-arg-scope.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.6 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-defoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-def.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:47.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function-def.cc -MacroFunction(YABO, [Id(ETS)<<>>; Id(GYA)<<>>; ], [Id(TRUE)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-def.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.7 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-no-argsoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-no-args.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:47.000000000 +0200 @@ -1,6 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function-no-args.cc -MacroFunction(FOO, [], [PpNumber(42)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; Id(FOO)<<>>; LPar<<>>; RPar<<>>; OpOrPunc(;)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-no-args.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.8 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-param-with-parensoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-param-with-parens.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:47.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function-param-with-parens.cc -MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; LPar<<>>; Comma<<>>; RPar<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-param-with-parens.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.9 2007-06-02 21:33:47.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-param-with-parens2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-param-with-parens2.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:47.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function-param-with-parens2.cc -MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-param-with-parens2.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.10 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function-wrong-narge[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function-wrong-narg.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.11 2007-06-02 21:33:48.000000000 +0200 @@ -1,2 +1 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given. __ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-functionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:48.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function.cc -MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.12 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-function2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function2.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:48.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-function2.cc -MacroFunction(FOO, [Id(X)<<>>; Id(Y)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(42)<<>>; Comma<<>>; PpNumber(21)<< >>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-function2.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.13 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-functions3oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-functions3.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:48.000000000 +0200 @@ -1,9 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-functions3.cc -Macro(ANSWER, [PpNumber(42)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(RAND, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; OpOrPunc(+)<<>>; Id(ANSWER)<<>>; RPar<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(RAND)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-functions3.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.14 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-functions4oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-functions4.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:48.000000000 +0200 @@ -1,11 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-functions4.cc -Macro(X, [PpNumber(42)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -Macro(Y, [OpOrPunc(...)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-functions4.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.15 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-layout.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:48.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-layout.cc -Macro(FOO, [Id(bar)<<>>; Id(baz)<>; ])<<#/* c1 */>><><> -Code([Layout<>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-layout.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.16 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-usage-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage-layout.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:48.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-usage-layout.cc -Macro(FOO, [PpNumber(42)<<>>; ])<<#/* must not be expanded1 */>><><> -Code([Layout<>; Eol -<<>>; Id(FOO)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage-layout.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.17 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-usageoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:48.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-usage.cc -Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage.err 2007-05-07 17:21:02.000000000 +0200 +++ /tmp/mouline-err.24386.18 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macro-usage2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage2.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:48.000000000 +0200 @@ -1,8 +0,0 @@ -FILE: __ROOT_DIR__/data/macro-usage2.cc -Macro(FOO, [Id(BAR)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -Macro(BAR, [PpNumber(42)<<>>; Id(qux)<< >>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro-usage2.err 2007-05-08 18:47:43.000000000 +0200 +++ /tmp/mouline-err.24386.19 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  macrooe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:48.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/macro.cc -Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/macro.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.20 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  not-a-macro-function-calloe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/not-a-macro-function-call.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:48.000000000 +0200 @@ -1,5 +0,0 @@ -FILE: __ROOT_DIR__/data/not-a-macro-function-call.cc -Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/not-a-macro-function-call.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.21 2007-06-02 21:33:48.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  notreplacedoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/notreplaced.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:48.000000000 +0200 @@ -1,18 +0,0 @@ -FILE: __ROOT_DIR__/data/notreplaced.cc -Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -Macro(BAR, [Sharp<<>>; Id(FOO)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; Id(FOO)<<>>; Eol -<<>>; Id(FOO)<<>>; Eol -<<>>; ]) -Line([Id(FOO)<<>>; ])<<#>> -Code([Eol -<<>>; Eol -<<>>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; Layout<< >>; Id(BAR)<<>>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; Id(BAR)<<>>; RPar<<>>; Eol -<<>>; Id(BAR)<<>>; Eol -<<>>; ]) -Line([Id(BAR)<<>>; ])<<#>> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/notreplaced.err 2007-05-18 11:29:45.000000000 +0200 +++ /tmp/mouline-err.24386.22 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  sharp-lineoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/sharp-line.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:49.000000000 +0200 @@ -1,9 +0,0 @@ -FILE: __ROOT_DIR__/data/sharp-line.cc -Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ])<<# >> -Code([Eol -<<>>; Id(int)<<>>; OpOrPunc(;)<<>>; Eol -<<>>; ]) -Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ])<<# >> -Code([Eol -<<>>; Id(defined)<<>>; Id(foo)<< >>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/sharp-line.err 2007-05-14 20:25:47.000000000 +0200 +++ /tmp/mouline-err.24386.23 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  shuffleoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/shuffle.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:49.000000000 +0200 @@ -1,12 +0,0 @@ -FILE: __ROOT_DIR__/data/shuffle.cc -Macro(ARGS, [Id(a)<<>>; Comma<<>>; Id(b)<< >>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(SHUFFLE, [Id(A)<<>>; Id(B)<<>>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; Comma<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -MacroFunction(GEN, [Id(X)<<>>; ], [Id(SHUFFLE)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(GEN)<<>>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/shuffle.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.24 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-ifgroup[SKIP]  simple-sharp-erroroe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-error.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:49.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/simple-sharp-error.cc -Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ])<<#>> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-error.err 2007-05-14 22:21:24.000000000 +0200 +++ /tmp/mouline-err.24386.25 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-sharp-nopoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-nop.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:49.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/simple-sharp-nop.cc -Line([])<<# // CPP's nop.>> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-nop.err 2007-05-14 16:05:36.000000000 +0200 +++ /tmp/mouline-err.24386.26 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-sharp-pragmaoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-pragma.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:49.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/simple-sharp-pragma.cc -Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ])<<#>><< // Suppress warnings.>> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-pragma.err 2007-05-14 22:21:37.000000000 +0200 +++ /tmp/mouline-err.24386.27 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-sharp-warningoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-warning.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:49.000000000 +0200 @@ -1,4 +0,0 @@ -FILE: __ROOT_DIR__/data/simple-sharp-warning.cc -Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ])<<#>> -Code([Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-sharp-warning.err 2007-05-14 22:21:32.000000000 +0200 +++ /tmp/mouline-err.24386.28 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-undefoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-undef.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:49.000000000 +0200 @@ -1,8 +0,0 @@ -FILE: __ROOT_DIR__/data/simple-undef.cc -Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; ]) -Undef(FOO)<<#>> -Code([Eol -<<>>; Id(FOO)<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/simple-undef.err 2007-05-09 19:24:17.000000000 +0200 +++ /tmp/mouline-err.24386.29 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag.  simple-use-of-defined[SKIP]  trans-modified-argoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/trans-modified-arg.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:49.000000000 +0200 @@ -1,6 +0,0 @@ -FILE: __ROOT_DIR__/data/trans-modified-arg.cc -MacroFunction(PAR, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> -Code([Eol -<<>>; Eol -<<>>; Id(PAR)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol -<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/postprocess/ref/trans-modified-arg.err 2007-05-14 16:00:45.000000000 +0200 +++ /tmp/mouline-err.24386.30 2007-06-02 21:33:49.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/postprocess_: Invalid revcpp file: missing File metatag. >>> preprocess <<<  alternative-nameser[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/alternative-names.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.31 2007-06-02 21:33:49.000000000 +0200 @@ -1 +1 @@ -__ROOT_DIR__/preprocess_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/preprocess/preprocess: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++  argument-substitutiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/argument-substitution.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:49.000000000 +0200 @@ -1,11 +1,11 @@ -MacroDef(C, ,, '#', ' ', ' ') +Macro(C, [Comma<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(FOO, ["X"; ], BAR (A X B), '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [Id(BAR)<<>>; LPar<< >>; Id(A)<<>>; Id(X)<< >>; Id(B)<< >>; RPar<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], , '#', ' ', ' ') +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol << ->>; FunctionExpansionStart(FOO, [[Id(C)<<>>; ]; ], 0)<<>>; FunctionExpansionStart(BAR, [[Id(A)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; ExpansionStart(C, 1)<<>>; ]; [ExpansionEnd(C, 1)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Id(B)<< >>; ]; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 2)<<>>; Id(A)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; ExpansionStart(C, 1)<<>>; ArgExpansionEnd(BAR, X, 2)<<>>; Comma<<>>; ArgExpansionStart(BAR, Y, 2)<<>>; ExpansionEnd(C, 1)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Id(B)<< >>; ArgExpansionEnd(BAR, Y, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 2)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +>>; Id(FOO)<<>>; LPar<< >>; Id(C)<<>>; RPar<<>>; Eol <<>>; ])  buggy-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/buggy-nop.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:49.000000000 +0200 @@ -1,7 +1,7 @@ -Line([PpNumber(42)<<>>; String(foo)<< >>; ], '# ', '') +Line([PpNumber(42)<<>>; String(foo)<< >>; ])<<# >> Code([Eol <<>>; ]) -Line([], '#', '') +Line([])<<#>> Code([Eol <<>>; Id(foo)<<>>; Eol <<>>; ])  code[ OK ]  comma-in-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/comma-in-args.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:49.000000000 +0200 @@ -1,22 +1,22 @@ -MacroFunctionDef(FOO, ["X"; "Y"; ], foo[X, Y], '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [Id(foo)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> Code([Eol << ->>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; ]; ], 0)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 0)<<>>; PpNumber(2)<< >>; ArgExpansionEnd(FOO, Y, 0)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Eol << ->>; FunctionExpansionStart(FOO, [[LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ]; [PpNumber(3)<< >>; ]; ], 1)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 1)<<>>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ArgExpansionEnd(FOO, X, 1)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 1)<<>>; PpNumber(3)<< >>; ArgExpansionEnd(FOO, Y, 1)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 1)<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; ]; ], 2)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 2)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 2)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 2)<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; ArgExpansionEnd(FOO, Y, 2)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 2)<<>>; Eol +>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; RPar<<>>; Eol << ->>; FunctionExpansionStart(FOO, [[]; []; ], 3)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 3)<<>>; ArgExpansionEnd(FOO, X, 3)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 3)<<>>; ArgExpansionEnd(FOO, Y, 3)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 3)<<>>; Eol -<< // undefined behavior (16.3.10) but GCC handles it as expected>>; FunctionExpansionStart(FOO, [[LPar<<>>; Comma<<>>; RPar<<>>; ]; [PpNumber(2)<<>>; ]; ], 4)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 4)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; ArgExpansionEnd(FOO, X, 4)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 4)<<>>; PpNumber(2)<<>>; ArgExpansionEnd(FOO, Y, 4)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 4)<<>>; Eol +>>; Id(FOO)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; Comma<<>>; PpNumber(2)<<>>; RPar<<>>; Eol << // defined behavior: the 1st argument has 3 preprocessing tokens >>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], bar[X, Y], '#', ' ', ' ') +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [Id(bar)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[Id(BAR)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; ]; [PpNumber(3)<< >>; ]; ], 5)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 5)<<>>; FunctionExpansionStart(BAR, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; ]; ], 6)<<>>; Id(bar)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(BAR, X, 6)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(BAR, X, 6)<<>>; Comma<<>>; ArgExpansionStart(BAR, Y, 6)<<>>; PpNumber(2)<< >>; ArgExpansionEnd(BAR, Y, 6)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(BAR, 6)<<>>; ArgExpansionEnd(FOO, X, 5)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 5)<<>>; PpNumber(3)<< >>; ArgExpansionEnd(FOO, Y, 5)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 5)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(BAR)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol << >>; Id(multine)<<>>; Id(line)<< >>; Id(start)<< >>; OpOrPunc(:)<<>>; Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(1)<<>>; ]; [PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Eol -<<>>; Id(still)<<>>; PpNumber(2)<< >>; ]; ], 7)<<>>; Id(foo)<<>>; OpOrPunc([)<<>>; ArgExpansionStart(FOO, X, 7)<<>>; PpNumber(1)<<>>; ArgExpansionEnd(FOO, X, 7)<<>>; Comma<<>>; ArgExpansionStart(FOO, Y, 7)<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; NonWSChar()<< >>; Id(still)<<>>; PpNumber(2)<< >>; ArgExpansionEnd(FOO, Y, 7)<<>>; OpOrPunc(])<<>>; FunctionExpansionEnd(FOO, 7)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Eol +<<>>; Id(still)<<>>; PpNumber(2)<< >>; RPar<<>>; Eol <<>>; Id(end)<<>>; Eol << // watch out for the empty lines!!  comma-in-expansionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/comma-in-expansion.out 2007-05-09 15:57:40.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:50.000000000 +0200 @@ -0,0 +1,7 @@ +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; OpOrPunc(--)<< >>; OpOrPunc(-)<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(ARGS, [Id(first)<<>>; Comma<<>>; Id(second)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(ARGS)<<>>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/comma-in-expansion.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.3 2007-06-02 21:33:50.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/preprocess_: Macro 'FOO' requires 2 arguments, but only 1 given.  comment[ OK ]  empty-macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/empty-macro-function.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,4 @@ -MacroFunctionDef(EMPTY, ["X"; ], , '#', ' ', '') +MacroFunction(EMPTY, [Id(X)<<>>; ], [])<<#>><< >> Code([Eol -<<>>; OpOrPunc(+)<<>>; FunctionExpansionStart(EMPTY, [[PpNumber(42)<<>>; ]; ], 0)<<>>; FunctionExpansionEnd(EMPTY, 0)<<>>; OpOrPunc(+)<<>>; Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(+)<<>>; Eol <<>>; ])  empty-macro-paramo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/empty-macro-param.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:50.000000000 +0200 @@ -1,21 +1,21 @@ -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; RPar<<>>; Eol <<>>; ]) -MacroFunctionDef(BAR, ["X"; "Y"; ], , '#', ' ', ' ') +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(51)<<>>; ]; [PpNumber(42)<< >>; ]; ], 1)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 1)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(BAR, X, 1)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 1)<<>>; PpNumber(42)<< >>; ArgExpansionEnd(BAR, Y, 1)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 1)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[]; []; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 2)<<>>; ArgExpansionEnd(BAR, X, 2)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 2)<<>>; ArgExpansionEnd(BAR, Y, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 2)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[]; [PpNumber(42)<< >>; ]; ], 3)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 3)<<>>; ArgExpansionEnd(BAR, X, 3)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 3)<<>>; PpNumber(42)<< >>; ArgExpansionEnd(BAR, Y, 3)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 3)<<>>; Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(51)<<>>; ]; []; ], 4)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, X, 4)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(BAR, X, 4)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(BAR, Y, 4)<<>>; ArgExpansionEnd(BAR, Y, 4)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(BAR, 4)<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; RPar<< >>; Eol <<>>; ]) -MacroFunctionDef(QUX, ["X"; "Y"; "Z"; ], , '#', ' ', ' ') +MacroFunction(QUX, [Id(X)<<>>; Id(Y)<< >>; Id(Z)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Z)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; [PpNumber(51)<< >>; ]; [PpNumber(69)<< >>; ]; ], 5)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 5)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 5)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 5)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 5)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 5)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 5)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 5)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; [PpNumber(51)<< >>; ]; [PpNumber(69)<< >>; ]; ], 6)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 6)<<>>; ArgExpansionEnd(QUX, X, 6)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 6)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 6)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 6)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 6)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 6)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; [PpNumber(51)<< >>; ]; []; ], 7)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 7)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 7)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 7)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 7)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 7)<<>>; ArgExpansionEnd(QUX, Z, 7)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 7)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; []; [PpNumber(69)<< >>; ]; ], 8)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 8)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 8)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 8)<<>>; ArgExpansionEnd(QUX, Y, 8)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 8)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 8)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 8)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; []; [PpNumber(69)<< >>; ]; ], 9)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 9)<<>>; ArgExpansionEnd(QUX, X, 9)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 9)<<>>; ArgExpansionEnd(QUX, Y, 9)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 9)<<>>; PpNumber(69)<< >>; ArgExpansionEnd(QUX, Z, 9)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 9)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[]; [PpNumber(51)<< >>; ]; []; ], 10)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 10)<<>>; ArgExpansionEnd(QUX, X, 10)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 10)<<>>; PpNumber(51)<< >>; ArgExpansionEnd(QUX, Y, 10)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 10)<<>>; ArgExpansionEnd(QUX, Z, 10)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 10)<<>>; Eol -<<>>; FunctionExpansionStart(QUX, [[PpNumber(42)<<>>; ]; []; []; ], 11)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, X, 11)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(QUX, X, 11)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Y, 11)<<>>; ArgExpansionEnd(QUX, Y, 11)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(QUX, Z, 11)<<>>; ArgExpansionEnd(QUX, Z, 11)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(QUX, 11)<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; RPar<< >>; Eol <<>>; ])  empty-macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/empty-macro.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,4 @@ -MacroDef(EMPTY, , '#', ' ', '') +Macro(EMPTY, [])<<#>><< >> Code([Eol -<<>>; OpOrPunc(+)<<>>; ExpansionStart(EMPTY, 0)<<>>; ExpansionEnd(EMPTY, 0)<<>>; OpOrPunc(+)<<>>; Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; OpOrPunc(+)<<>>; Eol <<>>; ])  empty[ OK ]  if-defined-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/if-defined-parens.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,6 @@ -MacroDef(FOO, , '#', ' ', '') +Macro(FOO, [])<<#>><< >> Code([Eol -<<>>; Id(OK)<<>>; Eol <<>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(FOO)<<>>; RPar<<>>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/if-defined.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,6 @@ -MacroDef(FOO, , '#', ' ', '') +Macro(FOO, [])<<#>><< >> Code([Eol -<<>>; Id(OK)<<>>; Eol <<>>; ]) +If([OpOrPunc(defined)<< >>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-falseo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/if-false.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:50.000000000 +0200 @@ -1,2 +1,3 @@ -Code([Id(OK)<<>>; Eol -<<>>; ]) +If([Integer(0, )<< >>; ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-trueo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/if-true.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:50.000000000 +0200 @@ -1,2 +1,3 @@ -Code([Id(OK)<<>>; Eol -<<>>; ]) +If([Integer(1, )<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifdefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/ifdef.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,6 @@ -MacroDef(FOO, , '#', ' ', '') +Macro(FOO, [])<<#>><< >> Code([Eol -<<>>; Id(OK)<<>>; Eol <<>>; ]) +If([OpOrPunc(defined)<<>>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifndef-newline-newlineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/ifndef-newline-newline.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:50.000000000 +0200 @@ -1,3 +1,3 @@ -Code([Eol +If([OpOrPunc(!)<<>>; OpOrPunc(defined)<<>>; Id(_FOO_H)<< >>; ], [Code([Eol << ->>; ]) +>>; ]); ], <<#>><<#>>  include-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/include-layout.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,3 @@ -IncludeStart('/* \o/ */', __ROOT_DIR__/data, empty.cc, False) -IncludeEnd() +Include(HeaderName(empty.cc, False)<>)<<#>> Code([Eol << // \o/>>; ])  include-nonemptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/include-nonempty.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:50.000000000 +0200 @@ -1,10 +1,4 @@ -IncludeStart(' ', __ROOT_DIR__/data, code.cc, False) -Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol -<<>>; OpOrPunc({)<<>>; Eol -<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol -<<>>; OpOrPunc(})<<>>; Eol -<<>>; ]) -IncludeEnd() +Include(HeaderName(code.cc, False)<< >>)<<#>> Code([Eol <<  include-recursiveo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/include-recursive.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:50.000000000 +0200 @@ -1,13 +1,4 @@ -IncludeStart(' ', __ROOT_DIR__/data, sub/body.cc, False) -IncludeStart(' ', __ROOT_DIR__/data/sub, tail.cc, False) -Code([Eol -<>; ]) -IncludeEnd() -Code([Eol -<< - -/* body.cc */>>; ]) -IncludeEnd() +Include(HeaderName(sub/body.cc, False)<< >>)<<#>> Code([Eol <<  includeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/include.out 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,3 @@ -IncludeStart(' ', __ROOT_DIR__/data, empty.cc, False) -IncludeEnd() +Include(HeaderName(empty.cc, False)<< >>)<<#>> Code([Eol <<>>; ])  macro-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-def.out 2007-06-01 17:54:19.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:50.000000000 +0200 @@ -1,3 +1,3 @@ -MacroDef(FOO, bar, '#', ' ', ' ') +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ])  macro-function-arg-scopeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-arg-scope.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:50.000000000 +0200 @@ -1,7 +1,7 @@ -MacroDef(FOO, X, '#', ' ', ' ') +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(BAR, ["X"; ], FOO, '#', ' ', ' ') +MacroFunction(BAR, [Id(X)<<>>; ], [Id(FOO)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(BAR, [[PpNumber(42)<<>>; ]; ], 0)<<>>; ExpansionStart(FOO, 1)<<>>; Id(X)<<>>; ExpansionEnd(FOO, 1)<<>>; FunctionExpansionEnd(BAR, 0)<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol <<>>; ])  macro-function-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-def.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:50.000000000 +0200 @@ -1,3 +1,3 @@ -MacroFunctionDef(YABO, ["ETS"; "GYA"; ], TRUE, '#', ' ', ' ') +MacroFunction(YABO, [Id(ETS)<<>>; Id(GYA)<<>>; ], [Id(TRUE)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ])  macro-function-no-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-no-args.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:50.000000000 +0200 @@ -1,5 +1,5 @@ -MacroFunctionDef(FOO, [], 42, '#', ' ', ' ') +MacroFunction(FOO, [], [PpNumber(42)<<>>; ])<<#>><< >><< >> Code([Eol << ->>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; FunctionExpansionStart(FOO, [], 0)<<>>; PpNumber(42)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; OpOrPunc(;)<<>>; Eol +>>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; Id(FOO)<< >>; LPar<<>>; RPar<<>>; OpOrPunc(;)<<>>; Eol <<>>; ])  macro-function-param-with-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-param-with-parens.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,4 @@ -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; Comma<<>>; RPar<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; LPar<<>>; Comma<<>>; RPar<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; RPar<<>>; Eol <<>>; ])  macro-function-param-with-parens2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-param-with-parens2.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,4 @@ -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; RPar<<>>; Eol <<>>; ])  macro-function-wrong-nargoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-wrong-narg.out 2007-04-13 19:28:48.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:50.000000000 +0200 @@ -0,0 +1,5 @@ +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [Id(BAR)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function-wrong-narg.err 2007-06-02 20:19:28.000000000 +0200 +++ /tmp/mouline-err.24386.26 2007-06-02 21:33:50.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/preprocess_: Macro 'FOO' requires 2 arguments, but only 1 given.  macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:50.000000000 +0200 @@ -1,4 +1,4 @@ -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(42)<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol <<>>; ])  macro-function2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-function2.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:51.000000000 +0200 @@ -1,4 +1,4 @@ -MacroFunctionDef(FOO, ["X"; "Y"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(42)<<>>; ]; [PpNumber(21)<< >>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; ArgExpansionStart(FOO, Y, 0)<<>>; PpNumber(21)<< >>; ArgExpansionEnd(FOO, Y, 0)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(21)<< >>; RPar<<>>; Eol <<>>; ])  macro-functions3o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-functions3.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:51.000000000 +0200 @@ -1,8 +1,8 @@ -MacroDef(ANSWER, 42, '#', ' ', ' ') +Macro(ANSWER, [PpNumber(42)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(RAND, ["X"; ], (X+ANSWER), '#', ' ', ' ') +MacroFunction(RAND, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; OpOrPunc(+)<<>>; Id(ANSWER)<<>>; RPar<<>>; ])<<#>><< >><< >> Code([Eol << ->>; FunctionExpansionStart(RAND, [[PpNumber(51)<<>>; ]; ], 0)<<>>; LPar<<>>; ArgExpansionStart(RAND, X, 0)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(RAND, X, 0)<<>>; OpOrPunc(+)<<>>; ExpansionStart(ANSWER, 1)<<>>; PpNumber(42)<<>>; ExpansionEnd(ANSWER, 1)<<>>; RPar<<>>; FunctionExpansionEnd(RAND, 0)<<>>; Eol +>>; Id(RAND)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol <<>>; ])  macro-functions4o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-functions4.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:51.000000000 +0200 @@ -1,10 +1,10 @@ -MacroDef(X, 42, '#', ' ', ' ') +Macro(X, [PpNumber(42)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(FOO, ["X"; ], , '#', ' ', ' ') +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroDef(Y, ..., '#', ' ', ' ') +Macro(Y, [OpOrPunc(...)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; FunctionExpansionStart(FOO, [[PpNumber(51)<<>>; ]; ], 0)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(FOO, X, 0)<<>>; PpNumber(51)<<>>; ArgExpansionEnd(FOO, X, 0)<<>>; Comma<<>>; ExpansionStart(Y, 1)<< >>; OpOrPunc(...)<<>>; ExpansionEnd(Y, 1)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol <<>>; ])  macro-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-layout.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -MacroDef(FOO, bar/* c4 */baz, '#/* c1 */', '/* c2 */', '/* c3 */') +Macro(FOO, [Id(bar)<<>>; Id(baz)<>; ])<<#/* c1 */>><><> Code([Eol <>; ])  macro-usage-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-usage-layout.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:51.000000000 +0200 @@ -1,4 +1,4 @@ -MacroDef(FOO, 42, '#/* must not be expanded1 */', '/* must not be expanded2 */', '/* must not be expanded3 */') +Macro(FOO, [PpNumber(42)<<>>; ])<<#/* must not be expanded1 */>><><> Code([Eol -<>; ExpansionStart(FOO, 0)<<>>; PpNumber(42)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol +<>; Id(FOO)<<>>; Eol <<>>; ])  macro-usageo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-usage.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.33 2007-06-02 21:33:51.000000000 +0200 @@ -1,4 +1,4 @@ -MacroDef(FOO, bar, '#', ' ', ' ') +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; ExpansionStart(FOO, 0)<<>>; Id(bar)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol +<<>>; Id(FOO)<<>>; Eol <<>>; ])  macro-usage2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro-usage2.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.34 2007-06-02 21:33:51.000000000 +0200 @@ -1,7 +1,7 @@ -MacroDef(FOO, BAR, '#', ' ', ' ') +Macro(FOO, [Id(BAR)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroDef(BAR, 42 qux, '#', ' ', ' ') +Macro(BAR, [PpNumber(42)<<>>; Id(qux)<< >>; ])<<#>><< >><< >> Code([Eol -<<>>; ExpansionStart(FOO, 1)<<>>; ExpansionStart(BAR, 0)<<>>; PpNumber(42)<<>>; Id(qux)<< >>; ExpansionEnd(BAR, 0)<<>>; ExpansionEnd(FOO, 1)<<>>; Eol +<<>>; Id(FOO)<<>>; Eol <<>>; ])  macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/macro.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -MacroDef(FOO, bar, '#', ' ', ' ') +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ])  not-a-macro-function-callo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/not-a-macro-function-call.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:51.000000000 +0200 @@ -1,4 +1,4 @@ -MacroDef(FOO, X, '#', ' ', ' ') +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; ExpansionStart(FOO, 0)<<>>; Id(X)<<>>; ExpansionEnd(FOO, 0)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol <<>>; ])  notreplacedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/notreplaced.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:51.000000000 +0200 @@ -1,17 +1,17 @@ -MacroDef(FOO, foo, '#', ' ', ' ') +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroDef(BAR, #FOO, '#', ' ', ' ') +Macro(BAR, [Sharp<<>>; Id(FOO)<<>>; ])<<#>><< >><< >> Code([Eol -<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; ExpansionStart(FOO, 0)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 0)<<>>; Eol -<<>>; ExpansionStart(FOO, 1)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 1)<<>>; Eol +<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; Id(FOO)<<>>; Eol +<<>>; Id(FOO)<<>>; Eol <<>>; ]) -Line([Id(FOO)<<>>; ], '#', '') +Line([Id(FOO)<<>>; ])<<#>> Code([Eol << ->>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; ExpansionStart(BAR, 3)<< >>; Sharp<<>>; ExpansionStart(FOO, 2)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 2)<<>>; ExpansionEnd(BAR, 3)<<>>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; ExpansionStart(BAR, 5)<<>>; Sharp<<>>; ExpansionStart(FOO, 4)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 4)<<>>; ExpansionEnd(BAR, 5)<<>>; RPar<<>>; Eol -<<>>; ExpansionStart(BAR, 7)<<>>; Sharp<<>>; ExpansionStart(FOO, 6)<<>>; Id(foo)<<>>; ExpansionEnd(FOO, 6)<<>>; ExpansionEnd(BAR, 7)<<>>; Eol +>>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; Id(BAR)<< >>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; Id(BAR)<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; Eol <<>>; ]) -Line([Id(BAR)<<>>; ], '#', '') +Line([Id(BAR)<<>>; ])<<#>> Code([Eol <<>>; ])  sharp-lineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/sharp-line.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:51.000000000 +0200 @@ -1,8 +1,8 @@ -Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ], '# ', '') +Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ])<<# >> Code([Eol <<>>; Id(int)<<>>; OpOrPunc(;)<<>>; Eol <<>>; ]) -Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ], '# ', '') +Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ])<<# >> Code([Eol <<>>; Id(defined)<<>>; Id(foo)<< >>; Eol <<>>; ])  shuffleo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/shuffle.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:51.000000000 +0200 @@ -1,11 +1,11 @@ -MacroDef(ARGS, a, b, '#', ' ', ' ') +Macro(ARGS, [Id(a)<<>>; Comma<<>>; Id(b)<< >>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(SHUFFLE, ["A"; "B"; ], , '#', ' ', ' ') +MacroFunction(SHUFFLE, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; Comma<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -MacroFunctionDef(GEN, ["X"; ], SHUFFLE(X), '#', ' ', ' ') +MacroFunction(GEN, [Id(X)<<>>; ], [Id(SHUFFLE)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> Code([Eol << ->>; FunctionExpansionStart(GEN, [[Id(ARGS)<<>>; ]; ], 0)<<>>; FunctionExpansionStart(SHUFFLE, [[ArgExpansionStart(GEN, X, 0)<<>>; ExpansionStart(ARGS, 1)<<>>; Id(a)<<>>; ]; [Id(b)<< >>; ExpansionEnd(ARGS, 1)<<>>; ArgExpansionEnd(GEN, X, 0)<<>>; ]; ], 2)<<>>; OpOrPunc(<)<<>>; ArgExpansionStart(SHUFFLE, B, 2)<<>>; Id(b)<< >>; ExpansionEnd(ARGS, 1)<<>>; ArgExpansionEnd(GEN, X, 0)<<>>; ArgExpansionEnd(SHUFFLE, B, 2)<<>>; Comma<<>>; ArgExpansionStart(SHUFFLE, A, 2)<<>>; ArgExpansionStart(GEN, X, 0)<<>>; ExpansionStart(ARGS, 1)<<>>; Id(a)<<>>; ArgExpansionEnd(SHUFFLE, A, 2)<<>>; OpOrPunc(>)<<>>; FunctionExpansionEnd(SHUFFLE, 2)<<>>; FunctionExpansionEnd(GEN, 0)<<>>; Eol +>>; Id(GEN)<<>>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; Eol <<>>; ])  simple-ifgroupo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-ifgroup.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,9 @@ Code([Eol -<>; Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(3)<< >>; Eol -<<>>; ]) +<>; ]) +If([OpOrPunc(defined)<< >>; Id(l)<< >>; ], [If([Id(sizeof)<< /*not a keyword!*/ >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(1)<< >>; Eol +<<>>; ]); ], [If([Id(int)<< >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(2)<< >>; Eol +<<>>; ]); ], <<# >><<# >>; ]<<# >><<# >><<# >>; Code([Id(int)<<>>; Id(main)<< >>; LPar<< >>; RPar<<>>; Eol +<<>>; OpOrPunc({)<<>>; Eol +<<>>; OpOrPunc(})<<>>; Eol +<<>>; ]); ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(3)<< >>; Eol +<<>>; ]); ]<<#>><< // ok>><<#>><< /* l */>><<#>><< // !l>>  simple-sharp-erroro[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-sharp-error.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ], '#', '') +Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ])<<#>> Code([Eol <<>>; ])  simple-sharp-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-sharp-nop.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -Line([], '# // CPP's nop.', '') +Line([])<<# // CPP's nop.>> Code([Eol <<>>; ])  simple-sharp-pragmao[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-sharp-pragma.out 2007-06-01 17:54:20.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ], '#', ' // Suppress warnings.') +Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ])<<#>><< // Suppress warnings.>> Code([Eol <<>>; ])  simple-sharp-warningo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-sharp-warning.out 2007-06-01 17:54:21.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:51.000000000 +0200 @@ -1,3 +1,3 @@ -Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ], '#', '') +Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ])<<#>> Code([Eol <<>>; ])  simple-undefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-undef.out 2007-06-01 17:54:21.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:51.000000000 +0200 @@ -1,7 +1,7 @@ -MacroDef(FOO, foo, '#', ' ', ' ') +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> Code([Eol <<>>; ]) -Undef(FOO, '#') +Undef(FOO)<<#>><< >> Code([Eol <<>>; Id(FOO)<<>>; Eol <<>>; ])  simple-use-of-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/simple-use-of-defined.out 2007-06-01 17:54:21.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:51.000000000 +0200 @@ -1,5 +1,8 @@ Code([Id(before)<<>>; Eol << ->>; Eol +>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(lint)<<>>; RPar<<>>; ], [Code([Id(lint)<<>>; Id(on)<< >>; Eol +<<>>; ]); ], <<#>><<#>> +Code([Eol <<>>; Id(after)<<>>; Eol <<>>; ])  trans-modified-argo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/preprocess/ref/trans-modified-arg.out 2007-06-01 17:54:21.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:51.000000000 +0200 @@ -1,5 +1,5 @@ -MacroFunctionDef(PAR, ["X"; ], (X), '#', ' ', ' ') +MacroFunction(PAR, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> Code([Eol << ->>; FunctionExpansionStart(PAR, [[PpNumber(42)<<>>; ]; ], 0)<<>>; LPar<<>>; ArgExpansionStart(PAR, X, 0)<<>>; PpNumber(42)<<>>; ArgExpansionEnd(PAR, X, 0)<<>>; RPar<<>>; FunctionExpansionEnd(PAR, 0)<<>>; Eol +>>; Id(PAR)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; Eol <<>>; ]) >>> revcpp <<<  alternative-nameser[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/alternative-names.err 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-err.24386.14 2007-06-02 21:33:51.000000000 +0200 @@ -1 +1 @@ -__ROOT_DIR__/revcpp_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/revcpp/revcpp: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++  argument-substitutiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/argument-substitution.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:52.000000000 +0200 @@ -1,6 +1,11 @@ -/*# File "__ROOT_DIR__/data/argument-substitution.cc" #*/ -/*# MacroDef 1 # 1 1 "C" 1 , #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 11 BAR (A X B) #*/ -/*# MacroFunctionDef 1 # 1 1 "BAR" "X" "Y" 6 #*/ - -/*# MacroFunctionExpansion "FOO" 1 C "0" #*//*# MacroFunctionExpansion "BAR" 19 A/*AS FOO*//*MS C*/ 20 /*ME C*//*AE FOO*/ B "2" #*//*# MacroFunctionExpansionEnd "BAR" "2" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ +Macro(C, [Comma<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(FOO, [Id(X)<<>>; ], [Id(BAR)<<>>; LPar<< >>; Id(A)<<>>; Id(X)<< >>; Id(B)<< >>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; Id(C)<<>>; RPar<<>>; Eol +<<>>; ])  buggy-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/buggy-nop.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:52.000000000 +0200 @@ -1,4 +1,7 @@ -/*# File "__ROOT_DIR__/data/buggy-nop.cc" #*/ -/*# Line 2 # 8 42 "foo" 0 #*/ -/*# Line 1 # 0 0 #*/ -foo +Line([PpNumber(42)<<>>; String(foo)<< >>; ])<<# >> +Code([Eol +<<>>; ]) +Line([])<<#>> +Code([Eol +<<>>; Id(foo)<<>>; Eol +<<>>; ])  codeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/code.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:52.000000000 +0200 @@ -1,5 +1,5 @@ -/*# File "__ROOT_DIR__/data/code.cc" #*/ -int main() -{ - return 42; -} +Code([Id(int)<<>>; Id(main)<< >>; LPar<<>>; RPar<<>>; Eol +<<>>; OpOrPunc({)<<>>; Eol +<<>>; Id(return)<< >>; PpNumber(42)<< >>; OpOrPunc(;)<<>>; Eol +<<>>; OpOrPunc(})<<>>; Eol +<<>>; ])  comma-in-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/comma-in-args.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:52.000000000 +0200 @@ -1,21 +1,24 @@ -/*# File "__ROOT_DIR__/data/comma-in-args.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" "Y" 9 foo[X, Y] #*/ - -/*# MacroFunctionExpansion "FOO" 1 1 2 2 "0" #*/foo[/*# ArgExpansion "FOO" "X" "0" #*/1/*# ArgExpansionEnd "FOO" "X" "0" #*/,/*# ArgExpansion "FOO" "Y" "0" #*/ 2/*# ArgExpansionEnd "FOO" "Y" "0" #*/]/*# MacroFunctionExpansionEnd "FOO" "0" #*/ - -/*# MacroFunctionExpansion "FOO" 6 (1, 2) 2 3 "1" #*/foo[/*# ArgExpansion "FOO" "X" "1" #*/(1, 2)/*# ArgExpansionEnd "FOO" "X" "1" #*/,/*# ArgExpansion "FOO" "Y" "1" #*/ 3/*# ArgExpansionEnd "FOO" "Y" "1" #*/]/*# MacroFunctionExpansionEnd "FOO" "1" #*/ -/*# MacroFunctionExpansion "FOO" 1 1 7 (2, 3) "2" #*/foo[/*# ArgExpansion "FOO" "X" "2" #*/1/*# ArgExpansionEnd "FOO" "X" "2" #*/,/*# ArgExpansion "FOO" "Y" "2" #*/ (2, 3)/*# ArgExpansionEnd "FOO" "Y" "2" #*/]/*# MacroFunctionExpansionEnd "FOO" "2" #*/ - -/*# MacroFunctionExpansion "FOO" 0 0 "3" #*/foo[/*# ArgExpansion "FOO" "X" "3" #*//*# ArgExpansionEnd "FOO" "X" "3" #*/,/*# ArgExpansion "FOO" "Y" "3" #*//*# ArgExpansionEnd "FOO" "Y" "3" #*/]/*# MacroFunctionExpansionEnd "FOO" "3" #*/ // undefined behavior (16.3.10) but GCC handles it as expected -/*# MacroFunctionExpansion "FOO" 3 (,) 1 2 "4" #*/foo[/*# ArgExpansion "FOO" "X" "4" #*/(,)/*# ArgExpansionEnd "FOO" "X" "4" #*/,/*# ArgExpansion "FOO" "Y" "4" #*/2/*# ArgExpansionEnd "FOO" "Y" "4" #*/]/*# MacroFunctionExpansionEnd "FOO" "4" #*/ // defined behavior: the 1st argument has 3 preprocessing tokens - -/*# MacroFunctionDef 1 # 1 1 "BAR" "X" "Y" 9 bar[X, Y] #*/ -/*# MacroFunctionExpansion "FOO" 10 BAR (1, 2) 2 3 "5" #*/foo[/*# ArgExpansion "FOO" "X" "5" #*//*# MacroFunctionExpansion "BAR" 1 1 2 2 "6" #*/bar[/*# ArgExpansion "BAR" "X" "6" #*/1/*# ArgExpansionEnd "BAR" "X" "6" #*/,/*# ArgExpansion "BAR" "Y" "6" #*/ 2/*# ArgExpansionEnd "BAR" "Y" "6" #*/]/*# MacroFunctionExpansionEnd "BAR" "6" #*//*# ArgExpansionEnd "FOO" "X" "5" #*/,/*# ArgExpansion "FOO" "Y" "5" #*/ 3/*# ArgExpansionEnd "FOO" "Y" "5" #*/]/*# MacroFunctionExpansionEnd "FOO" "5" #*/ - -multine line start: -/*# MacroFunctionExpansion "FOO" 1 1 13 2 .. -still 2 "7" #*/foo[/*# ArgExpansion "FOO" "X" "7" #*/1/*# ArgExpansionEnd "FOO" "X" "7" #*/,/*# ArgExpansion "FOO" "Y" "7" #*/ 2 .. still 2/*# ArgExpansionEnd "FOO" "Y" "7" #*/]/*# MacroFunctionExpansionEnd "FOO" "7" #*/ -end // watch out for the empty lines!! +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [Id(foo)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; LPar<< >>; PpNumber(2)<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; RPar<<>>; Eol +<< +>>; Id(FOO)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<< // undefined behavior (16.3.10) but GCC handles it as expected>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; Comma<<>>; PpNumber(2)<<>>; RPar<<>>; Eol +<< // defined behavior: the 1st argument has 3 preprocessing tokens +>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [Id(bar)<<>>; OpOrPunc([)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(])<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(BAR)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; RPar<<>>; Comma<<>>; PpNumber(3)<< >>; RPar<<>>; Eol +<< +>>; Id(multine)<<>>; Id(line)<< >>; Id(start)<< >>; OpOrPunc(:)<<>>; Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(1)<<>>; Comma<<>>; PpNumber(2)<< >>; OpOrPunc(.)<< >>; OpOrPunc(.)<<>>; Eol +<<>>; Id(still)<<>>; PpNumber(2)<< >>; RPar<<>>; Eol +<<>>; Id(end)<<>>; Eol +<< // watch out for the empty lines!! /* multine line start: // the following yields an undefined behavior (GCC->error) @@ -23,5 +26,5 @@ # define UHOH :D) end */ - -UHOH :D +>>; Id(UHOH)<<>>; OpOrPunc(:)<< >>; Id(D)<<>>; Eol +<<>>; ])  comma-in-expansionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/comma-in-expansion.out 2007-05-09 15:57:40.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:52.000000000 +0200 @@ -0,0 +1,7 @@ +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; OpOrPunc(--)<< >>; OpOrPunc(-)<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(ARGS, [Id(first)<<>>; Comma<<>>; Id(second)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; Id(ARGS)<<>>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/comma-in-expansion.err 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-err.24386.19 2007-06-02 21:33:52.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given.  commento[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/comment.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:52.000000000 +0200 @@ -1,2 +1,2 @@ -/*# File "__ROOT_DIR__/data/comment.cc" #*/ -/* comment */ +Code([Eol +<>; ])  empty-macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/empty-macro-function.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/empty-macro-function.cc" #*/ -/*# MacroFunctionDef 1 # 1 0 "EMPTY" "X" 0 #*/ -+/*# MacroFunctionExpansion "EMPTY" 2 42 "0" #*//*# MacroFunctionExpansionEnd "EMPTY" "0" #*/+ +MacroFunction(EMPTY, [Id(X)<<>>; ], [])<<#>><< >> +Code([Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; OpOrPunc(+)<<>>; Eol +<<>>; ])  empty-macro-paramo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/empty-macro-param.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:52.000000000 +0200 @@ -1,16 +1,21 @@ -/*# File "__ROOT_DIR__/data/empty-macro-param.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 3 #*/ -/*# MacroFunctionExpansion "FOO" 0 "0" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ -/*# MacroFunctionDef 1 # 1 1 "BAR" "X" "Y" 6 #*/ -/*# MacroFunctionExpansion "BAR" 2 51 3 42 "1" #*//*# MacroFunctionExpansionEnd "BAR" "1" #*/ -/*# MacroFunctionExpansion "BAR" 0 0 "2" #*//*# MacroFunctionExpansionEnd "BAR" "2" #*/ -/*# MacroFunctionExpansion "BAR" 0 3 42 "3" #*//*# MacroFunctionExpansionEnd "BAR" "3" #*/ -/*# MacroFunctionExpansion "BAR" 2 51 0 "4" #*//*# MacroFunctionExpansionEnd "BAR" "4" #*/ -/*# MacroFunctionDef 1 # 1 1 "QUX" "X" "Y" "Z" 9 #*/ -/*# MacroFunctionExpansion "QUX" 2 42 3 51 3 69 "5" #*//*# MacroFunctionExpansionEnd "QUX" "5" #*/ -/*# MacroFunctionExpansion "QUX" 0 3 51 3 69 "6" #*//*# MacroFunctionExpansionEnd "QUX" "6" #*/ -/*# MacroFunctionExpansion "QUX" 2 42 3 51 0 "7" #*//*# MacroFunctionExpansionEnd "QUX" "7" #*/ -/*# MacroFunctionExpansion "QUX" 2 42 0 3 69 "8" #*//*# MacroFunctionExpansionEnd "QUX" "8" #*/ -/*# MacroFunctionExpansion "QUX" 0 0 3 69 "9" #*//*# MacroFunctionExpansionEnd "QUX" "9" #*/ -/*# MacroFunctionExpansion "QUX" 0 3 51 0 "10" #*//*# MacroFunctionExpansionEnd "QUX" "10" #*/ -/*# MacroFunctionExpansion "QUX" 2 42 0 0 "11" #*//*# MacroFunctionExpansionEnd "QUX" "11" #*/ +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; RPar<<>>; Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; Comma<<>>; PpNumber(42)<< >>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(51)<<>>; Comma<<>>; RPar<< >>; Eol +<<>>; ]) +MacroFunction(QUX, [Id(X)<<>>; Id(Y)<< >>; Id(Z)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Y)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<<>>; Id(Z)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; Comma<< >>; PpNumber(69)<< >>; RPar<<>>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; Comma<<>>; PpNumber(51)<< >>; Comma<<>>; RPar<< >>; Eol +<<>>; Id(QUX)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; Comma<< >>; RPar<< >>; Eol +<<>>; ])  empty-macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/empty-macro.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/empty-macro.cc" #*/ -/*# MacroDef 1 # 1 0 "EMPTY" 0 #*/ -+/*# MacroExpansion "EMPTY" "0" #*//*# MacroExpansionEnd "EMPTY" "0" #*/+ +Macro(EMPTY, [])<<#>><< >> +Code([Eol +<<>>; OpOrPunc(+)<<>>; Id(EMPTY)<<>>; OpOrPunc(+)<<>>; Eol +<<>>; ])  emptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/empty.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:52.000000000 +0200 @@ -1 +0,0 @@ -/*# File "__ROOT_DIR__/data/empty.cc" #*/  if-defined-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/if-defined-parens.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,6 @@ -/*# File "__ROOT_DIR__/data/if-defined-parens.cc" #*/ -/*# MacroDef 1 # 1 0 "FOO" 0 #*/ -OK +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(FOO)<<>>; RPar<<>>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/if-defined.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,6 @@ -/*# File "__ROOT_DIR__/data/if-defined.cc" #*/ -/*# MacroDef 1 # 1 0 "FOO" 0 #*/ -OK +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<< >>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-falseo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/if-false.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:52.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/if-false.cc" #*/ -OK +If([Integer(0, )<< >>; ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  if-trueo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/if-true.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:52.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/if-true.cc" #*/ -OK +If([Integer(1, )<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifdefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/ifdef.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,6 @@ -/*# File "__ROOT_DIR__/data/ifdef.cc" #*/ -/*# MacroDef 1 # 1 0 "FOO" 0 #*/ -OK +Macro(FOO, [])<<#>><< >> +Code([Eol +<<>>; ]) +If([OpOrPunc(defined)<<>>; Id(FOO)<< >>; ], [Code([Id(OK)<<>>; Eol +<<>>; ]); ], [Code([Id(KO)<<>>; Eol +<<>>; ]); ]<<#>><<#>><<#>>  ifndef-newline-newlineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/ifndef-newline-newline.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,3 @@ -/*# File "__ROOT_DIR__/data/ifndef-newline-newline.cc" #*/ - - +If([OpOrPunc(!)<<>>; OpOrPunc(defined)<<>>; Id(_FOO_H)<< >>; ], [Code([Eol +<< +>>; ]); ], <<#>><<#>>  include-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/include-layout.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,3 @@ -/*# File "__ROOT_DIR__/data/include-layout.cc" #*/ -/*# IncludeStart 9 /* \o/ */ "__ROOT_DIR__/data" "empty.cc" false #*/ -/*# IncludeEnd #*/ // \o/ +Include(HeaderName(empty.cc, False)<>)<<#>> +Code([Eol +<< // \o/>>; ])  include-nonemptyo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/include-nonempty.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:52.000000000 +0200 @@ -1,9 +1,5 @@ -/*# File "__ROOT_DIR__/data/include-nonempty.cc" #*/ -/*# IncludeStart 1 "__ROOT_DIR__/data" "code.cc" false #*/ -int main() -{ - return 42; -} -/*# IncludeEnd #*/ +Include(HeaderName(code.cc, False)<< >>)<<#>> +Code([Eol +<< -/* include-nonempty.cc */ +/* include-nonempty.cc */>>; ])  include-recursiveo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/include-recursive.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:52.000000000 +0200 @@ -1,10 +1,5 @@ -/*# File "__ROOT_DIR__/data/include-recursive.cc" #*/ -/*# IncludeStart 1 "__ROOT_DIR__/data" "sub/body.cc" false #*/ -/*# IncludeStart 1 "__ROOT_DIR__/data/sub" "tail.cc" false #*/ -/* tail.cc */ -/*# IncludeEnd #*/ +Include(HeaderName(sub/body.cc, False)<< >>)<<#>> +Code([Eol +<< -/* body.cc */ -/*# IncludeEnd #*/ - -/* include-recursive.cc */ +/* include-recursive.cc */>>; ])  includeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/include.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,3 @@ -/*# File "__ROOT_DIR__/data/include.cc" #*/ -/*# IncludeStart 1 "__ROOT_DIR__/data" "empty.cc" false #*/ -/*# IncludeEnd #*/ +Include(HeaderName(empty.cc, False)<< >>)<<#>> +Code([Eol +<<>>; ])  macro-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-def.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:52.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/macro-def.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 bar #*/ +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  macro-function-arg-scopeo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-arg-scope.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:52.000000000 +0200 @@ -1,4 +1,7 @@ -/*# File "__ROOT_DIR__/data/macro-function-arg-scope.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 1 X #*/ -/*# MacroFunctionDef 1 # 1 1 "BAR" "X" 3 FOO #*/ -/*# MacroFunctionExpansion "BAR" 2 42 "0" #*//*# MacroExpansion "FOO" "1" #*/X/*# MacroExpansionEnd "FOO" "1" #*//*# MacroFunctionExpansionEnd "BAR" "0" #*/ +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(BAR, [Id(X)<<>>; ], [Id(FOO)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(BAR)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-defo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-def.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:52.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/macro-function-def.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "YABO" "ETS" "GYA" 4 TRUE #*/ +MacroFunction(YABO, [Id(ETS)<<>>; Id(GYA)<<>>; ], [Id(TRUE)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  macro-function-no-argso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-no-args.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:52.000000000 +0200 @@ -1,4 +1,5 @@ -/*# File "__ROOT_DIR__/data/macro-function-no-args.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" 2 42 #*/ - -int i =/*# MacroFunctionExpansion "FOO" "0" #*/42/*# MacroFunctionExpansionEnd "FOO" "0" #*/; +MacroFunction(FOO, [], [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(int)<<>>; Id(i)<< >>; OpOrPunc(=)<< >>; Id(FOO)<< >>; LPar<<>>; RPar<<>>; OpOrPunc(;)<<>>; Eol +<<>>; ])  macro-function-param-with-parenso[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-param-with-parens.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:52.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-function-param-with-parens.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 3 #*/ -/*# MacroFunctionExpansion "FOO" 3 (,) "0" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; Comma<<>>; RPar<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-param-with-parens2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-param-with-parens2.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-function-param-with-parens2.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 3 #*/ -/*# MacroFunctionExpansion "FOO" 9 ((), ...) "0" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; LPar<<>>; LPar<<>>; RPar<<>>; Comma<<>>; OpOrPunc(...)<< >>; RPar<<>>; RPar<<>>; Eol +<<>>; ])  macro-function-wrong-nargoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-wrong-narg.out 2007-04-13 19:28:47.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:53.000000000 +0200 @@ -0,0 +1,5 @@ +MacroFunction(FOO, [Id(A)<<>>; Id(B)<< >>; ], [Id(BAR)<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(FOO)<<>>; LPar<<>>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ]) --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function-wrong-narg.err 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-err.24386.8 2007-06-02 21:33:53.000000000 +0200 @@ -1 +0,0 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given.  macro-functiono[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-function.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 3 #*/ -/*# MacroFunctionExpansion "FOO" 2 42 "0" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  macro-function2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-function2.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-function2.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" "Y" 7 #*/ -/*# MacroFunctionExpansion "FOO" 2 42 3 21 "0" #*/ /*# MacroFunctionExpansionEnd "FOO" "0" #*/ +MacroFunction(FOO, [Id(X)<<>>; Id(Y)<< >>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; OpOrPunc(>)<<>>; OpOrPunc(<)<< >>; Id(Y)<<>>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; Comma<<>>; PpNumber(21)<< >>; RPar<<>>; Eol +<<>>; ])  macro-functions3o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-functions3.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:53.000000000 +0200 @@ -1,5 +1,8 @@ -/*# File "__ROOT_DIR__/data/macro-functions3.cc" #*/ -/*# MacroDef 1 # 1 1 "ANSWER" 2 42 #*/ -/*# MacroFunctionDef 1 # 1 1 "RAND" "X" 10 (X+ANSWER) #*/ - -/*# MacroFunctionExpansion "RAND" 2 51 "0" #*/(/*# ArgExpansion "RAND" "X" "0" #*/51/*# ArgExpansionEnd "RAND" "X" "0" #*/+/*# MacroExpansion "ANSWER" "1" #*/42/*# MacroExpansionEnd "ANSWER" "1" #*/)/*# MacroFunctionExpansionEnd "RAND" "0" #*/ +Macro(ANSWER, [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(RAND, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; OpOrPunc(+)<<>>; Id(ANSWER)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(RAND)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ])  macro-functions4o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-functions4.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:53.000000000 +0200 @@ -1,5 +1,10 @@ -/*# File "__ROOT_DIR__/data/macro-functions4.cc" #*/ -/*# MacroDef 1 # 1 1 "X" 2 42 #*/ -/*# MacroFunctionDef 1 # 1 1 "FOO" "X" 6 #*/ -/*# MacroDef 1 # 1 1 "Y" 3 ... #*/ -/*# MacroFunctionExpansion "FOO" 2 51 "0" #*//*# MacroFunctionExpansionEnd "FOO" "0" #*/ +Macro(X, [PpNumber(42)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(FOO, [Id(X)<<>>; ], [OpOrPunc(<)<<>>; Id(X)<<>>; Comma<<>>; Id(Y)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(Y, [OpOrPunc(...)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(51)<<>>; RPar<<>>; Eol +<<>>; ])  macro-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-layout.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/macro-layout.cc" #*/ -/*# MacroDef 9 #/* c1 */ 8 /* c2 */ 8 /* c3 */ "FOO" 14 bar/* c4 */baz #*//* c5 */ +Macro(FOO, [Id(bar)<<>>; Id(baz)<>; ])<<#/* c1 */>><><> +Code([Eol +<>; ])  macro-usage-layouto[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-usage-layout.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-usage-layout.cc" #*/ -/*# MacroDef 28 #/* must not be expanded1 */ 27 /* must not be expanded2 */ 27 /* must not be expanded3 */ "FOO" 2 42 #*//* must not be expanded4 */ -/*# MacroExpansion "FOO" "0" #*/42/*# MacroExpansionEnd "FOO" "0" #*/ +Macro(FOO, [PpNumber(42)<<>>; ])<<#/* must not be expanded1 */>><><> +Code([Eol +<>; Id(FOO)<<>>; Eol +<<>>; ])  macro-usageo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-usage.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/macro-usage.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 bar #*/ -/*# MacroExpansion "FOO" "0" #*/bar/*# MacroExpansionEnd "FOO" "0" #*/ +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  macro-usage2o[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro-usage2.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:53.000000000 +0200 @@ -1,4 +1,7 @@ -/*# File "__ROOT_DIR__/data/macro-usage2.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 BAR #*/ -/*# MacroDef 1 # 1 1 "BAR" 6 42 qux #*/ -/*# MacroExpansion "FOO" "1" #*//*# MacroExpansion "BAR" "0" #*/42 qux/*# MacroExpansionEnd "BAR" "0" #*//*# MacroExpansionEnd "FOO" "1" #*/ +Macro(FOO, [Id(BAR)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(BAR, [PpNumber(42)<<>>; Id(qux)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  macroo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/macro.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/macro.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 bar #*/ +Macro(FOO, [Id(bar)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ])  not-a-macro-function-callo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/not-a-macro-function-call.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.17 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,4 @@ -/*# File "__ROOT_DIR__/data/not-a-macro-function-call.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 1 X #*/ -/*# MacroExpansion "FOO" "0" #*/X/*# MacroExpansionEnd "FOO" "0" #*/ (42) +Macro(FOO, [Id(X)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(FOO)<<>>; LPar<< >>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ])  notreplacedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/notreplaced.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:53.000000000 +0200 @@ -1,10 +1,17 @@ -/*# File "__ROOT_DIR__/data/notreplaced.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 foo #*/ -/*# MacroDef 1 # 1 1 "BAR" 4 #FOO #*/ -foo: This is #/*# MacroExpansion "FOO" "0" #*/foo/*# MacroExpansionEnd "FOO" "0" #*/ -/*# MacroExpansion "FOO" "1" #*/foo/*# MacroExpansionEnd "FOO" "1" #*/ -/*# Line 1 # 3 FOO 0 #*/ - -bar: And this is /*# MacroExpansion "BAR" "3" #*/#/*# MacroExpansion "FOO" "2" #*/foo/*# MacroExpansionEnd "FOO" "2" #*//*# MacroExpansionEnd "BAR" "3" #*/ (or #/*# MacroExpansion "BAR" "5" #*/#/*# MacroExpansion "FOO" "4" #*/foo/*# MacroExpansionEnd "FOO" "4" #*//*# MacroExpansionEnd "BAR" "5" #*/) -/*# MacroExpansion "BAR" "7" #*/#/*# MacroExpansion "FOO" "6" #*/foo/*# MacroExpansionEnd "FOO" "6" #*//*# MacroExpansionEnd "BAR" "7" #*/ -/*# Line 1 # 3 BAR 0 #*/ +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Macro(BAR, [Sharp<<>>; Id(FOO)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; Id(foo)<<>>; OpOrPunc(:)<<>>; Id(This)<< >>; Id(is)<< >>; Sharp<< >>; Id(FOO)<<>>; Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ]) +Line([Id(FOO)<<>>; ])<<#>> +Code([Eol +<< +>>; Id(bar)<<>>; OpOrPunc(:)<<>>; Id(And)<< >>; Id(this)<< >>; Id(is)<< >>; Id(BAR)<< >>; LPar<< >>; OpOrPunc(or)<<>>; Sharp<< >>; Id(BAR)<<>>; RPar<<>>; Eol +<<>>; Id(BAR)<<>>; Eol +<<>>; ]) +Line([Id(BAR)<<>>; ])<<#>> +Code([Eol +<<>>; ])  sharp-lineo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/sharp-line.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:53.000000000 +0200 @@ -1,5 +1,8 @@ -/*# File "__ROOT_DIR__/data/sharp-line.cc" #*/ -/*# Line 2 # 18 42 "sharp-line.cc" 0 #*/ -int; -/*# Line 2 # 17 1 "sharp-line.cc" 0 #*/ -defined foo +Line([PpNumber(42)<<>>; String(sharp-line.cc)<< >>; ])<<# >> +Code([Eol +<<>>; Id(int)<<>>; OpOrPunc(;)<<>>; Eol +<<>>; ]) +Line([PpNumber(1)<<>>; String(sharp-line.cc)<< >>; ])<<# >> +Code([Eol +<<>>; Id(defined)<<>>; Id(foo)<< >>; Eol +<<>>; ])  shuffleo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/shuffle.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:53.000000000 +0200 @@ -1,6 +1,11 @@ -/*# File "__ROOT_DIR__/data/shuffle.cc" #*/ -/*# MacroDef 1 # 1 1 "ARGS" 4 a, b #*/ -/*# MacroFunctionDef 1 # 1 1 "SHUFFLE" "A" "B" 6 #*/ -/*# MacroFunctionDef 1 # 1 1 "GEN" "X" 10 SHUFFLE(X) #*/ - -/*# MacroFunctionExpansion "GEN" 4 ARGS "0" #*//*# MacroFunctionExpansion "SHUFFLE" 22 /*AS GEN*//*MS ARGS*/a 23 b/*ME ARGS*//*AE GEN*/ "2" #*//*# MacroFunctionExpansionEnd "SHUFFLE" "2" #*//*# MacroFunctionExpansionEnd "GEN" "0" #*/ +Macro(ARGS, [Id(a)<<>>; Comma<<>>; Id(b)<< >>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(SHUFFLE, [Id(A)<<>>; Id(B)<< >>; ], [OpOrPunc(<)<<>>; Id(B)<<>>; Comma<<>>; Id(A)<< >>; OpOrPunc(>)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +MacroFunction(GEN, [Id(X)<<>>; ], [Id(SHUFFLE)<<>>; LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(GEN)<<>>; LPar<<>>; Id(ARGS)<<>>; RPar<<>>; Eol +<<>>; ])  simple-ifgroupo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-ifgroup.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:53.000000000 +0200 @@ -1,3 +1,9 @@ -/*# File "__ROOT_DIR__/data/simple-ifgroup.cc" #*/ -//#if ~0xffffffffffffffff // FALSE -choke on me 3 +Code([Eol +<>; ]) +If([OpOrPunc(defined)<< >>; Id(l)<< >>; ], [If([Id(sizeof)<< /*not a keyword!*/ >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(1)<< >>; Eol +<<>>; ]); ], [If([Id(int)<< >>; ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(2)<< >>; Eol +<<>>; ]); ], <<# >><<# >>; ]<<# >><<# >><<# >>; Code([Id(int)<<>>; Id(main)<< >>; LPar<< >>; RPar<<>>; Eol +<<>>; OpOrPunc({)<<>>; Eol +<<>>; OpOrPunc(})<<>>; Eol +<<>>; ]); ], [Code([Id(choke)<<>>; Id(on)<< >>; Id(me)<< >>; PpNumber(3)<< >>; Eol +<<>>; ]); ]<<#>><< // ok>><<#>><< /* l */>><<#>><< // !l>>  simple-sharp-erroro[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-sharp-error.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/simple-sharp-error.cc" #*/ -/*# Error 1 # 31 This file should never be used 0 #*/ +Error([Id(This)<< >>; Id(file)<< >>; Id(should)<< >>; Id(never)<< >>; Id(be)<< >>; Id(used)<< >>; ])<<#>> +Code([Eol +<<>>; ])  simple-sharp-nopo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-sharp-nop.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/simple-sharp-nop.cc" #*/ -/*# Line 15 # // CPP's nop. 0 0 #*/ +Line([])<<# // CPP's nop.>> +Code([Eol +<<>>; ])  simple-sharp-pragmao[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-sharp-pragma.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/simple-sharp-pragma.cc" #*/ -/*# Pragma 1 # 18 GCC system_header 22 // Suppress warnings. #*/ +Pragma([Id(GCC)<< >>; Id(system_header)<< >>; ])<<#>><< // Suppress warnings.>> +Code([Eol +<<>>; ])  simple-sharp-warningo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-sharp-warning.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:53.000000000 +0200 @@ -1,2 +1,3 @@ -/*# File "__ROOT_DIR__/data/simple-sharp-warning.cc" #*/ -/*# Warning 1 # 44 Did you know that #warning is an extension? 0 #*/ +Warning([Id(Did)<< >>; Id(you)<< >>; Id(know)<< >>; Id(that)<< >>; Sharp<< >>; Id(warning)<<>>; Id(is)<< >>; Id(an)<< >>; Id(extension)<< >>; OpOrPunc(?)<<>>; ])<<#>> +Code([Eol +<<>>; ])  simple-undefo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-undef.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:53.000000000 +0200 @@ -1,4 +1,7 @@ -/*# File "__ROOT_DIR__/data/simple-undef.cc" #*/ -/*# MacroDef 1 # 1 1 "FOO" 3 foo #*/ -/*# Undef 1 # FOO #*/ -FOO +Macro(FOO, [Id(foo)<<>>; ])<<#>><< >><< >> +Code([Eol +<<>>; ]) +Undef(FOO)<<#>><< >> +Code([Eol +<<>>; Id(FOO)<<>>; Eol +<<>>; ])  simple-use-of-definedo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/simple-use-of-defined.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:53.000000000 +0200 @@ -1,5 +1,8 @@ -/*# File "__ROOT_DIR__/data/simple-use-of-defined.cc" #*/ -before - - -after +Code([Id(before)<<>>; Eol +<< +>>; ]) +If([OpOrPunc(defined)<< >>; LPar<< >>; Id(lint)<<>>; RPar<<>>; ], [Code([Id(lint)<<>>; Id(on)<< >>; Eol +<<>>; ]); ], <<#>><<#>> +Code([Eol +<<>>; Id(after)<<>>; Eol +<<>>; ])  trans-modified-argo[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/revcpp/ref/trans-modified-arg.out 2007-06-02 20:19:27.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:53.000000000 +0200 @@ -1,4 +1,5 @@ -/*# File "__ROOT_DIR__/data/trans-modified-arg.cc" #*/ -/*# MacroFunctionDef 1 # 1 1 "PAR" "X" 3 (X) #*/ - -/*# MacroFunctionExpansion "PAR" 2 42 "0" #*/(/*# ArgExpansion "PAR" "X" "0" #*/42/*# ArgExpansionEnd "PAR" "X" "0" #*/)/*# MacroFunctionExpansionEnd "PAR" "0" #*/ +MacroFunction(PAR, [Id(X)<<>>; ], [LPar<<>>; Id(X)<<>>; RPar<<>>; ])<<#>><< >><< >> +Code([Eol +<< +>>; Id(PAR)<<>>; LPar<<>>; PpNumber(42)<<>>; RPar<<>>; Eol +<<>>; ]) >>> uncpp <<<  alternative-namese[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/alternative-names.err 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-err.24386.31 2007-06-02 21:33:54.000000000 +0200 @@ -1,2 +1,2 @@ -__ROOT_DIR__/revcpp_: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ +/Users/tsuna/svn/revcpp/trunk/tests/uncpp/../revcpp/revcpp: data/alternative-names.cc:1:8-10: error: "or" cannot be used as a macro name as it is an operator in C++ __ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  argument-substitutionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/argument-substitution.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:54.000000000 +0200 @@ -1,6 +0,0 @@ ->>> __ROOT_DIR__/data/argument-substitution.cc <<< -#define C , -#define FOO(X) BAR (A X B) -#define BAR(X,Y) - -FOO(C) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/argument-substitution.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.32 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  buggy-nopoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/buggy-nop.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:54.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/buggy-nop.cc <<< -# 42 "foo" -# -foo --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/buggy-nop.err 2007-06-01 17:12:06.000000000 +0200 +++ /tmp/mouline-err.24386.33 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  codeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/code.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.20 2007-06-02 21:33:54.000000000 +0200 @@ -1,5 +0,0 @@ ->>> __ROOT_DIR__/data/code.cc <<< -int main() -{ - return 42; -} --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/code.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.0 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  comma-in-argsoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/comma-in-args.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:54.000000000 +0200 @@ -1,26 +0,0 @@ ->>> __ROOT_DIR__/data/comma-in-args.cc <<< -#define FOO(X,Y) foo[X, Y] - -FOO(1, 2) - -FOO((1, 2), 3) -FOO(1, (2, 3)) - -FOO(,) // undefined behavior (16.3.10) but GCC handles it as expected -FOO((,),2) // defined behavior: the 1st argument has 3 preprocessing tokens - -#define BAR(X,Y) bar[X, Y] -FOO(BAR(1, 2), 3) - -multine line start: -FOO(1, 2 .. still 2) -end // watch out for the empty lines!! - -/* -multine line start: // the following yields an undefined behavior (GCC->error) -FOO (1, 2 .. -# define UHOH :D) -end -*/ - -UHOH :D --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/comma-in-args.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.1 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  comma-in-expansione[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/comma-in-expansion.err 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-err.24386.2 2007-06-02 21:33:54.000000000 +0200 @@ -1,2 +1 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given. __ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  commentoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/comment.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:54.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/comment.cc <<< -/* comment */ --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/comment.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.3 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  empty-macro-functionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro-function.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:54.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/empty-macro-function.cc <<< -#define EMPTY(X) -+EMPTY(42)+ --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro-function.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.4 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  empty-macro-paramoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro-param.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.4 2007-06-02 21:33:54.000000000 +0200 @@ -1,16 +0,0 @@ ->>> __ROOT_DIR__/data/empty-macro-param.cc <<< -#define FOO(X) -FOO() -#define BAR(X,Y) -BAR(51, 42) -BAR(,) -BAR(, 42) -BAR(51,) -#define QUX(X,Y,Z) -QUX(42,, 51 69) -QUX(,, 51 69) -QUX(42,, 51) -QUX(42,, 69) -QUX(,, 69) -QUX(,, 51) -QUX(42,,) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro-param.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.5 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  empty-macrooe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.5 2007-06-02 21:33:54.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/empty-macro.cc <<< -#define EMPTY -+EMPTY+ --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty-macro.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.6 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  emptyoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.6 2007-06-02 21:33:54.000000000 +0200 @@ -1 +0,0 @@ ->>> __ROOT_DIR__/data/empty.cc <<< --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/empty.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.7 2007-06-02 21:33:54.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  if-defined-parens[SKIP]  if-defined[SKIP]  if-false[SKIP]  if-true[SKIP]  ifdef[SKIP]  ifndef-newline-newline[SKIP]  include-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-layout.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.7 2007-06-02 21:33:54.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/include-layout.cc <<< -#include/* \o/ */"empty.cc" // \o/ ->>> __ROOT_DIR__/data/empty.cc <<< --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-layout.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.8 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  include-nonemptyoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-nonempty.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.8 2007-06-02 21:33:55.000000000 +0200 @@ -1,9 +0,0 @@ ->>> __ROOT_DIR__/data/include-nonempty.cc <<< -#include "code.cc" - -/* include-nonempty.cc */ ->>> __ROOT_DIR__/data/code.cc <<< -int main() -{ - return 42; -} --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-nonempty.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.9 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  include-recursiveoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-recursive.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.9 2007-06-02 21:33:55.000000000 +0200 @@ -1,10 +0,0 @@ ->>> __ROOT_DIR__/data/include-recursive.cc <<< -#include "sub/body.cc" - -/* include-recursive.cc */ ->>> __ROOT_DIR__/data/sub/body.cc <<< -#include "tail.cc" - -/* body.cc */ ->>> __ROOT_DIR__/data/sub/tail.cc <<< -/* tail.cc */ --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include-recursive.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.10 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  includeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.10 2007-06-02 21:33:55.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/include.cc <<< -#include "empty.cc" ->>> __ROOT_DIR__/data/empty.cc <<< --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/include.err 2007-04-09 11:22:40.000000000 +0200 +++ /tmp/mouline-err.24386.11 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-defoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-def.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.11 2007-06-02 21:33:55.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/macro-def.cc <<< -#define FOO bar --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-def.err 2007-04-28 09:22:41.000000000 +0200 +++ /tmp/mouline-err.24386.12 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-arg-scopeoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-arg-scope.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.12 2007-06-02 21:33:55.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function-arg-scope.cc <<< -#define FOO X -#define BAR(X) FOO -BAR(42) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-arg-scope.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.13 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-defoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-def.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.13 2007-06-02 21:33:55.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function-def.cc <<< -#define YABO(ETS,GYA) TRUE --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-def.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.14 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-no-argsoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-no-args.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.14 2007-06-02 21:33:55.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function-no-args.cc <<< -#define FOO() 42 - -int i =FOO(); --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-no-args.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.15 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-param-with-parensoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-param-with-parens.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.15 2007-06-02 21:33:55.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function-param-with-parens.cc <<< -#define FOO(X) -FOO((,)) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-param-with-parens.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.16 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-param-with-parens2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-param-with-parens2.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.16 2007-06-02 21:33:55.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function-param-with-parens2.cc <<< -#define FOO(X) -FOO(((), ...)) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-param-with-parens2.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.17 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function-wrong-narge[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function-wrong-narg.err 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-err.24386.18 2007-06-02 21:33:55.000000000 +0200 @@ -1,2 +1 @@ -__ROOT_DIR__/revcpp_: Macro 'FOO' requires 2 arguments, but only 1 given. __ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-functionoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.18 2007-06-02 21:33:55.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function.cc <<< -#define FOO(X) -FOO(42) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.19 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-function2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function2.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.19 2007-06-02 21:33:55.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-function2.cc <<< -#define FOO(X,Y) -FOO(42, 21) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-function2.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.20 2007-06-02 21:33:55.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-functions3oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-functions3.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.21 2007-06-02 21:33:55.000000000 +0200 @@ -1,5 +0,0 @@ ->>> __ROOT_DIR__/data/macro-functions3.cc <<< -#define ANSWER 42 -#define RAND(X) (X+ANSWER) - -RAND(51) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-functions3.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.21 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-functions4oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-functions4.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.22 2007-06-02 21:33:56.000000000 +0200 @@ -1,5 +0,0 @@ ->>> __ROOT_DIR__/data/macro-functions4.cc <<< -#define X 42 -#define FOO(X) -#define Y ... -FOO(51) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-functions4.err 2007-05-10 21:33:48.000000000 +0200 +++ /tmp/mouline-err.24386.22 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-layout.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.23 2007-06-02 21:33:56.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/macro-layout.cc <<< -#/* c1 */define/* c2 */FOO/* c3 */bar/* c4 */baz/* c5 */ --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-layout.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.23 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-usage-layoutoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage-layout.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.24 2007-06-02 21:33:56.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-usage-layout.cc <<< -#/* must not be expanded1 */define/* must not be expanded2 */FOO/* must not be expanded3 */42/* must not be expanded4 */ -FOO --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage-layout.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.24 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-usageoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.25 2007-06-02 21:33:56.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/macro-usage.cc <<< -#define FOO bar -FOO --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage.err 2007-05-07 17:55:47.000000000 +0200 +++ /tmp/mouline-err.24386.25 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macro-usage2oe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage2.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.26 2007-06-02 21:33:56.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/macro-usage2.cc <<< -#define FOO BAR -#define BAR 42 qux -FOO --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro-usage2.err 2007-05-08 18:47:43.000000000 +0200 +++ /tmp/mouline-err.24386.26 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  macrooe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.27 2007-06-02 21:33:56.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/macro.cc <<< -#define FOO bar --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/macro.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.27 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  not-a-macro-function-calloe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/not-a-macro-function-call.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.28 2007-06-02 21:33:56.000000000 +0200 @@ -1,3 +0,0 @@ ->>> __ROOT_DIR__/data/not-a-macro-function-call.cc <<< -#define FOO X -FOO (42) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/not-a-macro-function-call.err 2007-05-09 09:44:56.000000000 +0200 +++ /tmp/mouline-err.24386.28 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  notreplacedoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/notreplaced.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.29 2007-06-02 21:33:56.000000000 +0200 @@ -1,10 +0,0 @@ ->>> __ROOT_DIR__/data/notreplaced.cc <<< -#define FOO foo -#define BAR #FOO -foo: This is #FOO -FOO -#FOO - -bar: And this is BAR (or #BAR) -BAR -#BAR --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/notreplaced.err 2007-05-18 11:29:46.000000000 +0200 +++ /tmp/mouline-err.24386.29 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  sharp-lineoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/sharp-line.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.30 2007-06-02 21:33:56.000000000 +0200 @@ -1,5 +0,0 @@ ->>> __ROOT_DIR__/data/sharp-line.cc <<< -# 42 "sharp-line.cc" -int; -# 1 "sharp-line.cc" -defined foo --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/sharp-line.err 2007-05-14 20:25:50.000000000 +0200 +++ /tmp/mouline-err.24386.30 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  shuffleoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/shuffle.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.31 2007-06-02 21:33:56.000000000 +0200 @@ -1,6 +0,0 @@ ->>> __ROOT_DIR__/data/shuffle.cc <<< -#define ARGS a, b -#define SHUFFLE(A,B) -#define GEN(X) SHUFFLE(X) - -GEN(ARGS) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/shuffle.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.31 2007-06-02 21:33:56.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-ifgroup[SKIP]  simple-sharp-erroroe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-error.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.32 2007-06-02 21:33:56.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/simple-sharp-error.cc <<< -#error This file should never be used --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-error.err 2007-05-14 22:21:25.000000000 +0200 +++ /tmp/mouline-err.24386.32 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-sharp-nopoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-nop.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.33 2007-06-02 21:33:57.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/simple-sharp-nop.cc <<< -# // CPP's nop. --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-nop.err 2007-05-14 16:05:37.000000000 +0200 +++ /tmp/mouline-err.24386.18 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-sharp-pragmaoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-pragma.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.0 2007-06-02 21:33:57.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/simple-sharp-pragma.cc <<< -#pragma GCC system_header // Suppress warnings. --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-pragma.err 2007-05-14 22:21:37.000000000 +0200 +++ /tmp/mouline-err.24386.0 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-sharp-warningoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-warning.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.1 2007-06-02 21:33:57.000000000 +0200 @@ -1,2 +0,0 @@ ->>> __ROOT_DIR__/data/simple-sharp-warning.cc <<< -#warning Did you know that #warning is an extension? --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-sharp-warning.err 2007-05-14 22:21:32.000000000 +0200 +++ /tmp/mouline-err.24386.1 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-undefoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-undef.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.2 2007-06-02 21:33:57.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/simple-undef.cc <<< -#define FOO foo -#undef FOO -FOO --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/simple-undef.err 2007-05-09 19:24:17.000000000 +0200 +++ /tmp/mouline-err.24386.2 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.  simple-use-of-defined[SKIP]  trans-modified-argoe[ KO ] --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/trans-modified-arg.out 2007-06-02 20:19:29.000000000 +0200 +++ /tmp/mouline-out.24386.3 2007-06-02 21:33:57.000000000 +0200 @@ -1,4 +0,0 @@ ->>> __ROOT_DIR__/data/trans-modified-arg.cc <<< -#define PAR(X) (X) - -PAR(51) --- /Users/tsuna/svn/revcpp/trunk/tests/uncpp/ref/trans-modified-arg.err 2007-05-14 16:00:46.000000000 +0200 +++ /tmp/mouline-err.24386.3 2007-06-02 21:33:57.000000000 +0200 @@ -0,0 +1 @@ +__ROOT_DIR__/uncpp_: Invalid revcpp file: missing File metatag.