Skip to content
Browse files

Fix for bug that prevented borrowing overloaded members. ( issue #295 )

git-svn-id: http://jsdoc-toolkit.googlecode.com/svn/trunk/jsdoc-toolkit@848 c4b26cf2-672e-0410-81b6-737671b986b9
  • Loading branch information...
1 parent ec53dcb commit b970435c095039513a89fe4fde213a7912847c4b micmath committed
Showing with 3 additions and 2 deletions.
  1. +1 −1 app/lib/JSDOC/Symbol.js
  2. +1 −1 app/lib/JSDOC/SymbolSet.js
  3. +1 −0 changes.txt
View
2 app/lib/JSDOC/Symbol.js
@@ -499,7 +499,7 @@ JSDOC.Symbol.prototype.setTags = function() {
var inherits = this.comment.getTag("inherits");
if (inherits.length) {
for (var i = 0; i < inherits.length; i++) {
- if (/^\s*([a-z$0-9_.#:-]+)(?:\s+as\s+([a-z$0-9_.#:-]+))?/i.test(inherits[i].desc)) {
+ if (/^\s*([a-z$0-9_.#:-^]+)(?:\s+as\s+([a-z$0-9_.#:-^]+))?/i.test(inherits[i].desc)) {
var inAlias = RegExp.$1;
var inAs = RegExp.$2 || inAlias;
View
2 app/lib/JSDOC/SymbolSet.js
@@ -63,7 +63,7 @@ JSDOC.SymbolSet.prototype.resolveBorrows = function() {
var borrows = symbol.inherits;
for (var i = 0; i < borrows.length; i++) {
-
+
if (/#$/.test(borrows[i].alias)) {
LOG.warn("Attempted to borrow entire instance of "+borrows[i].alias+" but that feature is not yet implemented.");
return;
View
1 changes.txt
@@ -5,6 +5,7 @@
* Fix for bug that sometmes caused warning to be emitted when using subscripted variable names. ( issue #278 )
* Added support for the -P option to specify a plugins folder outside of the base dir. ( issue #268 )
* Added better error message when a malformed template option is given. ( issue #271 )
+ * Fix for bug that prevented borrowing overloaded members. ( issue #295 )
== 2.4.0 ==

0 comments on commit b970435

Please sign in to comment.
Something went wrong with that request. Please try again.