diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-12-12 09:40:51 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-12-12 09:40:51 (GMT) |
commit | a7762f012d2eedeeea527f4c99d3046b87135792 (patch) | |
tree | 897bb8e6785775fae594596679c9fc251e2fdc95 /src | |
parent | 17b3b41e12e890187f6b7dcc98ed9e2451b14018 (diff) | |
parent | b103d9056cf20cf856ed5ca114950dab642b3f6f (diff) | |
download | Doxygen-a7762f012d2eedeeea527f4c99d3046b87135792.zip Doxygen-a7762f012d2eedeeea527f4c99d3046b87135792.tar.gz Doxygen-a7762f012d2eedeeea527f4c99d3046b87135792.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 40 | ||||
-rw-r--r-- | src/code.l | 2 | ||||
-rw-r--r-- | src/config.xml | 2 | ||||
-rwxr-xr-x | src/increasebuffer.py | 7 | ||||
-rw-r--r-- | src/reflist.cpp | 9 | ||||
-rwxr-xr-x | src/settings.py | 29 | ||||
-rwxr-xr-x | src/version.py | 61 |
7 files changed, 28 insertions, 122 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb030d4..6763cf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,26 +85,26 @@ add_custom_command( set_source_files_properties(${GENERATED_SRC}/layout_default.xml.h PROPERTIES GENERATED 1) # Targets for flex/bison generated files -FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "-PscannerYY") -FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "-PcodeYY") -FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "-PpyscannerYY") -FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "-PpycodeYY") -FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "-PfortranscannerYY -i") -FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "-PfortrancodeYY -i") -FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "-PvhdlcodeYY -i") -FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "-PtclscannerYY -i") -FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "-PpreYY") -FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "-PdeclinfoYY") -FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "-PdefargsYY") -FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "-PdoctokenizerYY") -FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "-PcommentcnvYY") -FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "-PcommentscanYY") -FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "-PconstexpYY") -FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "-PxmlcodeYY") -FLEX_TARGET(config config.l ${GENERATED_SRC}/config.cpp COMPILE_FLAGS "-PconfigYY") - -BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "-l -p vhdlscannerYY") -BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "-l -p constexpYY") +FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PscannerYY") +FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcodeYY") +FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpyscannerYY") +FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpycodeYY") +FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PfortranscannerYY -i") +FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PfortrancodeYY -i") +FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PvhdlcodeYY -i") +FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PtclscannerYY -i") +FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpreYY") +FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdeclinfoYY") +FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdefargsYY") +FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdoctokenizerYY") +FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcommentcnvYY") +FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcommentscanYY") +FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PconstexpYY") +FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PxmlcodeYY") +FLEX_TARGET(config config.l ${GENERATED_SRC}/config.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PconfigYY") + +BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "$(YACC_FLAGS) -l -p vhdlscannerYY") +BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "$(YACC_FLAGS) -l -p constexpYY") add_library(doxycfg STATIC ${GENERATED_SRC}/lang_cfg.h @@ -1781,7 +1781,7 @@ TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">" SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID}) SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+ KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property") -KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) +KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) FLOWKW ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally") TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr") CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast") diff --git a/src/config.xml b/src/config.xml index 5304054..9d54e29 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1603,7 +1603,7 @@ to disable this feature. necessary type information. @note The availability of this option depends on whether or not doxygen - was compiled with the `--with-libclang` option. + was generated with the `-Duse-libclang=ON` option for CMake. ]]> </docs> </option> diff --git a/src/increasebuffer.py b/src/increasebuffer.py deleted file mode 100755 index e2b2d0c..0000000 --- a/src/increasebuffer.py +++ /dev/null @@ -1,7 +0,0 @@ -# Since the internal token buffer of a generated flex file is hardcoded -# to 16K, this script is used to increase the buffer size of a flex -# generated scanner to 256K. -import sys -sys.stdout.write(sys.stdin.read(). - replace('YY_BUF_SIZE 16384','YY_BUF_SIZE 262144'). - replace('YY_READ_BUF_SIZE 8192','YY_READ_BUF_SIZE 262144')) diff --git a/src/reflist.cpp b/src/reflist.cpp index 8380db7..5a80b19 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -153,9 +153,12 @@ void RefList::generatePage() doc += "\n"; if (item->scope) { - doc += "\\_setscope "; - doc += item->scope->name(); - doc += " "; + if (item->scope->name() != "<globalScope>") + { + doc += "\\_setscope "; + doc += item->scope->name(); + doc += " "; + } } doc += item->prefix; doc += " \\_internalref "; diff --git a/src/settings.py b/src/settings.py deleted file mode 100755 index a9dfa13..0000000 --- a/src/settings.py +++ /dev/null @@ -1,29 +0,0 @@ -# - -import sys -import os - -f_sqlite3 = sys.argv[1] -f_libclang = sys.argv[2] - -f1 = open(os.path.join(sys.argv[3],'settings.h'),'w') -f1.write("#ifndef SETTINGS_H\n") -f1.write("#define SETTINGS_H\n") -f1.write("\n") -if (f_sqlite3 != "NO"): - f1.write("#define USE_SQLITE3 1\n") -else: - f1.write("#define USE_SQLITE3 0\n") - -if (f_libclang != "NO"): - f1.write("#define USE_LIBCLANG 1\n") -else: - f1.write("#define USE_LIBCLANG 0\n") - -f1.write("\n") -f1.write("#define IS_SUPPORTED(x) \\\n") -f1.write(" ((USE_SQLITE3 && strcmp(\"USE_SQLITE3\",(x))==0) || \\\n") -f1.write(" (USE_LIBCLANG && strcmp(\"USE_LIBCLANG\",(x))==0) || \\\n") -f1.write(" 0)\n") -f1.write("\n") -f1.write("#endif\n") diff --git a/src/version.py b/src/version.py deleted file mode 100755 index a99ede3..0000000 --- a/src/version.py +++ /dev/null @@ -1,61 +0,0 @@ -# - -# script to read the version information from `../configure` -# relevant lines are starting with: -# `doxygen_version_major` -# `doxygen_version_minor` -# `doxygen_version_revision` -# `doxygen_version_mmn` -# the collected information is written to: `../VERSION` and `../src/version.cpp` -# -import sys -import os -# -# set 'default' values -# -major = 0 -minor = 0 -revision = 0 -mnt = 'NO' -configure = '../configure' -if len(sys.argv) > 2: - configure = sys.argv[2] -# -# open input file -# read file and get relevant information -# close -# -f = open(configure, 'r') -for line in f: - # check if line can match (saves 3 comparisons) - if (line.startswith('doxygen_version')): - if (line.startswith('doxygen_version_major')): - major = line.replace('doxygen_version_major=','') - elif (line.startswith('doxygen_version_minor')): - minor = line.replace('doxygen_version_minor=','') - elif (line.startswith('doxygen_version_revision')): - revision = line.replace('doxygen_version_revision=','') - elif (line.startswith('doxygen_version_mmn')): - mnt = line.replace('doxygen_version_mmn=','') -f.close() - -# strip superfluous '\n` -major = major.replace('\n','') -minor = minor.replace('\n','') -revision = revision.replace('\n','') -mnt = mnt.replace('\n','') -# -# open output files -# write relevant infomation -# close files -# -f1 = open('../VERSION','w') -f2 = open(os.path.join(sys.argv[1],'version.cpp'),'w') -if (mnt == 'NO'): - f1.write(major + '.' + minor + '.' + revision) - f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '";') -else: - f1.write(major + '.' + minor + '.' + revision + '-' + mnt) - f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '-' + mnt + '";') -f1.close() -f2.close() |