<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>as2api/trunk/as2api</tt></b></td></tr>
<tr><td><tt>lib/<a href="#file1">api_loader.rb</a></tt> </td><td></td><td align="right" id="added">+33</td><td align="right" id="removed">-34</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr class="alt"><td><tt> /<a href="#file2">doc_comment.rb</a></tt> </td><td></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr><td><tt>lib/localisation/xliff/<a href="#file3">translation_loader.rb</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr class="alt"><td><tt>lib/output/diff/<a href="#file4">api_deserializer.rb</a></tt> </td><td></td><td align="right" id="added">+13</td><td align="right" id="removed">-13</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr><td><tt>lib/output/html/<a href="#file5">core_pages.rb</a></tt> </td><td></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">html_framework.rb</a></tt> </td><td></td><td align="right" id="added">+5</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr><td><tt>lib/parse/<a href="#file7">parser.rb</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr class="alt"><td><tt>test/<a href="#file8">tc_doc_comment.rb</a></tt> </td><td></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">368 -> 369</td></tr>
<tr><td></td><td></td><td align="right" id="added">+68</td><td align="right" id="removed">-69</td><td></td></tr>
</table>
<small id="info">8 modified files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: need a MemberRef (and maybe Method+Field subclasses) with similar</a></li>
</ul></div>
<pre class="comment">
Rename 'TypeProxy' to 'TypeRef', as this seems a vastly better name to me.
The instances of this class aren't really proxies for the target ASType
objects, since they don't have the same API; instead their API provides access
to the underlying ASType to which the TypeRef's name refers.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib</span><br />
<div class="fileheader"><big><b>api_loader.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/api_loader.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/api_loader.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -153,11 +153,11 @@
</small></pre><pre class="diff" id="context"> end
@defined_type.dynamic = dynamic
if super_name
</pre><pre class="diff" id="removed">- @defined_type.extends = @type_namespace.re<span id="removedchars">solve</span>(super_name)
</pre><pre class="diff" id="added">+ @defined_type.extends = @type_namespace.re<span id="addedchars">f_to</span>(super_name)
</pre><pre class="diff" id="context"> end
if interfaces
interfaces.each do |interface|
</pre><pre class="diff" id="removed">- @defined_type.add_interface(@type_namespace.re<span id="removedchars">solve</span>(interface))
</pre><pre class="diff" id="added">+ @defined_type.add_interface(@type_namespace.re<span id="addedchars">f_to</span>(interface))
</pre><pre class="diff" id="context"> end
end
@defined_type.type_namespace = @type_namespace
</pre><pre class="diff"><small id="info">@@ -178,7 +178,7 @@
</small></pre><pre class="diff" id="context"> @defined_type.comment = parse_comment(@type_comment_config, @doc_comment)
end
if super_name
</pre><pre class="diff" id="removed">- @defined_type.extends = @type_namespace.re<span id="removedchars">solve</span>(super_name)
</pre><pre class="diff" id="added">+ @defined_type.extends = @type_namespace.re<span id="addedchars">f_to</span>(super_name)
</pre><pre class="diff" id="context"> end
@defined_type.type_namespace = @type_namespace
@defined_type.import_list = @import_list
</pre><pre class="diff"><small id="info">@@ -213,7 +213,7 @@
</small></pre><pre class="diff" id="context"> def start_member_field(name, astype)
field = ASExplicitField.new(@defined_type, @last_modifier, name.body)
unless astype.nil?
</pre><pre class="diff" id="removed">- field.field_type = @type_namespace.re<span id="removedchars">solve</span>(astype)
</pre><pre class="diff" id="added">+ field.field_type = @type_namespace.re<span id="addedchars">f_to</span>(astype)
</pre><pre class="diff" id="context"> end
if @doc_comment
field.comment = parse_comment(@field_comment_config, @doc_comment)
</pre><pre class="diff"><small id="info">@@ -242,12 +242,12 @@
</small></pre><pre class="diff" id="context"> def create_method(name, sig)
method = ASMethod.new(@defined_type, @last_modifier, name.body)
if sig.return_type
</pre><pre class="diff" id="removed">- method.return_type = @type_namespace.re<span id="removedchars">solve</span>(sig.return_type)
</pre><pre class="diff" id="added">+ method.return_type = @type_namespace.re<span id="addedchars">f_to</span>(sig.return_type)
</pre><pre class="diff" id="context"> end
sig.arguments.each do |arg|
argument = ASArg.new(arg.name.body)
if arg.type
</pre><pre class="diff" id="removed">- argument.arg_type = @type_namespace.re<span id="removedchars">solve</span>(arg.type)
</pre><pre class="diff" id="added">+ argument.arg_type = @type_namespace.re<span id="addedchars">f_to</span>(arg.type)
</pre><pre class="diff" id="context"> end
method.add_arg(argument)
end
</pre><pre class="diff"><small id="info">@@ -344,11 +344,10 @@
</small></pre><pre class="diff" id="context">
# A proxy for some type referred to by a particular name within a compilation
# unit. After we've parsed all compilation units, we'll be able to resolve
</pre><pre class="diff" id="removed">-# what real type this <span id="removedchars">proxy</span> stands for (i.e. becase we'll have found the
</pre><pre class="diff" id="added">+# what real type this <span id="addedchars">reference</span> stands for (i.e. becase we'll have found the
</pre><pre class="diff" id="context"> # types pulled into the compilation unit by 'import com.example.*')
</pre><pre class="diff" id="removed">-class Type<span id="removedchars">Proxy</span>
</pre><pre class="diff" id="added">+class Type<span id="addedchars">Ref</span>
</pre><pre class="diff" id="context"> # TODO: this should be in api_model.rb
</pre><pre class="diff" id="removed">- # TODO: this should be called TypeRef
</pre><pre class="diff" id="context">
def initialize(containing_type, name)
@name = name
</pre><pre class="diff"><small id="info">@@ -388,7 +387,7 @@
</small></pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-# Resolves type names to instances of Type<span id="removedchars">Proxy</span> for a particular compilation
</pre><pre class="diff" id="added">+# Resolves type names to instances of Type<span id="addedchars">Ref</span> for a particular compilation
</pre><pre class="diff" id="context"> # unit (the same name could refer to different types in different compilation
# units).
class TypeLocalNamespace
</pre><pre class="diff"><small id="info">@@ -397,19 +396,19 @@
</small></pre><pre class="diff" id="context"> @named_types = {}
end
</pre><pre class="diff" id="removed">- def re<span id="removedchars">solve</span>(name, lineno=nil)
</pre><pre class="diff" id="added">+ def re<span id="addedchars">f_to</span>(name, lineno=nil)
</pre><pre class="diff" id="context"> raise "invalid name #{name.inspect}" if name.nil?
if name.is_a?(Array)
lineno = name.first.lineno
name = name.join(".")
end
</pre><pre class="diff" id="removed">- astype = @named_types[name]
- if astype.nil?
- astype = TypeProxy.new(@containing_type, name)
- astype.lineno = lineno
- @named_types[name] = astype
</pre><pre class="diff" id="added">+ type_ref = @named_types[name]
+ if type_ref.nil?
+ type_ref = TypeRef.new(@containing_type, name)
+ type_ref.lineno = lineno
+ @named_types[name] = type_ref
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">- astype
</pre><pre class="diff" id="added">+ type_ref
</pre><pre class="diff" id="context"> end
def each
</pre><pre class="diff"><small id="info">@@ -466,11 +465,11 @@
</small></pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-# Utility for resolving the Type<span id="removedchars">Proxy</span> objects created within each ASType of
</pre><pre class="diff" id="added">+# Utility for resolving the Type<span id="addedchars">Ref</span> objects created within each ASType of
</pre><pre class="diff" id="context"> # a GlobalTypeAggregator.
#
# Once all types to be documented have been parsed, this class resolves the
</pre><pre class="diff" id="removed">-# inter-type references that the Type<span id="removedchars">Proxy</span> objects represent, possibly loading
</pre><pre class="diff" id="added">+# inter-type references that the Type<span id="addedchars">Ref</span> objects represent, possibly loading
</pre><pre class="diff" id="context"> # and parsing further ActionScript files from the classpath as type-resolution
# requires.
class TypeResolver
</pre><pre class="diff"><small id="info">@@ -514,20 +513,20 @@
</small></pre><pre class="diff" id="context"> def resolve_each_type(global_ns, type_aggregator)
type_aggregator.each_type do |astype|
local_ns = create_local_namespace(global_ns, type_aggregator, astype)
</pre><pre class="diff" id="removed">- resolve_type_<span id="removedchars">proxie</span>s(local_ns, astype)
</pre><pre class="diff" id="added">+ resolve_type_<span id="addedchars">ref</span>s(local_ns, astype)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- def resolve_type_proxies(local_ns, astype)
- astype.type_namespace.each do |type_proxy|
- real_type = local_ns[type_proxy.local_name]
</pre><pre class="diff" id="added">+ def resolve_type_refs(local_ns, astype)
+ astype.type_namespace.each do |type_ref|
+ real_type = local_ns[type_ref.local_name]
</pre><pre class="diff" id="context"> unless real_type
</pre><pre class="diff" id="removed">- real_type = maybe_parse_external_definition(type_<span id="removedchars">proxy</span>)
</pre><pre class="diff" id="added">+ real_type = maybe_parse_external_definition(type_<span id="addedchars">ref</span>)
</pre><pre class="diff" id="context"> end
if real_type
</pre><pre class="diff" id="removed">- type_<span id="removedchars">proxy</span>.resolved_type = real_type
</pre><pre class="diff" id="added">+ type_<span id="addedchars">ref</span>.resolved_type = real_type
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- err(astype.input_filename, type_proxy.lineno, "Found no definition of type known locally as #{type_proxy.local_name.inspect}")
</pre><pre class="diff" id="added">+ err(astype.input_filename, type_ref.lineno, "Found no definition of type known locally as #{type_ref.local_name.inspect}")
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -535,7 +534,7 @@
</small></pre><pre class="diff" id="context"> def import_types_into_namespace(astype, local_namespace)
astype.import_list.each_type do |type_name|
import_type = local_namespace[type_name.join(".")]
</pre><pre class="diff" id="removed">- import_type = maybe_parse_external_definition(Type<span id="removedchars">Proxy</span>.new(astype, type_name.join('.'))) unless import_type
</pre><pre class="diff" id="added">+ import_type = maybe_parse_external_definition(Type<span id="addedchars">Ref</span>.new(astype, type_name.join('.'))) unless import_type
</pre><pre class="diff" id="context"> if import_type
local_namespace[type_name.last.body] = import_type
else
</pre><pre class="diff"><small id="info">@@ -576,13 +575,13 @@
</small></pre><pre class="diff" id="context"> nil
end
</pre><pre class="diff" id="removed">- def find_file_matching(type_proxy)
- file_name = search_classpath_for(type_proxy.name)
</pre><pre class="diff" id="added">+ def find_file_matching(type_ref)
+ file_name = search_classpath_for(type_ref.name)
</pre><pre class="diff" id="context"> return file_name unless file_name.nil?
</pre><pre class="diff" id="removed">- return nil if type_<span id="removedchars">proxy</span>.qualified?
</pre><pre class="diff" id="added">+ return nil if type_<span id="addedchars">ref</span>.qualified?
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- type_proxy.containing_type.import_list.each_package do |package_name|
- candidate_name = package_name.join(".") + "." + type_proxy.name
</pre><pre class="diff" id="added">+ type_ref.containing_type.import_list.each_package do |package_name|
+ candidate_name = package_name.join(".") + "." + type_ref.name
</pre><pre class="diff" id="context"> file_name = search_classpath_for(candidate_name)
return file_name unless file_name.nil?
end
</pre><pre class="diff"><small id="info">@@ -590,8 +589,8 @@
</small></pre><pre class="diff" id="context"> nil
end
</pre><pre class="diff" id="removed">- def maybe_parse_external_definition(type_proxy)
- source_file = find_file_matching(type_proxy)
</pre><pre class="diff" id="added">+ def maybe_parse_external_definition(type_ref)
+ source_file = find_file_matching(type_ref)
</pre><pre class="diff" id="context"> return nil if source_file.nil?
astype = @parsed_external_types[source_file.suffix]
return astype unless astype.nil?
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib</span><br />
<div class="fileheader"><big><b>doc_comment.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/doc_comment.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/doc_comment.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -321,8 +321,8 @@
</small></pre><pre class="diff" id="context"> if text =~ /^\s*([^()\s]+(?:\([^\)]*\))?)\s*(.+)?/m
target = $1
text = $2
</pre><pre class="diff" id="removed">- # TODO: need a MemberProxy (and maybe Method+Field subclasses) with similar
- # role to TypeProxy, to simplify this, and output_doccomment_inlinetag
</pre><pre class="diff" id="added"><a name="task1" />+ # <span class="task">TODO</span>: need a MemberRef (and maybe Method+Field subclasses) with similar
+ # role to TypeRef, to simplify this, and output_doccomment_inlinetag
</pre><pre class="diff" id="context"> if target =~ /([^#]*)#(.*)/
type_name = $1
member_name = $2
</pre><pre class="diff"><small id="info">@@ -331,11 +331,11 @@
</small></pre><pre class="diff" id="context"> member_name = nil
end
if type_name == ""
</pre><pre class="diff" id="removed">- type_<span id="removedchars">proxy</span> = nil
</pre><pre class="diff" id="added">+ type_<span id="addedchars">ref</span> = nil
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- type_proxy = type_namespace.resolve(type_name, lineno)
</pre><pre class="diff" id="added">+ type_ref = type_namespace.ref_to(type_name, lineno)
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">- return LinkTag.new(lineno, type_<span id="removedchars">proxy</span>, member_name, text)
</pre><pre class="diff" id="added">+ return LinkTag.new(lineno, type_<span id="addedchars">ref</span>, member_name, text)
</pre><pre class="diff" id="context"> end
return nil
end
</pre><pre class="diff"><small id="info">@@ -445,7 +445,7 @@
</small></pre><pre class="diff" id="context"> first_inline = @data.inlines[0]
if first_inline =~ /\A\s*([^\s]+)\s+/
@data.inlines[0] = $'
</pre><pre class="diff" id="removed">- @data.exception_type = @type_namespace.re<span id="removedchars">solve</span>($1)
</pre><pre class="diff" id="added">+ @data.exception_type = @type_namespace.re<span id="addedchars">f_to</span>($1)
</pre><pre class="diff" id="context"> @data
else
nil
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib/localisation/xliff</span><br />
<div class="fileheader"><big><b>translation_loader.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/localisation/xliff/translation_loader.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/localisation/xliff/translation_loader.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -35,7 +35,7 @@
</small></pre><pre class="diff" id="context"> def end_ph;
@ph_text =~ /^([^#\s]+)(?:#([^\s]+))?/
if $1
</pre><pre class="diff" id="removed">- target = @type_namespace.re<span id="removedchars">solve</span>($1)
</pre><pre class="diff" id="added">+ target = @type_namespace.re<span id="addedchars">f_to</span>($1)
</pre><pre class="diff" id="context"> else
target = nil
end
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib/output/diff</span><br />
<div class="fileheader"><big><b>api_deserializer.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/output/diff/api_deserializer.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/output/diff/api_deserializer.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -84,7 +84,7 @@
</small></pre><pre class="diff" id="context"> @current_type.type_namespace = TypeLocalNamespace.new(@current_type)
@current_type.import_list = ImportList.new
if extends
</pre><pre class="diff" id="removed">- @current_type.extends = re<span id="removedchars">solve_type</span>(extends)
</pre><pre class="diff" id="added">+ @current_type.extends = re<span id="addedchars">f_to</span>(extends)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -97,7 +97,7 @@
</small></pre><pre class="diff" id="context"> @current_type.type_namespace = TypeLocalNamespace.new(@current_type)
@current_type.import_list = ImportList.new
if extends
</pre><pre class="diff" id="removed">- @current_type.extends = re<span id="removedchars">solve_type</span>(extends)
</pre><pre class="diff" id="added">+ @current_type.extends = re<span id="addedchars">f_to</span>(extends)
</pre><pre class="diff" id="context"> end
end
def end_interface
</pre><pre class="diff"><small id="info">@@ -170,9 +170,9 @@
</small></pre><pre class="diff" id="context"> @current_comment_block = SeeBlockTag.new
push_text_handler(SeeBlockTextHandler.new(@current_comment_block))
lineno = 0
</pre><pre class="diff" id="removed">- type_proxy = resolve_type(type) if type
</pre><pre class="diff" id="added">+ type_ref = ref_to(type) if type
</pre><pre class="diff" id="context"> text = nil
</pre><pre class="diff" id="removed">- @current_comment_block.add_inline(LinkTag.new(lineno, type_<span id="removedchars">proxy</span>, member, text))
</pre><pre class="diff" id="added">+ @current_comment_block.add_inline(LinkTag.new(lineno, type_<span id="addedchars">ref</span>, member, text))
</pre><pre class="diff" id="context"> end
def end_see
</pre><pre class="diff"><small id="info">@@ -184,9 +184,9 @@
</small></pre><pre class="diff" id="context"> end
def start_link(type, member)
lineno = 0
</pre><pre class="diff" id="removed">- type_proxy = resolve_type(type) if type
</pre><pre class="diff" id="added">+ type_ref = ref_to(type) if type
</pre><pre class="diff" id="context"> text = nil
</pre><pre class="diff" id="removed">- link_tag = LinkTag.new(lineno, type_<span id="removedchars">proxy</span>, member, text)
</pre><pre class="diff" id="added">+ link_tag = LinkTag.new(lineno, type_<span id="addedchars">ref</span>, member, text)
</pre><pre class="diff" id="context"> push_text_handler(LinkBlockTextHandler.new(link_tag))
@current_comment_block.add_inline(link_tag)
end
</pre><pre class="diff"><small id="info">@@ -194,7 +194,7 @@
</small></pre><pre class="diff" id="context"> pop_text_handler
end
def implements(interface)
</pre><pre class="diff" id="removed">- @current_type.add_interface(re<span id="removedchars">solve_type</span>(interface))
</pre><pre class="diff" id="added">+ @current_type.add_interface(re<span id="addedchars">f_to</span>(interface))
</pre><pre class="diff" id="context"> end
def start_constructor; end
def end_constructor; end
</pre><pre class="diff"><small id="info">@@ -210,7 +210,7 @@
</small></pre><pre class="diff" id="context"> @current_comment_block = @current_param_block = ParamBlockTag.new
@current_comment_block.param_name = name
@current_arg = ASArg.new(name)
</pre><pre class="diff" id="removed">- @current_arg.arg_type = re<span id="removedchars">solve_type</span>(type) if type
</pre><pre class="diff" id="added">+ @current_arg.arg_type = re<span id="addedchars">f_to</span>(type) if type
</pre><pre class="diff" id="context"> push_text_handler(CommentBlockTextHandler.new(@current_comment_block))
end
def end_param
</pre><pre class="diff"><small id="info">@@ -225,7 +225,7 @@
</small></pre><pre class="diff" id="context"> end
def start_return(type)
@current_comment_block = @current_return_block = ReturnBlockTag.new
</pre><pre class="diff" id="removed">- @current_method.return_type = re<span id="removedchars">solve_type</span>(type) if type
</pre><pre class="diff" id="added">+ @current_method.return_type = re<span id="addedchars">f_to</span>(type) if type
</pre><pre class="diff" id="context"> push_text_handler(CommentBlockTextHandler.new(@current_comment_block))
end
def end_return
</pre><pre class="diff"><small id="info">@@ -239,7 +239,7 @@
</small></pre><pre class="diff" id="context"> def start_field(name, type, visibility, static)
access = ASAccess.new(visibility, static)
@current_api_element = @current_field = ASExplicitField.new(@current_type, access, name)
</pre><pre class="diff" id="removed">- @current_field.field_type = re<span id="removedchars">solve_type</span>(type) if type
</pre><pre class="diff" id="added">+ @current_field.field_type = re<span id="addedchars">f_to</span>(type) if type
</pre><pre class="diff" id="context"> end
def end_field
@current_type.add_field(@current_field)
</pre><pre class="diff"><small id="info">@@ -247,7 +247,7 @@
</small></pre><pre class="diff" id="context"> end
def start_exception(type)
@current_comment_block = @current_exception = ThrowsBlockTag.new
</pre><pre class="diff" id="removed">- @current_exception.exception_type = re<span id="removedchars">solve_type</span>(type)
</pre><pre class="diff" id="added">+ @current_exception.exception_type = re<span id="addedchars">f_to</span>(type)
</pre><pre class="diff" id="context"> push_text_handler(CommentBlockTextHandler.new(@current_comment_block))
end
def end_exception
</pre><pre class="diff"><small id="info">@@ -257,8 +257,8 @@
</small></pre><pre class="diff" id="context">
private
</pre><pre class="diff" id="removed">- def resolve_type(name)
- @current_type.type_namespace.resolve(name)
</pre><pre class="diff" id="added">+ def ref_to(name)
+ @current_type.type_namespace.ref_to(name)
</pre><pre class="diff" id="context"> end
end # class DeserializerAPIListner
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib/output/html</span><br />
<div class="fileheader"><big><b>core_pages.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/output/html/core_pages.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/output/html/core_pages.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -105,7 +105,7 @@
</small></pre><pre class="diff" id="context"> html_h2(_("Implemented Interfaces"))
@type.each_interface do |interface|
html_code do
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(interface)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(interface)
</pre><pre class="diff" id="context"> end
pcdata(" ")
end
</pre><pre class="diff"><small id="info">@@ -453,7 +453,7 @@
</small></pre><pre class="diff" id="context"> comment_data.each_exception do |exception_comment|
html_tr do
html_td do
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(exception_comment.exception_type)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(exception_comment.exception_type)
</pre><pre class="diff" id="context"> end
html_td do
output_doccomment_blocktag(exception_comment)
</pre><pre class="diff"><small id="info">@@ -530,13 +530,13 @@
</small></pre><pre class="diff" id="context"> pcdata(arg.name)
if arg.arg_type
pcdata(":")
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(arg.arg_type)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(arg.arg_type)
</pre><pre class="diff" id="context"> end
end
pcdata(")")
if method.return_type
pcdata(":")
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(method.return_type)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(method.return_type)
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -563,7 +563,7 @@
</small></pre><pre class="diff" id="context"> end
if field.field_type
pcdata(":")
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(field.field_type)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(field.field_type)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -580,7 +580,7 @@
</small></pre><pre class="diff" id="context"> field_type = field.field_type
unless field_type.nil?
pcdata(":")
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(field_type)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(field_type)
</pre><pre class="diff" id="context"> end
unless field.readwrite?
pcdata(" ")
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib/output/html</span><br />
<div class="fileheader"><big><b>html_framework.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/output/html/html_framework.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/output/html/html_framework.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -242,11 +242,11 @@
</small></pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- def link_type_proxy(type_proxy, qualified=false)
- if type_proxy.resolved?
- link_type(type_proxy.resolved_type, qualified)
</pre><pre class="diff" id="added">+ def link_type_ref(type_ref, qualified=false)
+ if type_ref.resolved?
+ link_type(type_ref.resolved_type, qualified)
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- html_span(type_<span id="removedchars">proxy</span>.local_name, {"class"=>"unresolved_type_name"})
</pre><pre class="diff" id="added">+ html_span(type_<span id="addedchars">ref</span>.local_name, {"class"=>"unresolved_type_name"})
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -472,7 +472,7 @@
</small></pre><pre class="diff" id="context"> end
elsif inline.target
# FIXME: doesn't handle case where we have some link text
</pre><pre class="diff" id="removed">- link_type_<span id="removedchars">proxy</span>(inline.target)
</pre><pre class="diff" id="added">+ link_type_<span id="addedchars">ref</span>(inline.target)
</pre><pre class="diff" id="context"> else
if inline.member =~ /\(/
target = "##{$`}"
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">as2api/trunk/as2api/lib/parse</span><br />
<div class="fileheader"><big><b>parser.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/lib/parse/parser.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/lib/parse/parser.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -47,7 +47,7 @@
</small></pre><pre class="diff" id="context"> # Array of Argument objects
attr_accessor :arguments
</pre><pre class="diff" id="removed">- # <span id="removedchars">TypeProxy</span> for return type, or nil if none specified
</pre><pre class="diff" id="added">+ # <span id="addedchars">array of IdentifierToken</span> for return type, or nil if none specified
</pre><pre class="diff" id="context"> attr_accessor :return_type
# nil, for nornal methods; "get" or "set" for implicit-property access
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname">as2api/trunk/as2api/test</span><br />
<div class="fileheader"><big><b>tc_doc_comment.rb</b></big> <small id="info">368 -> 369</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/test/tc_doc_comment.rb 2006-04-03 21:24:25 UTC (rev 368)
+++ trunk/as2api/test/tc_doc_comment.rb 2006-04-03 21:45:41 UTC (rev 369)
@@ -51,9 +51,9 @@
</small></pre><pre class="diff" id="context"> comment_data = parse_it(text)
assert(comment_data.has_seealso?, "should have @see tag")
expected = SeeBlockTag.new
</pre><pre class="diff" id="removed">- type_proxy = TypeProxy.new(nil, "foo")
- type_proxy.lineno=2
- link = LinkTag.new(2, type_proxy, nil, "bar\n blat\n")
</pre><pre class="diff" id="added">+ type_ref = TypeRef.new(nil, "foo")
+ type_ref.lineno=2
+ link = LinkTag.new(2, type_ref, nil, "bar\n blat\n")
</pre><pre class="diff" id="context"> link.lineno=2
expected.add_inline(link)
assert_equal(expected, comment_data[1])
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>