Merge branch 'master' of github.com:doxygen/doxygen

3 files changed, 18 insertions, 54 deletions

diff --git a/src/commentcnv.l b/src/commentcnv.l
index e05634a..a7d74ef 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -870,6 +870,9 @@ MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
   				     copyToOutput(yyscanner,yytext,(int)yyleng);
   				   }
 
+<*>.                               {
+  				     copyToOutput(yyscanner,yytext,(int)yyleng);
+                                   }
 %%
 
 static void replaceCommentMarker(yyscan_t yyscanner,const char *s,int len)
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
index 343f126..53983f5 100644
--- a/vhdlparser/CMakeLists.txt
+++ b/vhdlparser/CMakeLists.txt
@@ -1,3 +1,18 @@
+#
+# Generate parser (default target)
+#
+# when generating the parser with debug options it will look like:
+#   make JAVACC_FLAGS=-debug_parser
+#  or
+#   make JAVACC_FLAGS="-debug_parser -debug_lookahead"
+#
+# Available debug options:
+#  -debug_parser
+#  -debug_token_manager
+#  -debug_lookahead
+#
+# For other javacc settings / options consult the documentation of javacc.
+
 find_package(Javacc)
 if (JAVACC_FOUND)
     if (JAVACC_VERSION VERSION_LESS 7.0.5)
diff --git a/vhdlparser/Makefile b/vhdlparser/Makefile
deleted file mode 100644
index 84bdccf..0000000
--- a/vhdlparser/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 1997-2015 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby
-# granted. No representations are made about the suitability of this software
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# Documents produced by doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-#
-
-#
-# Files generated by javacc 
-#
-GEN_FILES=CharStream.cc CharStream.h ErrorHandler.h ParseException.cc ParseException.h \
-	      Token.cc Token.h TokenManager.h TokenMgrError.cc TokenMgrError.h VhdlParser.cc VhdlParser.h \
-	      VhdlParserConstants.h VhdlParserTokenManager.cc VhdlParserTokenManager.h \
-              JavaCC.h
-#
-# Generate parser (default target)
-#
-# when generating the parser with debug options it will look like:
-#   make JAVACC_FLAGS=-debug_parser 
-#  or
-#   make JAVACC_FLAGS="-debug_parser -debug_lookahead"
-#
-# Available debug options:
-#  -debug_parser
-#  -debug_token_manager
-#  -debug_lookahead
-#
-# For other javacc settings / options consult the documentation of javacc.
-
-regenerate:
-	@rm -f $(GEN_FILES)
-	@javacc $(JAVACC_FLAGS) vhdlparser.jj
-	@cp JavaCC.h.in JavaCC.h
-
-#
-# reset the generated files back to their versions from git.
-#
-
-reset_gen_files:
-	@rm -f $(GEN_FILES)
-	@git checkout $(GEN_FILES)
-
-help:
-	@echo "Targets:"
-	@echo "  regenerate (default)"
-	@echo "  reset_gen_files"
-
-FORCE: