Skip to content

Commit

Permalink
Fix for bug that prevented borrowing overloaded members. ( issue #295 )
Browse files Browse the repository at this point in the history
git-svn-id: http://jsdoc-toolkit.googlecode.com/svn/trunk/jsdoc-toolkit@848 c4b26cf2-672e-0410-81b6-737671b986b9
  • Loading branch information
micmath committed Jul 19, 2010
1 parent ec53dcb commit b970435
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/lib/JSDOC/Symbol.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion app/lib/JSDOC/SymbolSet.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ==

Expand Down

0 comments on commit b970435

Please sign in to comment.