Commit 065c05c4 authored by david_v's avatar david_v
Browse files

2003-06-23 Valentin David <valentin@lrde.epita.fr>

	* 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 in CLEANFILES

	* test/disambiguate/variable-01.detcc,
	* test/disambiguate/typedef-02.detcc,
	* test/disambiguate/typedef-01.detcc,
	* test/disambiguate/template-10.detcc,
	* test/disambiguate/template-09.detcc,
	* test/disambiguate/template-06.detcc,
	* test/disambiguate/template-05.detcc,
	* test/disambiguate/template-04.detcc,
	* test/disambiguate/function-06.detcc,
	* test/disambiguate/function-05.detcc,
	* test/disambiguate/function-04.detcc,
	* test/disambiguate/function-03.detcc,
	* test/disambiguate/function-02.detcc,
	* test/disambiguate/function-01.detcc,
	* test/disambiguate/enum-04.detcc, test/disambiguate/enum-03.detcc,
	* test/disambiguate/enum-02.detcc: New.
parent afdaf203
2003-06-23 Valentin David <valentin@lrde.epita.fr>
* 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 in CLEANFILES
* test/disambiguate/variable-01.detcc,
* test/disambiguate/typedef-02.detcc,
* test/disambiguate/typedef-01.detcc,
* test/disambiguate/template-10.detcc,
* test/disambiguate/template-09.detcc,
* test/disambiguate/template-06.detcc,
* test/disambiguate/template-05.detcc,
* test/disambiguate/template-04.detcc,
* test/disambiguate/function-06.detcc,
* test/disambiguate/function-05.detcc,
* test/disambiguate/function-04.detcc,
* test/disambiguate/function-03.detcc,
* test/disambiguate/function-02.detcc,
* test/disambiguate/function-01.detcc,
* test/disambiguate/enum-04.detcc, test/disambiguate/enum-03.detcc,
* test/disambiguate/enum-02.detcc: New.
2003-06-20 Valentin David <valentin@lrde.epita.fr>
* lib/Makefile.am,
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 118)
(Parent-Version meta-c++-grammar 0 117)
(Version-Log "See ChangeLog ;)")
(Project-Version meta-c++-grammar 0 119)
(Parent-Version meta-c++-grammar 0 118)
(Version-Log "2003-06-23 Valentin David <valentin@lrde.epita.fr>
* 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 in CLEANFILES
* test/disambiguate/variable-01.detcc,
* test/disambiguate/typedef-02.detcc,
* test/disambiguate/typedef-01.detcc,
* test/disambiguate/template-10.detcc,
* test/disambiguate/template-09.detcc,
* test/disambiguate/template-06.detcc,
* test/disambiguate/template-05.detcc,
* test/disambiguate/template-04.detcc,
* test/disambiguate/function-06.detcc,
* test/disambiguate/function-05.detcc,
* test/disambiguate/function-04.detcc,
* test/disambiguate/function-03.detcc,
* test/disambiguate/function-02.detcc,
* test/disambiguate/function-01.detcc,
* test/disambiguate/enum-04.detcc, test/disambiguate/enum-03.detcc,
* test/disambiguate/enum-02.detcc: New.
")
(New-Version-Log "")
(Checkin-Time "Fri, 20 Jun 2003 22:05:20 +0200")
(Checkin-Time "Mon, 23 Jun 2003 10:43:53 +0200")
(Checkin-Login david_v)
(Populate-Ignore
(
......@@ -75,7 +101,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.114 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.115 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))
......@@ -538,31 +564,31 @@
(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/Makefile.am (meta-c++-grammar/j/19_Makefile.a 1.1 640))
(test/expressions/Makefile.am (meta-c++-grammar/j/20_Makefile.a 1.1 640))
(test/disambiguate/Makefile.am (meta-c++-grammar/j/19_Makefile.a 1.2 640))
(test/expressions/Makefile.am (meta-c++-grammar/j/20_Makefile.a 1.2 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.1 644))
(test/g++/template/Makefile.am (meta-c++-grammar/j/23_Makefile.a 1.2 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.1 644))
(test/g++/parse/Makefile.am (meta-c++-grammar/j/25_Makefile.a 1.2 644))
(test/g++/parse/test.test (meta-c++-grammar/j/26_test.test 1.1 750))
(test/g++/overload/Makefile.am (meta-c++-grammar/j/27_Makefile.a 1.1 644))
(test/g++/overload/Makefile.am (meta-c++-grammar/j/27_Makefile.a 1.2 644))
(test/g++/overload/test.test (meta-c++-grammar/j/28_test.test 1.1 750))
(test/g++/other/Makefile.am (meta-c++-grammar/j/29_Makefile.a 1.1 644))
(test/g++/other/Makefile.am (meta-c++-grammar/j/29_Makefile.a 1.2 644))
(test/g++/other/test.test (meta-c++-grammar/j/30_test.test 1.1 750))
(test/g++/opt/Makefile.am (meta-c++-grammar/j/31_Makefile.a 1.1 644))
(test/g++/opt/Makefile.am (meta-c++-grammar/j/31_Makefile.a 1.2 644))
(test/g++/opt/test.test (meta-c++-grammar/j/32_test.test 1.1 750))
(test/g++/lookup/Makefile.am (meta-c++-grammar/j/33_Makefile.a 1.1 644))
(test/g++/lookup/Makefile.am (meta-c++-grammar/j/33_Makefile.a 1.2 644))
(test/g++/lookup/test.test (meta-c++-grammar/j/34_test.test 1.1 750))
(test/g++/init/Makefile.am (meta-c++-grammar/j/35_Makefile.a 1.1 644))
(test/g++/init/Makefile.am (meta-c++-grammar/j/35_Makefile.a 1.2 644))
(test/g++/init/test.test (meta-c++-grammar/j/36_test.test 1.1 750))
(test/g++/inherit/Makefile.am (meta-c++-grammar/j/37_Makefile.a 1.1 644))
(test/g++/inherit/Makefile.am (meta-c++-grammar/j/37_Makefile.a 1.2 644))
(test/g++/inherit/test.test (meta-c++-grammar/j/38_test.test 1.1 750))
(test/g++/eh/Makefile.am (meta-c++-grammar/j/39_Makefile.a 1.1 644))
(test/g++/eh/Makefile.am (meta-c++-grammar/j/39_Makefile.a 1.2 644))
(test/g++/eh/test.test (meta-c++-grammar/j/40_test.test 1.1 750))
(test/g++/debug/Makefile.am (meta-c++-grammar/j/41_Makefile.a 1.1 644))
(test/g++/debug/Makefile.am (meta-c++-grammar/j/41_Makefile.a 1.2 644))
(test/g++/debug/test.test (meta-c++-grammar/j/42_test.test 1.1 750))
(test/g++/abi/Makefile.am (meta-c++-grammar/j/43_Makefile.a 1.1 644))
(test/g++/abi/Makefile.am (meta-c++-grammar/j/43_Makefile.a 1.2 644))
(test/g++/abi/test.test (meta-c++-grammar/j/44_test.test 1.1 750))
(src/disamb/Makefile.am (meta-c++-grammar/j/45_Makefile.a 1.1 644))
(src/disamb/disambiguate/TemplateArguments.str (meta-c++-grammar/j/46_TemplateAr 1.1 640))
......@@ -701,6 +727,27 @@
;; from version 0.117(w), by david_v:
; (test/disambiguate/class-03.astcc ())
;; Files added by populate at Mon, 23 Jun 2003 09:24:04 +0200,
;; to version 0.118(w), by david_v:
(test/disambiguate/variable-01.detcc (meta-c++-grammar/l/39_variable-0 1.1 600))
(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-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-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-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))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -18,7 +18,16 @@ TESTS = \
class-05.test \
class-06.test \
enum-01.test \
enum-02.test \
enum-03.test \
enum-04.test \
factorial-01.test \
function-01.test \
function-02.test \
function-03.test \
function-04.test \
function-05.test \
function-06.test \
inherit-01.test \
inherit-02.test \
inherit-03.test \
......@@ -61,11 +70,14 @@ TESTS = \
test-03.test \
test-04.test \
type-01.test \
union-01.test
typedef-01.test \
typedef-02.test \
union-01.test \
variable-01.test
EXTRA_DIST = test.test $(TESTS:.test=.cc)
CLEANFILES = defs
CLEANFILES = defs \
$(TESTS) \
$(TESTS:.test=.visamb) \
$(TESTS:.test=.disambcc) \
......
enum B
{
};
/*[en]*/B/*[!en]*/ /*[uid]*/b/*[!uid]*/ = 0;
typedef enum B
{
} /*[uid]*/b_t/*[!uid]*/;
typedef enum B
{
} /*[uid]*/b_t/*[!uid]*/;
/*[en]*/B/*[!en]*/ /*[uid]*/b1/*[!uid]*/ = 0;
/*[tn]*/b_t/*[!tn]*/ /*[uid]*/b2/*[!uid]*/ = 0;
int /*[uid]*/foo/*[!uid]*/ ()
{
return 0;
}
int /*[uid]*/foo/*[!uid]*/ (int /*[uid]*/bar/*[!uid]*/)
{
return bar;
}
class A;
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
class A
{
};
class A
{
};
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
enum A;
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
enum A
{
};
enum A
{
};
/*[cl]*/A/*[!cl]*/& /*[uid]*/b/*[!uid]*/
(/*[cl]*/A/*[!cl]*/* /*[uid]*/a/*[!uid]*/)
{
return *a;
}
template < typename T >
struct Traits
{
typedef int /*[uid]*/a_t/*[!uid]*/;
};
typedef Traits< int >::/*[tn]*/a_t/*[!tn]*/ /*[uid]*/b_t/*[!uid]*/;
template < typename T >
struct Traits
{
};
template < typename T >
struct Foo
{
typedef typename Traits< /*[tn]*/T/*[!tn]*/ >::a_t /*[uid]*/a_t/*[!uid]*/;
};
template < int /*[uid]*/n/*[!uid]*/ >
int
/*[uid]*/foo/*[!uid]*/ ()
{
return n;
}
int
/*[uid]*/main/*[!uid]*/ (int /*[uid]*/argc/*[!uid]*/,
char** /*[uid]*/argv/*[!uid]*/)
{
return foo< 42 > ();
}
template < class T, int /*[uid]*/i/*[!uid]*/, typename C >
struct Traits
{
typedef int /*[uid]*/a_t/*[!uid]*/;
int /*[uid]*/i/*[!uid]*/;
};
typedef Traits< int, 5, float >::/*[tn]*/a_t/*[!tn]*/ /*[uid]*/b_t/*[!uid]*/;
template < class T >
class a
{
};
template < class K, class V, template < class T > class C = a >
class b
{
C</*[cl]*/K/*[!cl]*/> /*[uid]*/c/*[!uid]*/;
C</*[cl]*/V/*[!cl]*/> /*[uid]*/d/*[!uid]*/;
};
typedef int /*[uid]*/foo/*[!uid]*/;
/*[tn]*/foo/*[!tn]*/ /*[uid]*/bar/*[!uid]*/ = 0;
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