Makefile.in (g++FAQ.*): New rules.

	* Makefile.in (g++FAQ.*): New rules.
	(CONFLICTS): Update.
	* g++FAQ.texi: Moved from libg++.

	* parse.y (PFUNCNAME): Only specify the type once.

From-SVN: r15827

gcc/cp/ChangeLog

+Wed Oct  1 08:41:38 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (g++FAQ.*): New rules.
+	(CONFLICTS): Update.
+	* g++FAQ.texi: Moved from libg++.
+
+	* parse.y (PFUNCNAME): Only specify the type once.
+
 1997-10-01  Brendan Kehoe  <brendan@lasher.cygnus.com>
 
 	* lex.c (real_yylex): Clean up the code to fully behave the way

gcc/cp/Makefile.in

@@ -202,7 +202,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
   `echo $(PARSE_C) | sed 's,^\./,,'`
 
-CONFLICTS = expect 18 shift/reduce conflicts and 39 reduce/reduce conflicts.
+CONFLICTS = expect 19 shift/reduce conflicts and 39 reduce/reduce conflicts.
 $(PARSE_H) : $(PARSE_C)
 $(PARSE_C) : $(srcdir)/parse.y
 	@echo $(CONFLICTS)
@@ -273,3 +273,32 @@ TAGS: force
 .PHONY: TAGS
 
 force:
+
+g++FAQ.info:	$(srcdir)/g++FAQ.texi
+	$(MAKEINFO) --no-split $(srcdir)/g++FAQ.texi -o ./g++FAQ.info
+
+# Preprocess the texi file so that the final document will have
+# hyperlinks.
+# It would be nice if texi2html could do something like this itself.
+
+# Assumption 1: the FAQ puts all http: and ftp: links in a @file{...}.
+# Assumption 2: newsgroups are like @file{comp.foo}
+# Assumption 3: email addresses match the regexp shown.
+
+g++FAQ.html:	$(srcdir)/g++FAQ.texi
+	mkdir work
+	sed -e 's?@file{\([fth]*p://[^}]*\)}?@strong{<A HREF="\1">\1</A>}?' \
+	    -e 's?@file{\(comp\.[-a-z+.]*\)}?<A HREF="news:\1">\1</A>?' \
+	    -e 's?@file{\(gnu\.[-a-z+.]*\)}?<A HREF="news:\1">\1</A>?' \
+	    -e 's?\([.+a-zA-Z0-9-]*@@[.a-zA-Z0-9-]*[a-zA-Z0-9]\)?<A HREF="mailto:\1">\1</A>?' \
+	    $(srcdir)/g++FAQ.texi > work/g++FAQ.texi
+	cd work; texi2html -monolithic g++FAQ.texi
+	mv work/*.html .
+	rm -r work
+
+# Make plain-text form.
+
+g++FAQ.txt:	$(srcdir)/g++FAQ.texi
+	$(MAKEINFO) --no-split --no-headers -o - $(srcdir)/g++FAQ.texi |\
+		sed '/^Concept Index/,$$d' > g++FAQ.txt
+

gcc/cp/parse.y

@@ -111,7 +111,7 @@ empty_parms ()
 %token SELFNAME
 
 /* A template function.  */
-%token <ttype> PFUNCNAME
+%token PFUNCNAME
 
 /* Reserved words that specify storage class.
    yylval contains an IDENTIFIER_NODE which indicates which one.  */