Commit 95e45f65 authored by vasseu_c's avatar vasseu_c
Browse files

from Clement Vasseur <vasseu_c@lrde.epita.fr>

        * test/disambiguate/test.test: Remove .diff before running the test.

        * test/disambiguate/class-03.cc, test/disambiguate/enum-02.cc,
        * test/disambiguate/enum-04.cc, test/disambiguate/function-05.cc,
        * test/disambiguate/power-02.cc, test/disambiguate/template-09.cc,
        * test/disambiguate/power-02.detcc, test/disambiguate/inherit-09.detcc,
        * test/disambiguate/inherit-09.cc, test/disambiguate/inherit-08.detcc,
        * test/disambiguate/inherit-08.cc, test/disambiguate/inherit-07.detcc,
        * test/disambiguate/inherit-07.cc, test/disambiguate/inherit-06.detcc,
        * test/disambiguate/inherit-06.cc, test/disambiguate/class-03.detcc,
        * test/disambiguate/template-09.detcc,
        * test/disambiguate/function-06.detcc,
        * test/disambiguate/function-05.detcc, test/disambiguate/enum-04.detcc,
        * test/disambiguate/enum-02.detcc: Fix tests, make them pass with g++.

        * test/g++/template/Makefile.am: Fix .test link creation.
parent 07deee02
2003-06-23 Clement Vasseur <vasseu_c@lrde.epita.fr>
* test/disambiguate/test.test: Remove .diff before running the test.
* test/disambiguate/class-03.cc, test/disambiguate/enum-02.cc,
* test/disambiguate/enum-04.cc, test/disambiguate/function-05.cc,
* test/disambiguate/power-02.cc, test/disambiguate/template-09.cc,
* test/disambiguate/power-02.detcc, test/disambiguate/inherit-09.detcc,
* test/disambiguate/inherit-09.cc, test/disambiguate/inherit-08.detcc,
* test/disambiguate/inherit-08.cc, test/disambiguate/inherit-07.detcc,
* test/disambiguate/inherit-07.cc, test/disambiguate/inherit-06.detcc,
* test/disambiguate/inherit-06.cc, test/disambiguate/class-03.detcc,
* test/disambiguate/template-09.detcc,
* test/disambiguate/function-06.detcc,
* test/disambiguate/function-05.detcc, test/disambiguate/enum-04.detcc,
* test/disambiguate/enum-02.detcc: Fix tests, make them pass with g++.
* test/g++/template/Makefile.am: Fix .test link creation.
2003-06-23 Clement Vasseur <vasseu_c@lrde.epita.fr>
* test/disambiguate/Makefile.am, test/expressions/Makefile.am,
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 120)
(Parent-Version meta-c++-grammar 0 119)
(Project-Version meta-c++-grammar 0 121)
(Parent-Version meta-c++-grammar 0 120)
(Version-Log "from Clement Vasseur <vasseu_c@lrde.epita.fr>
* test/disambiguate/test.test: Remove .diff before running the test.
* test/disambiguate/Makefile.am, test/expressions/Makefile.am,
* test/g++/template/Makefile.am, test/g++/parse/Makefile.am,
* test/g++/overload/Makefile.am, test/g++/other/Makefile.am,
* test/g++/opt/Makefile.am, test/g++/lookup/Makefile.am,
* test/g++/init/Makefile.am, test/g++/inherit/Makefile.am,
* test/g++/eh/Makefile.am, test/g++/debug/Makefile.am,
* test/g++/abi/Makefile.am: Fix .test link creation.
* test/disambiguate/class-03.cc, test/disambiguate/enum-02.cc,
* test/disambiguate/enum-04.cc, test/disambiguate/function-05.cc,
* test/disambiguate/power-02.cc, test/disambiguate/template-09.cc,
* test/disambiguate/power-02.detcc, test/disambiguate/inherit-09.detcc,
* test/disambiguate/inherit-09.cc, test/disambiguate/inherit-08.detcc,
* test/disambiguate/inherit-08.cc, test/disambiguate/inherit-07.detcc,
* test/disambiguate/inherit-07.cc, test/disambiguate/inherit-06.detcc,
* test/disambiguate/inherit-06.cc, test/disambiguate/class-03.detcc,
* test/disambiguate/template-09.detcc,
* test/disambiguate/function-06.detcc,
* test/disambiguate/function-05.detcc, test/disambiguate/enum-04.detcc,
* test/disambiguate/enum-02.detcc: Fix tests, make them pass with g++.
* test/g++/template/Makefile.am: Fix .test link creation.
")
(New-Version-Log "")
(Checkin-Time "Mon, 23 Jun 2003 18:32:36 +0200")
(Checkin-Time "Mon, 23 Jun 2003 20:33:01 +0200")
(Checkin-Login vasseu_c)
(Populate-Ignore
(
......@@ -85,7 +93,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.116 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.117 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.12 644))
(README (meta-c++-grammar/g/37_README 1.4 600))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.5 644))
......@@ -331,21 +339,21 @@
(test/g++/template/vtable1.C (meta-c++-grammar/e/28_vtable1.C 1.1 600))
(test/disambiguate/class-01.cc (meta-c++-grammar/f/16_class-01.c 1.1 640))
(test/disambiguate/class-02.cc (meta-c++-grammar/f/17_class-02.c 1.2 640))
(test/disambiguate/class-03.cc (meta-c++-grammar/f/18_class-03.c 1.2 640))
(test/disambiguate/class-03.cc (meta-c++-grammar/f/18_class-03.c 1.3 640))
(test/disambiguate/class-04.cc (meta-c++-grammar/f/19_class-04.c 1.2 644))
(test/disambiguate/enum-01.cc (meta-c++-grammar/f/28_enum-01.cc 1.1 640))
(test/disambiguate/enum-02.cc (meta-c++-grammar/f/29_enum-02.cc 1.1 600))
(test/disambiguate/enum-02.cc (meta-c++-grammar/f/29_enum-02.cc 1.2 600))
(test/disambiguate/enum-03.cc (meta-c++-grammar/f/30_enum-03.cc 1.1 600))
(test/disambiguate/enum-04.cc (meta-c++-grammar/f/31_enum-04.cc 1.1 600))
(test/disambiguate/enum-04.cc (meta-c++-grammar/f/31_enum-04.cc 1.2 600))
(test/disambiguate/factorial-01.cc (meta-c++-grammar/f/50_factorial- 1.2 644))
(test/disambiguate/function-01.cc (meta-c++-grammar/f/23_function-0 1.1 600))
(test/disambiguate/function-02.cc (meta-c++-grammar/f/24_function-0 1.1 600))
(test/disambiguate/function-03.cc (meta-c++-grammar/f/25_function-0 1.1 600))
(test/disambiguate/function-04.cc (meta-c++-grammar/f/26_function-0 1.1 600))
(test/disambiguate/function-05.cc (meta-c++-grammar/f/32_function-0 1.1 600))
(test/disambiguate/function-05.cc (meta-c++-grammar/f/32_function-0 1.2 600))
(test/disambiguate/function-06.cc (meta-c++-grammar/f/33_function-0 1.1 600))
(test/disambiguate/power-01.cc (meta-c++-grammar/f/51_power-01.c 1.2 644))
(test/disambiguate/power-02.cc (meta-c++-grammar/g/0_power-02.c 1.2 644))
(test/disambiguate/power-02.cc (meta-c++-grammar/g/0_power-02.c 1.3 644))
(test/disambiguate/template-01.cc (meta-c++-grammar/g/1_template-0 1.2 644))
(test/disambiguate/template-02.cc (meta-c++-grammar/g/2_template-0 1.2 644))
(test/disambiguate/template-03.cc (meta-c++-grammar/g/3_template-0 1.2 644))
......@@ -410,7 +418,7 @@
(lib/prelude/Identifier.str (meta-c++-grammar/h/35_Identifier 1.1 640))
(lib/prelude/Conditionals.str (meta-c++-grammar/h/36_Conditiona 1.1 640))
(lib/prelude/Booleans.str (meta-c++-grammar/h/37_Booleans.s 1.1 640))
(test/disambiguate/template-09.cc (meta-c++-grammar/h/38_template-0 1.1 644))
(test/disambiguate/template-09.cc (meta-c++-grammar/h/38_template-0 1.2 644))
(test/disambiguate/template-10.cc (meta-c++-grammar/h/39_template-1 1.1 644))
(test/disambiguate/union-01.detcc (meta-c++-grammar/h/40_union-01.d 1.1 644))
(test/disambiguate/union-01.cc (meta-c++-grammar/h/41_union-01.c 1.1 640))
......@@ -434,7 +442,7 @@
(test/disambiguate/template-01.detcc (meta-c++-grammar/i/7_template-0 1.1 644))
(test/disambiguate/struct-01.detcc (meta-c++-grammar/i/8_struct-01. 1.1 644))
(test/disambiguate/struct-01.cc (meta-c++-grammar/i/9_struct-01. 1.1 640))
(test/disambiguate/power-02.detcc (meta-c++-grammar/i/10_power-02.d 1.1 644))
(test/disambiguate/power-02.detcc (meta-c++-grammar/i/10_power-02.d 1.2 644))
(test/disambiguate/power-01.detcc (meta-c++-grammar/i/11_power-01.d 1.1 644))
(test/disambiguate/parameter-08.detcc (meta-c++-grammar/i/12_parameter- 1.1 644))
(test/disambiguate/parameter-08.cc (meta-c++-grammar/i/13_parameter- 1.1 644))
......@@ -466,14 +474,14 @@
(test/disambiguate/main-02.cc (meta-c++-grammar/i/39_main-02.cc 1.1 644))
(test/disambiguate/main-01.detcc (meta-c++-grammar/i/40_main-01.de 1.1 644))
(test/disambiguate/main-01.cc (meta-c++-grammar/i/41_main-01.cc 1.1 644))
(test/disambiguate/inherit-09.detcc (meta-c++-grammar/i/42_inherit-09 1.1 644))
(test/disambiguate/inherit-09.cc (meta-c++-grammar/i/43_inherit-09 1.1 644))
(test/disambiguate/inherit-08.detcc (meta-c++-grammar/i/44_inherit-08 1.1 644))
(test/disambiguate/inherit-08.cc (meta-c++-grammar/i/45_inherit-08 1.1 644))
(test/disambiguate/inherit-07.detcc (meta-c++-grammar/i/46_inherit-07 1.1 644))
(test/disambiguate/inherit-07.cc (meta-c++-grammar/i/47_inherit-07 1.1 644))
(test/disambiguate/inherit-06.detcc (meta-c++-grammar/i/48_inherit-06 1.1 644))
(test/disambiguate/inherit-06.cc (meta-c++-grammar/i/49_inherit-06 1.1 644))
(test/disambiguate/inherit-09.detcc (meta-c++-grammar/i/42_inherit-09 1.2 644))
(test/disambiguate/inherit-09.cc (meta-c++-grammar/i/43_inherit-09 1.2 644))
(test/disambiguate/inherit-08.detcc (meta-c++-grammar/i/44_inherit-08 1.2 644))
(test/disambiguate/inherit-08.cc (meta-c++-grammar/i/45_inherit-08 1.2 644))
(test/disambiguate/inherit-07.detcc (meta-c++-grammar/i/46_inherit-07 1.2 644))
(test/disambiguate/inherit-07.cc (meta-c++-grammar/i/47_inherit-07 1.2 644))
(test/disambiguate/inherit-06.detcc (meta-c++-grammar/i/48_inherit-06 1.2 644))
(test/disambiguate/inherit-06.cc (meta-c++-grammar/i/49_inherit-06 1.2 644))
(test/disambiguate/inherit-05.detcc (meta-c++-grammar/i/50_inherit-05 1.1 644))
(test/disambiguate/inherit-05.cc (meta-c++-grammar/i/51_inherit-05 1.1 644))
(test/disambiguate/inherit-04.detcc (meta-c++-grammar/j/0_inherit-04 1.1 644))
......@@ -491,15 +499,15 @@
(test/disambiguate/class-05.cc (meta-c++-grammar/j/12_class-05.c 1.1 644))
(test/disambiguate/class-05.detcc (meta-c++-grammar/j/13_class-05.d 1.1 644))
(test/disambiguate/class-04.detcc (meta-c++-grammar/j/14_class-04.d 1.1 644))
(test/disambiguate/class-03.detcc (meta-c++-grammar/j/15_class-03.d 1.1 644))
(test/disambiguate/class-03.detcc (meta-c++-grammar/j/15_class-03.d 1.2 644))
(test/disambiguate/class-02.detcc (meta-c++-grammar/j/16_class-02.d 1.1 644))
(test/disambiguate/class-01.detcc (meta-c++-grammar/j/17_class-01.d 1.1 644))
(test/disambiguate/test.test (meta-c++-grammar/j/18_test.test 1.1 750))
(test/disambiguate/test.test (meta-c++-grammar/j/18_test.test 1.2 750))
(test/disambiguate/Makefile.am (meta-c++-grammar/j/19_Makefile.a 1.3 640))
(test/expressions/Makefile.am (meta-c++-grammar/j/20_Makefile.a 1.3 640))
(test/expressions/test.test (meta-c++-grammar/j/21_test.test 1.1 750))
(test/g++/Makefile.am (meta-c++-grammar/j/22_Makefile.a 1.1 644))
(test/g++/template/Makefile.am (meta-c++-grammar/j/23_Makefile.a 1.3 644))
(test/g++/template/Makefile.am (meta-c++-grammar/j/23_Makefile.a 1.4 644))
(test/g++/template/test.test (meta-c++-grammar/j/24_test.test 1.1 750))
(test/g++/parse/Makefile.am (meta-c++-grammar/j/25_Makefile.a 1.3 644))
(test/g++/parse/test.test (meta-c++-grammar/j/26_test.test 1.1 750))
......@@ -623,19 +631,19 @@
(test/disambiguate/typedef-02.detcc (meta-c++-grammar/l/40_typedef-02 1.1 600))
(test/disambiguate/typedef-01.detcc (meta-c++-grammar/l/41_typedef-01 1.1 600))
(test/disambiguate/template-10.detcc (meta-c++-grammar/l/42_template-1 1.1 644))
(test/disambiguate/template-09.detcc (meta-c++-grammar/l/43_template-0 1.1 644))
(test/disambiguate/template-09.detcc (meta-c++-grammar/l/43_template-0 1.2 644))
(test/disambiguate/template-06.detcc (meta-c++-grammar/l/44_template-0 1.1 644))
(test/disambiguate/template-05.detcc (meta-c++-grammar/l/45_template-0 1.1 644))
(test/disambiguate/template-04.detcc (meta-c++-grammar/l/46_template-0 1.1 644))
(test/disambiguate/function-06.detcc (meta-c++-grammar/l/47_function-0 1.1 600))
(test/disambiguate/function-05.detcc (meta-c++-grammar/l/48_function-0 1.1 600))
(test/disambiguate/function-06.detcc (meta-c++-grammar/l/47_function-0 1.2 600))
(test/disambiguate/function-05.detcc (meta-c++-grammar/l/48_function-0 1.2 600))
(test/disambiguate/function-04.detcc (meta-c++-grammar/l/49_function-0 1.1 600))
(test/disambiguate/function-03.detcc (meta-c++-grammar/l/50_function-0 1.1 600))
(test/disambiguate/function-02.detcc (meta-c++-grammar/l/51_function-0 1.1 600))
(test/disambiguate/function-01.detcc (meta-c++-grammar/m/0_function-0 1.1 600))
(test/disambiguate/enum-04.detcc (meta-c++-grammar/m/1_enum-04.de 1.1 600))
(test/disambiguate/enum-04.detcc (meta-c++-grammar/m/1_enum-04.de 1.2 600))
(test/disambiguate/enum-03.detcc (meta-c++-grammar/m/2_enum-03.de 1.1 600))
(test/disambiguate/enum-02.detcc (meta-c++-grammar/m/3_enum-02.de 1.1 600))
(test/disambiguate/enum-02.detcc (meta-c++-grammar/m/3_enum-02.de 1.2 600))
)
(Merge-Parents)
(New-Merge-Parents)
class A
{
public:
typedef int /*[uid]*/a_t/*[!uid]*/;
};
......
......@@ -2,4 +2,4 @@ enum B
{
};
B b = 0;
B b = (enum B)0;
......@@ -2,4 +2,4 @@ enum B
{
};
/*[en]*/B/*[!en]*/ /*[uid]*/b/*[!uid]*/ = 0;
/*[en]*/B/*[!en]*/ /*[uid]*/b/*[!uid]*/ = (enum B)0;
......@@ -2,5 +2,5 @@ typedef enum B
{
} b_t;
B b1 = 0;
b_t b2 = 0;
B b1 = (enum B)0;
b_t b2 = (b_t)0;
......@@ -2,5 +2,5 @@ typedef enum B
{
} /*[uid]*/b_t/*[!uid]*/;
/*[en]*/B/*[!en]*/ /*[uid]*/b1/*[!uid]*/ = 0;
/*[tn]*/b_t/*[!tn]*/ /*[uid]*/b2/*[!uid]*/ = 0;
/*[en]*/B/*[!en]*/ /*[uid]*/b1/*[!uid]*/ = (enum B)0;
/*[tn]*/b_t/*[!tn]*/ /*[uid]*/b2/*[!uid]*/ = (b_t)0;
enum A;
enum A
{
};
A& b (A* a)
{
return *a;
}
enum A
{
};
enum A;
enum A
{
};
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
/*[en]*/A/*[!en]*/& /*[uid]*/b/*[!uid]*/
(/*[en]*/A/*[!en]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
enum A
{
};
......@@ -2,8 +2,8 @@ enum A
{
};
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
/*[en]*/A/*[!en]*/& /*[uid]*/b/*[!uid]*/
(/*[en]*/A/*[!en]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
class A
{
public:
typedef int /*[uid]*/a_t/*[!uid]*/;
};
......
class A
{
public:
typedef int a_t;
};
class B : A
class B : public A
{
};
class C : B
class C : public B
{
a_t x;
};
class A
{
public:
typedef int /*[uid]*/a_t/*[!uid]*/;
};
class B : /*[cl]*/A/*[!cl]*/
class B : public /*[cl]*/A/*[!cl]*/
{
};
class C : /*[cl]*/B/*[!cl]*/
class C : public /*[cl]*/B/*[!cl]*/
{
/*[tn]*/a_t/*[!tn]*/ /*[uid]*/x/*[!uid]*/;
};
class A
{
public:
typedef int a_t;
};
class B
{
public:
typedef int b_t;
};
......
class A
{
public:
typedef int /*[uid]*/a_t/*[!uid]*/;
};
class B
{
public:
typedef int /*[uid]*/b_t/*[!uid]*/;
};
......
class A
{
public:
typedef int a_t;
};
class B
{
public:
class BC
{
};
......
class A
{
public:
typedef int /*[uid]*/a_t/*[!uid]*/;
};
class B
{
public:
class BC
{
};
......
......@@ -3,7 +3,7 @@ power (int x,
unsigned n)
{
int r = 1;
while (n < 0)
while (n-- > 0)
r = r * x;
return r;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment