from Olivier Gournet <gourne_o@lrde.epita.fr>

	* test/disambiguate/template-13.cc,
	* test/disambiguate/template-13.detcc,
	* test/disambiguate/Makefile.am: Add test.

cxx-grammar/ChangeLog

+2004-04-07  Olivier Gournet  <gourne_o@lrde.epita.fr>
+
+	* test/disambiguate/template-13.cc,
+	* test/disambiguate/template-13.detcc,
+	* test/disambiguate/Makefile.am: Add test.
+
 2004-04-06  Clement Vasseur  <clement.vasseur@lrde.epita.fr>
 
 	* README: Update StrategoXT version. Add STLport. Add information

cxx-grammar/test/disambiguate/Makefile.am

@@ -85,5 +85,6 @@ TESTS = \
 
 XFAIL_TESTS = \
 		namespace-10
+		template-13
 
 EXTRA_DIST = test $(TESTS:=.cc) $(TESTS:=.detcc)

cxx-grammar/test/disambiguate/template-13.cc

+struct s {};
+
+template <class c> struct a {};
+template <class c> struct a<c*> {};
+
+template <class c> struct b {};
+template <class c> struct b<c*> {
+  s r() {}
+};

cxx-grammar/test/disambiguate/template-13.detcc

+/*<dss>*//*<ds>*/struct s {}/*</ds>*//*</dss>*/;
+
+template </*<tp>*/class c/*</tp>*/> /*<dss>*//*<ds>*/struct a {}/*</ds>*//*</dss>*/;
+template </*<tp>*/class c/*</tp>*/> /*<dss>*//*<ds>*/struct a < /*<tn>*/c/*</tn>*/* > {}/*</ds>*//*</dss>*/;
+
+template </*<tp>*/class c/*</tp>*/> /*<dss>*//*<ds>*/struct b {}/*</ds>*//*</dss>*/;
+template </*<tp>*/class c/*</tp>*/> /*<dss>*//*<ds>*/struct b < /*<tn>*/c/*</tn>*/* > {
+  /*<funcdef>*//*<dss>*//*<ds>*//*<tn>*/s/*</tn>*//*</ds>*//*</dss>*/ /*<uid>*/r/*</uid>*/() {}
+/*</funcdef>*/}/*</ds>*//*</dss>*/;