Revision: 4003
http://vexi.svn.sourceforge.net/vexi/?rev=4003&view=rev
Author: clrg
Date: 2011-01-25 18:06:58 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
More jsdoc tweaks
- don't error on optional followed by non-optional args (logic wraps them all
in [] anyway)
- output 'v1, ...vn' instead of just 'v' for varargs ('v' -- set by param
'name' property)
Modified Paths:
--------------
trunk/org.vexi-build.jsdoc/src/main/java/org/vexi/build/jsdoc/Property.java
Modified:
trunk/org.vexi-build.jsdoc/src/main/java/org/vexi/build/jsdoc/Property.java
===================================================================
--- trunk/org.vexi-build.jsdoc/src/main/java/org/vexi/build/jsdoc/Property.java
2011-01-25 14:57:09 UTC (rev 4002)
+++ trunk/org.vexi-build.jsdoc/src/main/java/org/vexi/build/jsdoc/Property.java
2011-01-25 18:06:58 UTC (rev 4003)
@@ -79,16 +79,22 @@
if (!I.hasNext()) return "";
Attribute a = I.next();
- String r = (comma?", ":"")+a.findArg("name",0);
+ String argName = a.findArg("name", 0);
+ String r = (comma?", ":"")+argName;
boolean opt = a.getArg("optional", false);
+ boolean varargs = a.getArg("varargs", false);
- // func(arg[, optarg], arg2) does not make sense
- if (optional && !opt)
- throw new DocException("Arguments must be ordered as mandatory
followed by optional");
+ // func(arg[, optarg], arg2) does not make sense but the error is not
necessary
+ // as the optional implementation will output func(arg[, optarg,
arg2]) anyway
+ //if (optional && !opt)
+ // throw new DocException("Arguments must be ordered as mandatory
followed by optional");
String nextArg = buildArgs(I, true, opt);
if (!optional && opt)
r = "["+r;
+ if (varargs) {
+ r += "1, ..."+argName+"n";
+ }
if (nextArg=="" && (optional || opt))
r += "]";
else r += nextArg;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
