cpython.git - https://github.com/python/cpython.git

diff options

author	Ned Deily <nad@python.org>	2017-12-05 08:27:19 (GMT)
committer	Ned Deily <nad@python.org>	2017-12-05 08:27:19 (GMT)
commit	90a6785f6328bd27d307ce20202d6b34aa0cc10b (patch)
tree	796b8a1d8a1e34aa12eaf98aabdb1efe0df4e4ae /Parser/pgen.c
parent	3f9a728d955579373f45dac1dd89f5b3e4f36a1c (diff)
download	cpython-3.7.0a3.zip cpython-3.7.0a3.tar.gz cpython-3.7.0a3.tar.bz2

Bump to 3.7.0a3v3.7.0a3

Diffstat (limited to 'Parser/pgen.c')

0 files changed, 0 insertions, 0 deletions

Faisal & {\tt\tiny aaf23 at cam dot ac dot uk} & ~ \\ diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 46cb70f..fd23384 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -10,7 +10,7 @@ Norwegian, Persian, Polish, Portuguese, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese. -Of them, 15 translators are up-to-date, 24 translators are based on +Of them, 16 translators are up-to-date, 23 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- @@ -19,7 +19,7 @@ alphabetically). This means that they derive from the Translator class and they implement all 228 of the required methods. Anyway, there still may be some details listed even for them: - TranslatorArmenian -- Change the base class to Translator. + TranslatorArmenian TranslatorBrazilian TranslatorCatalan TranslatorChinesetraditional -- Reimplementation using UTF-8 suggested. @@ -32,6 +32,7 @@ still may be some details listed even for them: TranslatorFrench -- Reimplementation using UTF-8 suggested. TranslatorGerman TranslatorGreek + TranslatorIndonesian -- Reimplementation using UTF-8 suggested. TranslatorPortuguese TranslatorSlovak @@ -81,9 +82,6 @@ must be implemented to become up-to-date: TranslatorLithuanian 1.4.6 36 methods to implement (15 %) Note: Reimplementation using UTF-8 suggested. - TranslatorIndonesian 1.4.6 35 methods to implement (15 %) - Note: Reimplementation using UTF-8 suggested. - TranslatorHungarian 1.4.6 36 methods to implement (15 %) Note: Reimplementation using UTF-8 suggested. @@ -115,6 +113,7 @@ for occurence of the method identifiers: QCString trDCOPMethods() QCString trDirDependency(const char *) QCString trFunctionPrototypeDocumentation() + QCString trGraphicalHierarchy() QCString trSearchForIndex() @@ -200,12 +199,6 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 35 methods to implement (15 %) virtual QCString trNoDescriptionAvailable() -TranslatorArmenian (TranslatorAdapter_1_7_5) ------------------- - - Implements 228 of the required methods (100 %). - - TranslatorChinesetraditional (Translator) ---------------------------- @@ -302,60 +295,10 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 36 methods to implement (15 %) virtual QCString trSubprogramDocumentation() -TranslatorIndonesian (TranslatorAdapter_1_4_6) 35 methods to implement (15 %) +TranslatorIndonesian (Translator) -------------------- - Implements 193 of the required methods (84 %). - - Missing methods (should be implemented): - - virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) - virtual QCString trSearching() - virtual QCString trNoMatches() - virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) - virtual QCString trLoading() - virtual QCString trSubprograms() - virtual QCString trDateTime(int year, int month, int day, int dayOfWeek, int hour, int minutes, int seconds, bool includeTime) - virtual QCString trModulesListDescription(bool extractAll) - virtual QCString trModulesList() - virtual QCString trTypeConstraints() - virtual QCString trFileIn(const char * name) - virtual QCString trGlobalNamespace() - virtual QCString trMemberFunctionDocumentationFortran() - virtual QCString trCompoundListDescriptionFortran() - virtual QCString trTypeDocumentation() - virtual QCString trModuleReference(const char * namespaceName) - virtual QCString trModulesMemberDescription(bool extractAll) - virtual QCString trModulesMembers() - virtual QCString trDirDepGraph(const char * name) - virtual QCString trModulesIndex() - virtual QCString trDirRelation(const char * name) - virtual QCString trCompoundListFortran() - virtual QCString trDataTypes() - virtual QCString trCiteReferences() - virtual QCString trDirDependency(const char * name) - virtual QCString trCopyright() - virtual QCString trIncludesFileIn(const char * name) - virtual QCString trCompoundIndexFortran() - virtual QCString trSubprogram(bool first_capital, bool singular) - virtual QCString trCallerGraph() - virtual QCString trCompoundReferenceFortran(const char * clName, ClassDef::CompoundType compType, bool isTemplate) - virtual QCString trType(bool first_capital, bool singular) - virtual QCString trModule(bool first_capital, bool singular) - virtual QCString trCompoundMembersFortran() - virtual QCString trSubprogramDocumentation() - - Obsolete methods (should be removed, never used): - - virtual QCString trHeaderFilesDescription() - virtual QCString trField(bool first_capital, bool) - virtual QCString trPackageDocumentation() - virtual QCString trSources() - virtual QCString trReimplementedForInternalReasons() - virtual QCString trInterfaces() - virtual QCString trHeaderFiles() - virtual QCString trBugsAndLimitations() - virtual QCString trNoDescriptionAvailable() + Implements 228 of the required methods (100 %). TranslatorItalian (TranslatorAdapter_1_7_5) 3 methods to implement (1 %) diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 0923047..5934468 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -45,7 +45,7 @@ SYMBOL_CACHE_SIZE = 0 # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES +EXTRACT_PRIVATE = NO EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO @@ -129,7 +129,7 @@ IGNORE_PREFIX = Q #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -GENERATE_HTML = NO +GENERATE_HTML = YES HTML_OUTPUT = HTML_FILE_EXTENSION = .html HTML_HEADER = @@ -164,10 +164,10 @@ QHP_SECT_FILTER_ATTRS = QHG_LOCATION = GENERATE_ECLIPSEHELP = YES ECLIPSE_DOC_ID = org.doxygen.qtools -DISABLE_INDEX = NO +DISABLE_INDEX = YES ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES -USE_INLINE_TREES = NO +USE_INLINE_TREES = YES TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 @@ -175,7 +175,7 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = NO MATHJAX_RELPATH = http://www.mathjax.org/mathjax SEARCHENGINE = YES -SERVER_BASED_SEARCH = YES +SERVER_BASED_SEARCH = NO #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- diff --git a/src/cite.cpp b/src/cite.cpp index 018d9cf..d19dfc1 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -75,10 +75,11 @@ bool CiteDict::writeAux() QFileInfo fi(bibFile); // open file (with .bib extension) if (fi.exists()) { - if (!copyFile(bibFile,m_baseFileName+"_"+bibFile)) + if (!copyFile(bibFile,m_baseFileName+"_"+fi.fileName().data())) { return FALSE; } + bibFile = fi.fileName().data(); if (bibFile.right(4)==".bib") { bibFile = bibFile.left(bibFile.length()-4); @@ -300,9 +301,17 @@ void CiteDict::resolve() { QCString bibFile = bibdata; if (!bibFile.isEmpty() && bibFile.right(4)!=".bib") bibFile+=".bib"; - if (!bibFile.isEmpty()) + QFileInfo fi(bibFile); + if (fi.exists()) + { + if (!bibFile.isEmpty()) + { + copyFile(bibFile,latexOutputDir+fi.fileName().data()); + } + } + else { - copyFile(bibFile,latexOutputDir+bibFile); + err("Error: bib file %s not found!\n",bibFile.data()); } bibdata = citeDataList.next(); } diff --git a/src/classdef.cpp b/src/classdef.cpp index c69c300..f868037 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2023,7 +2023,7 @@ void ClassDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const if (createSubDirs) ol.writeString("../../"); ol.writeString(md->getOutputFileBase()+Doxygen::htmlFileExtension+"#"+md->anchor()); ol.writeString("\">"); - ol.writeString(md->name()); + ol.writeString(convertToHtml(md->name())); ol.writeString(""); } ol.writeString("\n"); @@ -2080,7 +2080,7 @@ void ClassDef::writeMemberList(OutputList &ol) { if (getOuterScope()!=Doxygen::globalScope) { - writeNavigationPath(ol); + writeNavigationPath(ol,FALSE); } ol.endQuickIndices(); } @@ -3209,26 +3209,18 @@ QCString ClassDef::getOutputFileBase() const // point to simple struct inside a group return partOfGroups()->at(0)->getOutputFileBase(); } - else if (inlineSimpleClasses && m_impl->isSimple && (scope=getOuterScope()) && - ( - (scope==Doxygen::globalScope && getFileDef() && getFileDef()->isLinkableInProject()) || - scope->isLinkableInProject() - ) - ) + else if (inlineSimpleClasses && m_impl->isSimple && (scope=getOuterScope())) { - if (scope==Doxygen::globalScope) // simple struct embedded in file + if (scope==Doxygen::globalScope && getFileDef() && getFileDef()->isLinkableInProject()) // simple struct embedded in file { return getFileDef()->getOutputFileBase(); } - else // simple struct embedded in other container (namespace/group/class) + else if (scope->isLinkableInProject()) // simple struct embedded in other container (namespace/group/class) { return getOuterScope()->getOutputFileBase(); } } - else - { - return getXmlOutputFileBase(); - } + return getXmlOutputFileBase(); } QCString ClassDef::getInstanceOutputFileBase() const @@ -3754,7 +3746,7 @@ bool ClassDef::isLocal() const return m_impl->isLocal; } -ClassSDict *ClassDef::getInnerClasses() +ClassSDict *ClassDef::getClassSDict() { return m_impl->innerClasses; } diff --git a/src/classdef.h b/src/classdef.h index 9673ec9..f2d5b3a 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -113,7 +113,7 @@ class ClassDef : public Definition bool isLocal() const; /*! returns the classes nested into this class */ - ClassSDict *getInnerClasses(); + ClassSDict *getClassSDict(); /*! returns TRUE if this class has documentation */ bool hasDocumentation() const; diff --git a/src/config.xml b/src/config.xml index f9bd11c..8f4d36d 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1004,9 +1004,11 @@ the directory name containing the HTML and XML files should also have this name. ' defval='org.doxygen.Project' depends='GENERATE_ECLIPSEHELP'/>


context:
space:
mode: