Index: library/lib/doc-assets/yuidoc/ac-js
===================================================================
diff -u -r77c371a2e4a1bd85367d11869de6e2dc9fac4771 -r8cfd5973ca93d4c014d0a0500bc4151972e1d80a
--- library/lib/doc-assets/yuidoc/ac-js (.../ac-js) (revision 77c371a2e4a1bd85367d11869de6e2dc9fac4771)
+++ library/lib/doc-assets/yuidoc/ac-js (.../ac-js) (revision 8cfd5973ca93d4c014d0a0500bc4151972e1d80a)
@@ -1,16 +1,19 @@
(function() {
- var Event=YAHOO.util.Event,
+ var Event=YAHOO.util.Event,
Dom=YAHOO.util.Dom,
oACDS, oAutoComp,
show = {
- 'private': false,
+ 'missing': true,
+ 'mismatch': true,
+ 'extra': true,
'protected': false,
'deprecated': false
};
Event.onAvailable('yui-classopts-form', function() {
+/*Event.onDOMReady(function() {*/
//Checkboxes are available..
- var handleClick = function(e) {
+ var handleClick = function(e,onReady) {
var id, checked = false;
if (YAHOO.lang.isString(e)) {
id = e;
@@ -35,21 +38,23 @@
var checkCookie = function(id) {
var value = YAHOO.util.Cookie.getSub('yuidoc', id),
- el = Dom.get(id), checked = (value === 'checked');;
-
- /*
- if (value === 'checked') {
- el.checked = true;
- } else {
- el.checked = false;
- }
- */
-
+ el = Dom.get(id), checked = false;
+ if (value === null) {
+ /* there is no (sub-)cookie set, apply defaults */
+ checked = el.defaultChecked;
+ } else {
+ checked = (value === 'checked');
+ }
el.checked = checked;
return checked;
};
- var els = ['show_protected'],
+ var els = [
+ 'show_protected',
+ 'show_missing',
+ 'show_mismatch',
+ 'show_extra',
+ 'show_deprecated'],
reapplyHash = false;
for (var i = 0; i < els.length; i++) {
Index: library/lib/doc-assets/yuidoc/api.css
===================================================================
diff -u -r77c371a2e4a1bd85367d11869de6e2dc9fac4771 -r8cfd5973ca93d4c014d0a0500bc4151972e1d80a
--- library/lib/doc-assets/yuidoc/api.css (.../api.css) (revision 77c371a2e4a1bd85367d11869de6e2dc9fac4771)
+++ library/lib/doc-assets/yuidoc/api.css (.../api.css) (revision 8cfd5973ca93d4c014d0a0500bc4151972e1d80a)
@@ -162,17 +162,26 @@
color: #98AAB1;
}
-.deprecated, .private, .protected {
- display: inherit;
- /* display: none;*/
+
+.filter.deprecated,
+.filter.protected,
+.filter.missing,
+.filter.extra,
+.filter.extra,
+.filter.mismatch {
+ /*display: inherit;*/
+ display: none;
}
-body.show_deprecated .deprecated,
-body.show_private .private,
-body.show_protected .protected {
+body.show_deprecated .filter.deprecated,
+body.show_protected .filter.protected,
+body.show_missing .filter.missing,
+body.show_extra .filter.extra,
+body.show_mismatch .filter.mismatch {
display: inherit;
}
+
#splash_classList ul {
margin: 1em;
margin-left:2em;
Index: library/lib/doc-tools.tcl
===================================================================
diff -u -ra8ee84dcc2166b54f50c387df65fc6b94315f6e5 -r8cfd5973ca93d4c014d0a0500bc4151972e1d80a
--- library/lib/doc-tools.tcl (.../doc-tools.tcl) (revision a8ee84dcc2166b54f50c387df65fc6b94315f6e5)
+++ library/lib/doc-tools.tcl (.../doc-tools.tcl) (revision 8cfd5973ca93d4c014d0a0500bc4151972e1d80a)
@@ -1047,6 +1047,8 @@
:public forward @method %self @object-method
:attribute @object-method -class ::nx::doc::PartAttribute {
+ :pretty_name "Object method"
+ :pretty_plural "Object methods"
set :part_class ::nx::doc::@method
}
@@ -1122,7 +1124,6 @@
:attribute @syshook:boolean -class ::nx::doc::SwitchAttribute {
set :default 0
}
- :attribute {@modifier public} -class ::nx::doc::PartAttribute
:attribute @parameter -class ::nx::doc::PartAttribute {
set :part_class ::nx::doc::@param
}
@@ -1298,7 +1299,6 @@
# #
# # @param partof Refers to the entity object which contains this part
# # @param name Stores the name of the documented parameter
- # # @modifier protected
# set partof_fragment [:get_unqualified_name ${partof_name}]
# return [:root_namespace]::${:tag}::${partof_fragment}::${name}
@@ -1519,6 +1519,11 @@
return
}
+ :method ! {cmd args} {
+ uplevel 1 [list ::$cmd {*}$args]
+ return
+ }
+
:public method !get {-sortedby -with -where varname} {
set origin [:origin]
if {![$origin eval [list info exists :$varname]]} return
@@ -1531,7 +1536,6 @@
if {[info exists where]} {
set l [list]
foreach item $r {
- #puts stderr ".... $item has modifier [$item eval {set :@modifier}]"
if {[$item eval [list expr $where]]} {
lappend l $item
}
@@ -1834,19 +1838,25 @@
# :public forward current_project [current] %method
# :public forward print_name %current name
- :public method statusmark {} {
- set cls ""
- set prj [:current_project]
+
+ :public method statustoken {} {
+ set token ""
set obj [:origin]
+ set prj [:current_project]
if {[$prj is_validated]} {
if {[$obj eval {info exists :pdata}]} {
- set cls [$obj pinfo get -default "" status]
+ set token [$obj pinfo get -default "" status]
} else {
- set cls "extra"
+ set token "extra"
}
}
- set status_mark " "
+ return $token
}
+
+ :public method statusmark {} {
+ set token [:statustoken]
+ set status_mark " "
+ }
:public method print_name {-status:switch} {
set status_mark [expr {$status?[:statusmark]:""}]
return "${:name}$status_mark"
@@ -2160,7 +2170,7 @@
MixinLayer::Mixin create [current]::@method -superclass [current]::Entity {
:public method as_dict {partof feature} {
set hash [next]
- dict set hash access ${:@modifier}
+ dict set hash access [expr {[:pinfo get -default 0 bundle call-protected]?"protected":""}]
return $hash
}
}; # html::@method
@@ -3363,10 +3373,6 @@
#puts stderr "== TO GENERATE == [join [dict keys $generated_commands] \n]"
dict for {cmd info} $generated_commands {
dict with info {
- #
- # TODO: for now, we assume objects beyond this point
- # ... relax later!
- #
if {$cmdtype ni [list @command @object @class @method]} continue;
if {$cmdtype eq "@object" && [string match *::slot::* $cmd]} {
if {[dict exists $info bundle objtype] && [dict get $info bundle objtype] eq "ensemble"} continue;
Index: library/nx/nx.nxd
===================================================================
diff -u -ra8ee84dcc2166b54f50c387df65fc6b94315f6e5 -r8cfd5973ca93d4c014d0a0500bc4151972e1d80a
--- library/nx/nx.nxd (.../nx.nxd) (revision a8ee84dcc2166b54f50c387df65fc6b94315f6e5)
+++ library/nx/nx.nxd (.../nx.nxd) (revision 8cfd5973ca93d4c014d0a0500bc4151972e1d80a)
@@ -132,51 +132,7 @@
# @parameter className:optional
# @return <<@gls class>> of the object
-# @class.method {Object __default_attribute_call_protection}
-#
-# @modifier protected
-# @class.method {Object __default_method_call_protection}
-#
-# @modifier protected
-
-# @class.method {Object __resolve_method_path}
-#
-# @modifier protected
-
-# @class.method {Object cleanup}
-#
-# @modifier protected
-
-# @class.method {Object defaultmethod}
-#
-# @modifier protected
-
-# @class.method {Object init}
-#
-# @modifier protected
-
-# @class.method {Object noinit}
-#
-# @modifier protected
-
-# @class.method {Object objectparameter}
-#
-# @modifier protected
-
-# @class.method {Object residualargs}
-#
-# @modifier protected
-
-# @class.method {Object uplevel}
-#
-# @modifier protected
-
-# @class.method {Object upvar}
-#
-# @modifier protected
-
-
########################################################################
# ::nx::Class
########################################################################
Index: tests/doc.test
===================================================================
diff -u -r77c371a2e4a1bd85367d11869de6e2dc9fac4771 -r8cfd5973ca93d4c014d0a0500bc4151972e1d80a
--- tests/doc.test (.../doc.test) (revision 77c371a2e4a1bd85367d11869de6e2dc9fac4771)
+++ tests/doc.test (.../doc.test) (revision 8cfd5973ca93d4c014d0a0500bc4151972e1d80a)
@@ -1126,6 +1126,19 @@
::nx::slotObj
}
+# lappend ::nx::excludes {*}::nsf::classes::nx::Object::[join {
+# __default_attribute_call_protection
+# __default_method_call_protection
+# __resolve_method_path
+# cleanup
+# defaultmethod
+# init
+# noinit
+# objectparameter
+# residualargs
+# uplevel
+# upvar
+# } " ::nsf::classes::nx::Object::"]
set project [::nx::doc::@project new \
-name NextScriptingLanguage \