<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;}
#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 {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="4">Commit in <b><tt>trunk/as2api</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">api_loader.rb</a></tt></td><td align="right" id="added">+13</td><td align="right" id="removed">-19</td><td nowrap="nowrap" align="center">289 -> 290</td></tr>
<tr class="alt"><td><tt><a href="#file2">api_model.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">289 -> 290</td></tr>
<tr><td><tt><a href="#file3">doc_comment.rb</a></tt></td><td align="right" id="added">+26</td><td align="right" id="removed">-26</td><td nowrap="nowrap" align="center">289 -> 290</td></tr>
<tr class="alt"><td><tt>localisation/xliff/<a href="#file4">translation_loader.rb</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center">289 -> 290</td></tr>
<tr><td><tt><a href="#file5">tc_doc_comment.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">289 -> 290</td></tr>
<tr><td></td><td align="right" id="added">+47</td><td align="right" id="removed">-53</td><td></td></tr>
</table>
<small id="info">5 modified files</small><br />
<pre class="comment">
Per TODO comment, fix dodgy class name, and names of vars referencing instances
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>api_loader.rb</b></big> <small id="info">289 -> 290</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_loader.rb 2006-03-07 23:01:55 UTC (rev 289)
+++ trunk/as2api/api_loader.rb 2006-03-07 23:16:51 UTC (rev 290)
@@ -135,20 +135,20 @@
</small></pre><pre class="diff" id="context">
def start_class(dynamic, name, super_name, interfaces)
@defined_type = ASClass.new(name)
</pre><pre class="diff" id="removed">- @type_resolver = LocalTypeResolver.new(@defined_type)
</pre><pre class="diff" id="added">+ @type_namespace = TypeLocalNamespace.new(@defined_type)
</pre><pre class="diff" id="context"> if @doc_comment
@defined_type.comment = parse_comment(@type_comment_config, @doc_comment)
end
@defined_type.dynamic = dynamic
if super_name
</pre><pre class="diff" id="removed">- @defined_type.extends = @type_<span id="removedchars">resolver</span>.resolve(super_name)
</pre><pre class="diff" id="added">+ @defined_type.extends = @type_<span id="addedchars">namespace</span>.resolve(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_<span id="removedchars">resolver</span>.resolve(interface))
</pre><pre class="diff" id="added">+ @defined_type.add_interface(@type_<span id="addedchars">namespace</span>.resolve(interface))
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- @defined_type.type_resolver = @type_resolver
</pre><pre class="diff" id="added">+ @defined_type.type_namespace = @type_namespace
</pre><pre class="diff" id="context"> @defined_type.import_list = @import_list
end
</pre><pre class="diff"><small id="info">@@ -159,14 +159,14 @@
</small></pre><pre class="diff" id="context">
def start_interface(name, super_name)
@defined_type = ASInterface.new(name)
</pre><pre class="diff" id="removed">- @type_resolver = LocalTypeResolver.new(@defined_type)
</pre><pre class="diff" id="added">+ @type_namespace = TypeLocalNamespace.new(@defined_type)
</pre><pre class="diff" id="context"> if @doc_comment
@defined_type.comment = parse_comment(@type_comment_config, @doc_comment)
end
if super_name
</pre><pre class="diff" id="removed">- @defined_type.extends = @type_<span id="removedchars">resolver</span>.resolve(super_name)
</pre><pre class="diff" id="added">+ @defined_type.extends = @type_<span id="addedchars">namespace</span>.resolve(super_name)
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">- @defined_type.type_resolver = @type_resolver
</pre><pre class="diff" id="added">+ @defined_type.type_namespace = @type_namespace
</pre><pre class="diff" id="context"> @defined_type.import_list = @import_list
end
</pre><pre class="diff"><small id="info">@@ -189,7 +189,7 @@
</small></pre><pre class="diff" id="context"> def start_member_field(name, type)
field = ASExplicitField.new(@defined_type, @last_modifier, name.body)
unless type.nil?
</pre><pre class="diff" id="removed">- field.field_type = @type_<span id="removedchars">resolver</span>.resolve(type)
</pre><pre class="diff" id="added">+ field.field_type = @type_<span id="addedchars">namespace</span>.resolve(type)
</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">@@ -218,12 +218,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_<span id="removedchars">resolver</span>.resolve(sig.return_type)
</pre><pre class="diff" id="added">+ method.return_type = @type_<span id="addedchars">namespace</span>.resolve(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_<span id="removedchars">resolver</span>.resolve(arg.type)
</pre><pre class="diff" id="added">+ argument.arg_type = @type_<span id="addedchars">namespace</span>.resolve(arg.type)
</pre><pre class="diff" id="context"> end
method.add_arg(argument)
end
</pre><pre class="diff"><small id="info">@@ -266,7 +266,7 @@
</small></pre><pre class="diff" id="context"> lexer = ActionScript::ParseDoc::DocCommentLexer.new(input)
lexer.source = @source
parser = ActionScript::ParseDoc::DocCommentParser.new(lexer)
</pre><pre class="diff" id="removed">- handler = OurDocCommentHandler.new(comment_data, config, @type_<span id="removedchars">resolver</span>)
</pre><pre class="diff" id="added">+ handler = OurDocCommentHandler.new(comment_data, config, @type_<span id="addedchars">namespace</span>)
</pre><pre class="diff" id="context"> parser.handler = handler
parser.parse_comment
</pre><pre class="diff"><small id="info">@@ -357,12 +357,7 @@
</small></pre><pre class="diff" id="context"> # Resolves type names to instances of TypeProxy for a particular compilation
# unit (the same name could refer to different types in different compilation
# units).
</pre><pre class="diff" id="removed">-class LocalTypeResolver
- # TODO: This class actually implements a namespace, so maybe should be
- # renamed as such. Also, in as much as the TypeProxy objects this
- # class supplies *aren't* resolved yet, this class is completely
- # mis-named.
-
</pre><pre class="diff" id="added">+class TypeLocalNamespace
</pre><pre class="diff" id="context"> def initialize(containing_type)
@containing_type = containing_type
@named_types = {}
</pre><pre class="diff"><small id="info">@@ -451,8 +446,7 @@
</small></pre><pre class="diff" id="context"> local_namespace[type.unqualified_name] = type
import_types_into_namespace(type, local_namespace)
import_packages_into_namespace(type, local_namespace)
</pre><pre class="diff" id="removed">- resolver = type.type_resolver
- resolver.each do |type_proxy|
</pre><pre class="diff" id="added">+ type.type_namespace.each do |type_proxy|
</pre><pre class="diff" id="context"> real_type = local_namespace[type_proxy.local_name]
unless real_type
real_type = maybe_parse_external_definition(type_proxy)
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>api_model.rb</b></big> <small id="info">289 -> 290</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_model.rb 2006-03-07 23:01:55 UTC (rev 289)
+++ trunk/as2api/api_model.rb 2006-03-07 23:16:51 UTC (rev 290)
@@ -31,13 +31,13 @@
</small></pre><pre class="diff" id="context"> @constructor = nil
@extends = nil
@comment = nil
</pre><pre class="diff" id="removed">- @type_resolver = nil
</pre><pre class="diff" id="added">+ @type_namespace = nil
</pre><pre class="diff" id="context"> @import_list = nil
@input_file = nil
@document = true
end
</pre><pre class="diff" id="removed">- attr_accessor :package, :extends, :comment, :source_utf8, :type_<span id="removedchars">resolver</span>, :import_list, :intrinsic, :constructor
</pre><pre class="diff" id="added">+ attr_accessor :package, :extends, :comment, :source_utf8, :type_<span id="addedchars">namespace</span>, :import_list, :intrinsic, :constructor
</pre><pre class="diff" id="context">
def input_filename
@input_file.suffix
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>doc_comment.rb</b></big> <small id="info">289 -> 290</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/doc_comment.rb 2006-03-07 23:01:55 UTC (rev 289)
+++ trunk/as2api/doc_comment.rb 2006-03-07 23:16:51 UTC (rev 290)
@@ -112,10 +112,10 @@
</small></pre><pre class="diff" id="context"> end
class OurDocCommentHandler < ActionScript::ParseDoc::DocCommentHandler
</pre><pre class="diff" id="removed">- def initialize(comment_data, handler_config, type_<span id="removedchars">resolver</span>)
</pre><pre class="diff" id="added">+ def initialize(comment_data, handler_config, type_<span id="addedchars">namespace</span>)
</pre><pre class="diff" id="context"> @comment_data = comment_data
@handler_config = handler_config
</pre><pre class="diff" id="removed">- @type_resolver = type_resolver
</pre><pre class="diff" id="added">+ @type_namespace = type_namespace
</pre><pre class="diff" id="context"> end
def comment_start(lineno)
</pre><pre class="diff"><small id="info">@@ -144,7 +144,7 @@
</small></pre><pre class="diff" id="context">
def start_inline_tag(tag)
@inline_handler = @block_handler.handler_for(tag)
</pre><pre class="diff" id="removed">- @inline_handler.start(@type_<span id="removedchars">resolver</span>, tag.lineno)
</pre><pre class="diff" id="added">+ @inline_handler.start(@type_<span id="addedchars">namespace</span>, tag.lineno)
</pre><pre class="diff" id="context"> end
def end_inline_tag
</pre><pre class="diff"><small id="info">@@ -156,7 +156,7 @@
</small></pre><pre class="diff" id="context"> private
def beginning_of_block(lineno)
</pre><pre class="diff" id="removed">- @block_handler.begin_block(@type_<span id="removedchars">resolver</span>, lineno)
</pre><pre class="diff" id="added">+ @block_handler.begin_block(@type_<span id="addedchars">namespace</span>, lineno)
</pre><pre class="diff" id="context"> end
def end_of_block
</pre><pre class="diff"><small id="info">@@ -294,8 +294,8 @@
</small></pre><pre class="diff" id="context">
class InlineParser
</pre><pre class="diff" id="removed">- def start(type_resolver, lineno)
- @type_resolver = type_resolver
</pre><pre class="diff" id="added">+ def start(type_namespace, lineno)
+ @type_namespace = type_namespace
</pre><pre class="diff" id="context"> @lineno = lineno
@text = ""
end
</pre><pre class="diff"><small id="info">@@ -307,7 +307,7 @@
</small></pre><pre class="diff" id="context">
# creates a LinkTag inline
</pre><pre class="diff" id="removed">-def create_link(type_<span id="removedchars">resolver</span>, text, lineno)
</pre><pre class="diff" id="added">+def create_link(type_<span id="addedchars">namespace</span>, text, lineno)
</pre><pre class="diff" id="context"> if text =~ /^\s*([^\s]+(?:\([^\)]*\))?)\s*/
target = $1
text = $'
</pre><pre class="diff"><small id="info">@@ -323,7 +323,7 @@
</small></pre><pre class="diff" id="context"> if type_name == ""
type_proxy = nil
else
</pre><pre class="diff" id="removed">- type_proxy = type_<span id="removedchars">resolver</span>.resolve(type_name, lineno)
</pre><pre class="diff" id="added">+ type_proxy = type_<span id="addedchars">namespace</span>.resolve(type_name, lineno)
</pre><pre class="diff" id="context"> end
return LinkTag.new(lineno, type_proxy, member_name, text)
end
</pre><pre class="diff"><small id="info">@@ -334,7 +334,7 @@
</small></pre><pre class="diff" id="context"> # handle {@link ...} in comments
class LinkInlineParser < InlineParser
def end
</pre><pre class="diff" id="removed">- link = create_link(@type_<span id="removedchars">resolver</span>, @text, @lineno)
</pre><pre class="diff" id="added">+ link = create_link(@type_<span id="addedchars">namespace</span>, @text, @lineno)
</pre><pre class="diff" id="context"> if link.nil?
"{@link #{@text}}"
else
</pre><pre class="diff"><small id="info">@@ -357,8 +357,8 @@
</small></pre><pre class="diff" id="context">
attr_accessor :handler
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- @type_resolver = type_resolver
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ @type_namespace = type_namespace
</pre><pre class="diff" id="context"> @lineno = lineno
end
</pre><pre class="diff"><small id="info">@@ -409,8 +409,8 @@
</small></pre><pre class="diff" id="context"> NIL_INLINE_PARSER = NilInlineParser.new
class ParamParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = ParamBlockTag.new
end
</pre><pre class="diff"><small id="info">@@ -426,8 +426,8 @@
</small></pre><pre class="diff" id="context">
class ThrowsParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = ThrowsBlockTag.new
end
</pre><pre class="diff"><small id="info">@@ -435,7 +435,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_<span id="removedchars">resolver</span>.resolve($1)
</pre><pre class="diff" id="added">+ @data.exception_type = @type_<span id="addedchars">namespace</span>.resolve($1)
</pre><pre class="diff" id="context"> @data
else
nil
</pre><pre class="diff"><small id="info">@@ -445,24 +445,24 @@
</small></pre><pre class="diff" id="context">
class ReturnParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = ReturnBlockTag.new
end
end
class DescriptionParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = BlockTag.new
end
end
class SeeParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = SeeBlockTag.new
end
</pre><pre class="diff"><small id="info">@@ -475,7 +475,7 @@
</small></pre><pre class="diff" id="context"> # HTML entry
else
# 'link' entry
</pre><pre class="diff" id="removed">- link = create_link(@type_<span id="removedchars">resolver</span>, @data.inlines.first, @lineno)
</pre><pre class="diff" id="added">+ link = create_link(@type_<span id="addedchars">namespace</span>, @data.inlines.first, @lineno)
</pre><pre class="diff" id="context"> unless link.nil?
@data.inlines[0] = link
end
</pre><pre class="diff"><small id="info">@@ -486,14 +486,14 @@
</small></pre><pre class="diff" id="context">
class OverloadParser < BlockParser
</pre><pre class="diff" id="removed">- def begin_block(type_resolver, lineno)
- super(type_resolver, lineno)
</pre><pre class="diff" id="added">+ def begin_block(type_namespace, lineno)
+ super(type_namespace, lineno)
</pre><pre class="diff" id="context"> @data = OverloadBlockTag.new
end
def end_block
if @data.inlines.first =~ /\A\s*(#.*)/
</pre><pre class="diff" id="removed">- link = create_link(@type_<span id="removedchars">resolver</span>, $1, @lineno)
</pre><pre class="diff" id="added">+ link = create_link(@type_<span id="addedchars">namespace</span>, $1, @lineno)
</pre><pre class="diff" id="context"> unless link.nil?
@data.inlines[0] = link
end
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">trunk/as2api/localisation/xliff</span><br />
<div class="fileheader"><big><b>translation_loader.rb</b></big> <small id="info">289 -> 290</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/localisation/xliff/translation_loader.rb 2006-03-07 23:01:55 UTC (rev 289)
+++ trunk/as2api/localisation/xliff/translation_loader.rb 2006-03-07 23:16:51 UTC (rev 290)
@@ -10,15 +10,15 @@
</small></pre><pre class="diff" id="context"> end
class LinkPhHandler
</pre><pre class="diff" id="removed">- def initialize(block, type_<span id="removedchars">resolver</span>)
</pre><pre class="diff" id="added">+ def initialize(block, type_<span id="addedchars">namespace</span>)
</pre><pre class="diff" id="context"> @block = block
</pre><pre class="diff" id="removed">- @type_resolver = type_resolver
</pre><pre class="diff" id="added">+ @type_namespace = type_namespace
</pre><pre class="diff" id="context"> end
def start_ph; @text=@ph_text=""; @sub_text="" end
def end_ph;
@ph_text =~ /^([^#\s]+)(?:#([^\s]+))?/
if $1
</pre><pre class="diff" id="removed">- target = @type_<span id="removedchars">resolver</span>.resolve($1)
</pre><pre class="diff" id="added">+ target = @type_<span id="addedchars">namespace</span>.resolve($1)
</pre><pre class="diff" id="context"> else
target = nil
end
</pre><pre class="diff"><small id="info">@@ -154,7 +154,7 @@
</small></pre><pre class="diff" id="context"> when "code"
return CodePhHandler.new(@current_block)
when "link"
</pre><pre class="diff" id="removed">- return LinkPhHandler.new(@current_block, @current_type.type_<span id="removedchars">resolver</span>)
</pre><pre class="diff" id="added">+ return LinkPhHandler.new(@current_block, @current_type.type_<span id="addedchars">namespace</span>)
</pre><pre class="diff" id="context"> else
raise "unhandled placeholder id #{id.inspect}"
end
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>tc_doc_comment.rb</b></big> <small id="info">289 -> 290</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/tc_doc_comment.rb 2006-03-07 23:01:55 UTC (rev 289)
+++ trunk/as2api/tc_doc_comment.rb 2006-03-07 23:16:51 UTC (rev 290)
@@ -81,8 +81,8 @@
</small></pre><pre class="diff" id="context"> parser = ActionScript::ParseDoc::DocCommentParser.new(lexer)
parse_conf_build = ConfigBuilder.new
config = parse_conf_build.build_method_config
</pre><pre class="diff" id="removed">- type_resolver = LocalTypeResolver.new(nil)
- handler = OurDocCommentHandler.new(comment_data, config, type_resolver)
</pre><pre class="diff" id="added">+ type_namespace = TypeLocalNamespace.new(nil)
+ handler = OurDocCommentHandler.new(comment_data, config, type_namespace)
</pre><pre class="diff" id="context"> parser.handler = handler
parser.parse_comment
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.11</small></center>
</body></html>