<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">+41</td><td align="right" id="removed">-41</td><td nowrap="nowrap" align="center">294 -> 295</td></tr>
<tr class="alt"><td><tt><a href="#file2">api_model.rb</a></tt></td><td align="right" id="added">+8</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">294 -> 295</td></tr>
<tr><td></td><td align="right" id="added">+49</td><td align="right" id="removed">-49</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Rename variables called 'type' to avoid possible conflicts with inbuilt Ruby method of the same name
</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">294 -> 295</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_loader.rb 2006-03-08 00:16:03 UTC (rev 294)
+++ trunk/as2api/api_loader.rb 2006-03-08 00:42:11 UTC (rev 295)
@@ -36,10 +36,10 @@
</small></pre><pre class="diff" id="context"> File.open(File.join(file.prefix, file.suffix)) do |io|
begin
is_utf8 = detect_bom?(io)
</pre><pre class="diff" id="removed">- type = simple_parse(io, file.suffix)
- type.input_file = file
- type.source_utf8 = is_utf8
- return type
</pre><pre class="diff" id="added">+ astype = simple_parse(io, file.suffix)
+ astype.input_file = file
+ astype.source_utf8 = is_utf8
+ return astype
</pre><pre class="diff" id="context"> rescue =>e
$stderr.puts "#{file.suffix}: #{e.message}\n#{e.backtrace.join("\n")}"
end
</pre><pre class="diff"><small id="info">@@ -186,10 +186,10 @@
</small></pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- def start_member_field(name, type)
</pre><pre class="diff" id="added">+ def start_member_field(name, <span id="addedchars">as</span>type)
</pre><pre class="diff" id="context"> field = ASExplicitField.new(@defined_type, @last_modifier, name.body)
</pre><pre class="diff" id="removed">- unless type.nil?
- field.field_type = @type_namespace.resolve(type)
</pre><pre class="diff" id="added">+ unless astype.nil?
+ field.field_type = @type_namespace.resolve(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">@@ -369,18 +369,18 @@
</small></pre><pre class="diff" id="context"> lineno = name.first.lineno
name = name.join(".")
end
</pre><pre class="diff" id="removed">- type = @named_types[name]
- if type.nil?
- type = TypeProxy.new(@containing_type, name)
- type.lineno = lineno
- @named_types[name] = type
</pre><pre class="diff" id="added">+ 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="context"> end
</pre><pre class="diff" id="removed">- type
</pre><pre class="diff" id="added">+ <span id="addedchars">as</span>type
</pre><pre class="diff" id="context"> end
def each
</pre><pre class="diff" id="removed">- @named_types.each_value do |type|
- yield type
</pre><pre class="diff" id="added">+ @named_types.each_value do |astype|
+ yield astype
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -398,21 +398,21 @@
</small></pre><pre class="diff" id="context"> @packages = {}
end
</pre><pre class="diff" id="removed">- def add_type(type)
- @types << type
- package_name = type.package_name
</pre><pre class="diff" id="added">+ def add_type(astype)
+ @types << astype
+ package_name = astype.package_name
</pre><pre class="diff" id="context"> package = @packages[package_name]
if package.nil?
package = ASPackage.new(package_name)
@packages[package_name] = package
end
</pre><pre class="diff" id="removed">- type.package = package
- package.add_type(type)
</pre><pre class="diff" id="added">+ astype.package = package
+ package.add_type(astype)
</pre><pre class="diff" id="context"> end
def each_type
</pre><pre class="diff" id="removed">- @types.each do |type|
- yield type
</pre><pre class="diff" id="added">+ @types.each do |astype|
+ yield astype
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -456,28 +456,28 @@
</small></pre><pre class="diff" id="context"> end
def add_fully_qualified_types_to_namespace(ns, type_aggregator)
</pre><pre class="diff" id="removed">- type_aggregator.each_type do |type|
- ns[type.qualified_name] = type
</pre><pre class="diff" id="added">+ type_aggregator.each_type do |astype|
+ ns[astype.qualified_name] = astype
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- def create_local_namespace(global_ns, type_aggregator, type)
</pre><pre class="diff" id="added">+ def create_local_namespace(global_ns, type_aggregator, <span id="addedchars">as</span>type)
</pre><pre class="diff" id="context"> ns = global_ns.dup
</pre><pre class="diff" id="removed">- ns[type.unqualified_name] = type
- import_types_into_namespace(type, ns)
- import_packages_into_namespace(type_aggregator, type, ns)
</pre><pre class="diff" id="added">+ ns[astype.unqualified_name] = astype
+ import_types_into_namespace(astype, ns)
+ import_packages_into_namespace(type_aggregator, astype, ns)
</pre><pre class="diff" id="context"> ns
end
def resolve_each_type(global_ns, type_aggregator)
</pre><pre class="diff" id="removed">- type_aggregator.each_type do |type|
- local_ns = create_local_namespace(global_ns, type_aggregator, type)
- resolve_type_proxies(local_ns, type)
</pre><pre class="diff" id="added">+ type_aggregator.each_type do |astype|
+ local_ns = create_local_namespace(global_ns, type_aggregator, astype)
+ resolve_type_proxies(local_ns, astype)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">- def resolve_type_proxies(local_ns, type)
- type.type_namespace.each do |type_proxy|
</pre><pre class="diff" id="added">+ def resolve_type_proxies(local_ns, astype)
+ astype.type_namespace.each do |type_proxy|
</pre><pre class="diff" id="context"> real_type = local_ns[type_proxy.local_name]
unless real_type
real_type = maybe_parse_external_definition(type_proxy)
</pre><pre class="diff"><small id="info">@@ -485,28 +485,28 @@
</small></pre><pre class="diff" id="context"> if real_type
type_proxy.resolved_type = real_type
else
</pre><pre class="diff" id="removed">- $stderr.puts "#{type.input_filename}:#{type_proxy.lineno}: Found no definition of type known locally as #{type_proxy.local_name.inspect}"
</pre><pre class="diff" id="added">+ $stderr.puts "#{<span id="addedchars">as</span>type.input_filename}:#{type_proxy.lineno}: Found no definition of type known locally as #{type_proxy.local_name.inspect}"
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff" id="removed">- def import_types_into_namespace(type, local_namespace)
- type.import_list.each_type do |type_name|
</pre><pre class="diff" id="added">+ def import_types_into_namespace(astype, local_namespace)
+ astype.import_list.each_type do |type_name|
</pre><pre class="diff" id="context"> import_type = local_namespace[type_name.join(".")]
</pre><pre class="diff" id="removed">- import_type = maybe_parse_external_definition(TypeProxy.new(type, type_name.join('.'))) unless import_type
</pre><pre class="diff" id="added">+ import_type = maybe_parse_external_definition(TypeProxy.new(<span id="addedchars">as</span>type, 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" id="removed">- $stderr.puts "#{type.input_filename}:#{type_name.first.lineno}: Couldn't resolve import of #{type_name.join(".").inspect}"
</pre><pre class="diff" id="added">+ $stderr.puts "#{<span id="addedchars">as</span>type.input_filename}:#{type_name.first.lineno}: Couldn't resolve import of #{type_name.join(".").inspect}"
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff" id="removed">- def import_packages_into_namespace(type_aggregator, type, local_namespace)
- type.import_list.each_package do |package_name|
</pre><pre class="diff" id="added">+ def import_packages_into_namespace(type_aggregator, astype, local_namespace)
+ astype.import_list.each_package do |package_name|
</pre><pre class="diff" id="context"> type_aggregator.package(package_name.join(".")).each_type do|package_type|
if local_namespace.has_key?(package_type.unqualified_name)
</pre><pre class="diff" id="removed">- $stderr.puts "#{type.input_filename}: #{package_type.unqualified_name} already refers to #{local_namespace[package_type.unqualified_name].qualified_name}"
</pre><pre class="diff" id="added">+ $stderr.puts "#{<span id="addedchars">as</span>type.input_filename}: #{package_type.unqualified_name} already refers to #{local_namespace[package_type.unqualified_name].qualified_name}"
</pre><pre class="diff" id="context"> end
local_namespace[package_type.unqualified_name] = package_type
end
</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">294 -> 295</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_model.rb 2006-03-08 00:16:03 UTC (rev 294)
+++ trunk/as2api/api_model.rb 2006-03-08 00:42:11 UTC (rev 295)
@@ -400,8 +400,8 @@
</small></pre><pre class="diff" id="context">
attr_accessor :name
</pre><pre class="diff" id="removed">- def add_type(type)
- @types << type
</pre><pre class="diff" id="added">+ def add_type(astype)
+ @types << astype
</pre><pre class="diff" id="context"> end
def types
</pre><pre class="diff"><small id="info">@@ -409,23 +409,23 @@
</small></pre><pre class="diff" id="context"> end
def each_type
</pre><pre class="diff" id="removed">- @types.each do |type|
- yield type
</pre><pre class="diff" id="added">+ @types.each do |astype|
+ yield astype
</pre><pre class="diff" id="context"> end
end
def classes
result = []
</pre><pre class="diff" id="removed">- each_type do |type|
- result << type if type.instance_of?(ASClass)
</pre><pre class="diff" id="added">+ each_type do |astype|
+ result << astype if astype.instance_of?(ASClass)
</pre><pre class="diff" id="context"> end
result
end
def interfaces
result = []
</pre><pre class="diff" id="removed">- each_type do |type|
- result << type if type.instance_of?(ASInterface)
</pre><pre class="diff" id="added">+ each_type do |astype|
+ result << astype if astype.instance_of?(ASInterface)
</pre><pre class="diff" id="context"> end
result
end
</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>