Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
doxverilog
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
doxverilog
Commits
c863b9bc
Commit
c863b9bc
authored
Aug 04, 2014
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'groleo-master'
parents
cfde6cdd
d1e39098
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
4 deletions
+19
-4
classdef.cpp
src/classdef.cpp
+16
-3
classdef.h
src/classdef.h
+2
-0
definition.h
src/definition.h
+1
-1
No files found.
src/classdef.cpp
View file @
c863b9bc
...
@@ -187,6 +187,8 @@ class ClassDefImpl
...
@@ -187,6 +187,8 @@ class ClassDefImpl
bool
isGeneric
;
bool
isGeneric
;
bool
isAnonymous
;
uint64
spec
;
uint64
spec
;
};
};
...
@@ -248,6 +250,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
...
@@ -248,6 +250,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
isLocal
=
FALSE
;
isLocal
=
FALSE
;
}
}
isGeneric
=
lang
==
SrcLangExt_CSharp
&&
QCString
(
name
).
find
(
'<'
)
!=-
1
;
isGeneric
=
lang
==
SrcLangExt_CSharp
&&
QCString
(
name
).
find
(
'<'
)
!=-
1
;
isAnonymous
=
QCString
(
name
).
find
(
'@'
)
!=-
1
;
}
}
ClassDefImpl
::
ClassDefImpl
()
:
vhdlSummaryTitles
(
17
)
ClassDefImpl
::
ClassDefImpl
()
:
vhdlSummaryTitles
(
17
)
...
@@ -1772,7 +1775,7 @@ bool ClassDef::visibleInParentsDeclList() const
...
@@ -1772,7 +1775,7 @@ bool ClassDef::visibleInParentsDeclList() const
static
bool
hideUndocClasses
=
Config_getBool
(
"HIDE_UNDOC_CLASSES"
);
static
bool
hideUndocClasses
=
Config_getBool
(
"HIDE_UNDOC_CLASSES"
);
static
bool
extractLocalClasses
=
Config_getBool
(
"EXTRACT_LOCAL_CLASSES"
);
static
bool
extractLocalClasses
=
Config_getBool
(
"EXTRACT_LOCAL_CLASSES"
);
bool
linkable
=
isLinkable
();
bool
linkable
=
isLinkable
();
return
(
name
().
find
(
'@'
)
==-
1
&&
!
isExtension
()
&&
return
(
!
isAnonymous
()
&&
!
isExtension
()
&&
(
protection
()
!=::
Private
||
extractPrivate
)
&&
(
protection
()
!=::
Private
||
extractPrivate
)
&&
(
linkable
||
(
!
hideUndocClasses
&&
(
!
isLocal
()
||
extractLocalClasses
)))
(
linkable
||
(
!
hideUndocClasses
&&
(
!
isLocal
()
||
extractLocalClasses
)))
);
);
...
@@ -2597,7 +2600,7 @@ bool ClassDef::isLinkableInProject() const
...
@@ -2597,7 +2600,7 @@ bool ClassDef::isLinkableInProject() const
{
{
return
!
name
().
isEmpty
()
&&
/* has a name */
return
!
name
().
isEmpty
()
&&
/* has a name */
!
isArtificial
()
&&
!
isHidden
()
&&
/* not hidden */
!
isArtificial
()
&&
!
isHidden
()
&&
/* not hidden */
name
().
find
(
'@'
)
==-
1
&&
/* not anonymous */
!
isAnonymous
()
&&
/* not anonymous */
protectionLevelVisible
(
m_impl
->
prot
)
&&
/* private/internal */
protectionLevelVisible
(
m_impl
->
prot
)
&&
/* private/internal */
(
!
m_impl
->
isLocal
||
extractLocal
)
&&
/* local */
(
!
m_impl
->
isLocal
||
extractLocal
)
&&
/* local */
(
hasDocumentation
()
||
!
hideUndoc
)
&&
/* documented */
(
hasDocumentation
()
||
!
hideUndoc
)
&&
/* documented */
...
@@ -2629,7 +2632,7 @@ bool ClassDef::isVisibleInHierarchy()
...
@@ -2629,7 +2632,7 @@ bool ClassDef::isVisibleInHierarchy()
return
// show all classes or a subclass is visible
return
// show all classes or a subclass is visible
(
allExternals
||
hasNonReferenceSuperClass
())
&&
(
allExternals
||
hasNonReferenceSuperClass
())
&&
// and not an anonymous compound
// and not an anonymous compound
name
().
find
(
'@'
)
==-
1
&&
!
isAnonymous
()
&&
// not an artificially introduced class
// not an artificially introduced class
/*!isArtificial() &&*/
// 1.8.2: allowed these to appear
/*!isArtificial() &&*/
// 1.8.2: allowed these to appear
// and not privately inherited
// and not privately inherited
...
@@ -4608,3 +4611,13 @@ bool ClassDef::subGrouping() const
...
@@ -4608,3 +4611,13 @@ bool ClassDef::subGrouping() const
return
m_impl
->
subGrouping
;
return
m_impl
->
subGrouping
;
}
}
void
ClassDef
::
setName
(
const
char
*
name
)
{
m_impl
->
isAnonymous
=
QCString
(
name
).
find
(
'@'
)
!=-
1
;
Definition
::
setName
(
name
);
}
bool
ClassDef
::
isAnonymous
()
const
{
return
m_impl
->
isAnonymous
;
}
src/classdef.h
View file @
c863b9bc
...
@@ -310,6 +310,7 @@ class ClassDef : public Definition
...
@@ -310,6 +310,7 @@ class ClassDef : public Definition
bool
isJavaEnum
()
const
;
bool
isJavaEnum
()
const
;
bool
isGeneric
()
const
;
bool
isGeneric
()
const
;
bool
isAnonymous
()
const
;
const
ClassSDict
*
innerClasses
()
const
;
const
ClassSDict
*
innerClasses
()
const
;
QCString
title
()
const
;
QCString
title
()
const
;
...
@@ -360,6 +361,7 @@ class ClassDef : public Definition
...
@@ -360,6 +361,7 @@ class ClassDef : public Definition
void
addTaggedInnerClass
(
ClassDef
*
cd
);
void
addTaggedInnerClass
(
ClassDef
*
cd
);
void
setTagLessReference
(
ClassDef
*
cd
);
void
setTagLessReference
(
ClassDef
*
cd
);
void
setName
(
const
char
*
name
);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
// --- actions ----
// --- actions ----
...
...
src/definition.h
View file @
c863b9bc
...
@@ -271,7 +271,7 @@ class Definition : public DefinitionIntf
...
@@ -271,7 +271,7 @@ class Definition : public DefinitionIntf
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
/*! Sets a new \a name for the definition */
/*! Sets a new \a name for the definition */
void
setName
(
const
char
*
name
);
v
irtual
v
oid
setName
(
const
char
*
name
);
/*! Sets a unique id for the symbol. Used for libclang integration. */
/*! Sets a unique id for the symbol. Used for libclang integration. */
void
setId
(
const
char
*
name
);
void
setId
(
const
char
*
name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment