$MH_Link\n";
my $MM_Link = "0";
- $MM_Link = "$M_Problems_Medium" if($M_Problems_Medium>0);
+ $MM_Link = "$M_Problems_Medium" if($M_Problems_Medium>0);
$META_DATA .= "method_problems_medium:$M_Problems_Medium;";
- $Problem_Summary .= "| Medium | $MM_Link
";
+ $Problem_Summary .= "| Medium | $MM_Link
\n";
my $ML_Link = "0";
- $ML_Link = "$M_Problems_Low" if($M_Problems_Low>0);
+ $ML_Link = "$M_Problems_Low" if($M_Problems_Low>0);
$META_DATA .= "method_problems_low:$M_Problems_Low;";
- $Problem_Summary .= "| Low | $ML_Link
";
+ $Problem_Summary .= "| Low | $ML_Link
\n";
# Safe Changes
if($T_Other)
{
- my $TS_Link = "$T_Other";
+ my $TS_Link = "$T_Other";
$Problem_Summary .= "Other Changes
in Data Types | - | $TS_Link
|---|
\n";
}
@@ -3761,5 +2607,5 @@
if($M_Other)
{
- my $MS_Link = "$M_Other";
+ my $MS_Link = "$M_Other";
$Problem_Summary .= "Other Changes
in Methods | - | $MS_Link
|---|
\n";
}
@@ -3790,8 +2636,8 @@
}
-sub get_Anchor($$$)
+sub getAnchor($$$)
{
my ($Kind, $Level, $Severity) = @_;
- if($JoinReport)
+ if($In::Opt{"JoinReport"})
{
if($Severity eq "Safe") {
@@ -3813,7 +2659,7 @@
}
-sub get_Report_Added($)
-{
- if($ShortMode) {
+sub getReportAdded($)
+{
+ if($In::Opt{"ShortMode"}) {
return "";
}
@@ -3828,5 +2674,5 @@
{
my $ArchiveName = $MethodInfo{2}{$Method}{"Archive"};
- my $ClassName = get_ShortName($MethodInfo{2}{$Method}{"Class"}, 2);
+ my $ClassName = getShortName($MethodInfo{2}{$Method}{"Class"}, 2);
if($Level eq "Source")
{
@@ -3854,5 +2700,5 @@
foreach my $NameSpace (sort keys(%NameSpace_Method))
{
- $ADDED_METHODS .= "$ArchiveName, ".htmlSpecChars($ShowClass).".class
\n";
+ $ADDED_METHODS .= "$ArchiveName, ".specChars($ShowClass).".class
\n";
if($NameSpace) {
@@ -3860,5 +2706,5 @@
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$ADDED_METHODS .= "";
}
@@ -3871,9 +2717,9 @@
my $Signature = undef;
- if($Compact) {
- $Signature = get_Signature($Method, 2, "Full|HTML|Simple");
+ if($In::Opt{"Compact"}) {
+ $Signature = getSignature($Method, 2, "Full|HTML|Simple");
}
else {
- $Signature = highLight_Signature_Italic_Color($Method, 2);
+ $Signature = highLight_ItalicColor($Method, 2);
}
@@ -3882,13 +2728,13 @@
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$ADDED_METHODS .= " ".$Signature."
\n";
}
else {
- $ADDED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."
\n".$ContentDivStart."[mangled: ".htmlSpecChars($Method)."]
".$ContentDivEnd."\n");
+ $ADDED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."
\n".$ContentDivStart."".specChars($Method)."
".$ContentDivEnd."\n");
}
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$ADDED_METHODS .= "
";
}
@@ -3902,8 +2748,8 @@
{
my $Anchor = "";
- if($JoinReport) {
+ if($In::Opt{"JoinReport"}) {
$Anchor = "";
}
- if($OldStyle) {
+ if($In::Opt{"OldStyle"}) {
$ADDED_METHODS = "Added Methods ($Added_Number)
\n".$ADDED_METHODS;
}
@@ -3916,7 +2762,7 @@
}
-sub get_Report_Removed($)
-{
- if($ShortMode) {
+sub getReportRemoved($)
+{
+ if($In::Opt{"ShortMode"}) {
return "";
}
@@ -3937,5 +2783,5 @@
}
my $ArchiveName = $MethodInfo{1}{$Method}{"Archive"};
- my $ClassName = get_ShortName($MethodInfo{1}{$Method}{"Class"}, 1);
+ my $ClassName = getShortName($MethodInfo{1}{$Method}{"Class"}, 1);
$MethodRemovedFromArchiveClass{$ArchiveName}{$ClassName}{$Method} = 1;
}
@@ -3958,5 +2804,5 @@
foreach my $NameSpace (sort keys(%NameSpace_Method))
{
- $REMOVED_METHODS .= "$ArchiveName, ".htmlSpecChars($ShowClass).".class
\n";
+ $REMOVED_METHODS .= "$ArchiveName, ".specChars($ShowClass).".class
\n";
if($NameSpace) {
@@ -3964,5 +2810,5 @@
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$REMOVED_METHODS .= "";
}
@@ -3975,9 +2821,9 @@
my $Signature = undef;
- if($Compact) {
- $Signature = get_Signature($Method, 1, "Full|HTML|Simple");
+ if($In::Opt{"Compact"}) {
+ $Signature = getSignature($Method, 1, "Full|HTML|Simple");
}
else {
- $Signature = highLight_Signature_Italic_Color($Method, 1);
+ $Signature = highLight_ItalicColor($Method, 1);
}
@@ -3986,13 +2832,13 @@
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$REMOVED_METHODS .= " ".$Signature."
\n";
}
else {
- $REMOVED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."
\n".$ContentDivStart."[mangled: ".htmlSpecChars($Method)."]
".$ContentDivEnd."\n");
+ $REMOVED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."
\n".$ContentDivStart."".specChars($Method)."
".$ContentDivEnd."\n");
}
}
- if($Compact) {
+ if($In::Opt{"Compact"}) {
$REMOVED_METHODS .= "
";
}
@@ -4005,8 +2851,8 @@
{
my $Anchor = "";
- if($JoinReport) {
+ if($In::Opt{"JoinReport"}) {
$Anchor = "";
}
- if($OldStyle) {
+ if($In::Opt{"OldStyle"}) {
$REMOVED_METHODS = "Removed Methods ($Removed_Number)
\n".$REMOVED_METHODS;
}
@@ -4019,5 +2865,150 @@
}
-sub get_Report_MethodProblems($$)
+sub readRules($)
+{
+ my $Kind = $_[0];
+ if(not -f $RULES_PATH{$Kind}) {
+ exitStatus("Module_Error", "can't access \'".$RULES_PATH{$Kind}."\'");
+ }
+ my $Content = readFile($RULES_PATH{$Kind});
+ while(my $Rule = parseTag(\$Content, "rule"))
+ {
+ my $RId = parseTag(\$Rule, "id");
+ my @Properties = ("Severity", "Change", "Effect", "Overcome", "Kind");
+ foreach my $Prop (@Properties) {
+ if(my $Value = parseTag(\$Rule, lc($Prop)))
+ {
+ $Value=~s/\n[ ]*//;
+ $CompatRules{$Kind}{$RId}{$Prop} = $Value;
+ }
+ }
+ if($CompatRules{$Kind}{$RId}{"Kind"}=~/\A(Methods|Parameters)\Z/) {
+ $CompatRules{$Kind}{$RId}{"Kind"} = "Methods";
+ }
+ else { # Types, Fields
+ $CompatRules{$Kind}{$RId}{"Kind"} = "Types";
+ }
+ }
+}
+
+sub addMarkup($)
+{
+ my $Content = $_[0];
+
+ # auto-markup
+ $Content=~s/\n[ ]*//; # spaces
+ $Content=~s!([2-9]\))!
$1!g; # 1), 2), ...
+ if($Content=~/\ANOTE:/)
+ { # notes
+ $Content=~s!(NOTE):!$1:!g;
+ }
+ else {
+ $Content=~s!(NOTE):!
$1:!g;
+ }
+
+ my @Keywords = (
+ "static",
+ "abstract",
+ "default",
+ "final",
+ "synchronized"
+ );
+
+ my $MKeys = join("|", @Keywords);
+ foreach (@Keywords) {
+ $MKeys .= "|non-".$_;
+ }
+
+ $Content=~s!(became\s*)($MKeys)([^\w-]|\Z)!$1$2$3!ig; # intrinsic types, modifiers
+
+ # Markdown
+ $Content=~s!\*\*([\w\-\@]+)\*\*!$1!ig;
+ $Content=~s!\*([\w\-]+)\*!$1!ig;
+
+ return $Content;
+}
+
+sub applyMacroses($$$$$)
+{
+ my ($Level, $Kind, $Content, $Problem, $AddAttr) = @_;
+
+ $Content = addMarkup($Content);
+
+ # macros
+ foreach my $Attr (sort {$b cmp $a} (keys(%{$Problem}), keys(%{$AddAttr})))
+ {
+ my $Macro = "\@".lc($Attr);
+ my $Value = undef;
+
+ if(defined $Problem->{$Attr}) {
+ $Value = $Problem->{$Attr};
+ }
+ else {
+ $Value = $AddAttr->{$Attr};
+ }
+
+ if(not defined $Value
+ or $Value eq "") {
+ next;
+ }
+
+ if(index($Content, $Macro)==-1) {
+ next;
+ }
+
+ if($Attr eq "Param_Pos") {
+ $Value = showPos($Value);
+ }
+
+ if($Attr eq "Invoked") {
+ $Value = blackName(specChars($Value));
+ }
+ elsif($Value=~/\s/) {
+ $Value = "".specChars($Value)."";
+ }
+ else
+ {
+ my $Fmt = "Class|HTML|Desc";
+
+ if($Attr ne "Invoked_By")
+ {
+ if($Attr eq "Method_Short"
+ or $Kind!~/Overridden|Moved_Up/) {
+ $Fmt = "HTML|Desc";
+ }
+ }
+
+ if(defined $MethodInfo{1}{$Value}
+ and defined $MethodInfo{1}{$Value}{"ShortName"}) {
+ $Value = blackName(getSignature($Value, 1, $Fmt));
+ }
+ elsif(defined $MethodInfo{2}{$Value}
+ and defined $MethodInfo{2}{$Value}{"ShortName"}) {
+ $Value = blackName(getSignature($Value, 2, $Fmt));
+ }
+ else
+ {
+ $Value = specChars($Value);
+ if($Attr ne "Type_Type") {
+ $Value = "".$Value."";
+ }
+ }
+ }
+ $Content=~s/\Q$Macro\E/$Value/g;
+ }
+
+ if($Content=~/(\A|[^\@\w])(\@\w+)/)
+ {
+ if(not $IncompleteRules{$Level}{$Kind})
+ { # only one warning
+ printMsg("WARNING", "incomplete $2 in the rule \"$Kind\" (\"$Level\")");
+ $IncompleteRules{$Level}{$Kind} = 1;
+ }
+ }
+
+ return $Content;
+}
+
+sub getReportMethodProblems($$)
{
my ($TargetSeverity, $Level) = @_;
@@ -4028,21 +3019,24 @@
{
my $ArchiveName = $MethodInfo{1}{$Method}{"Archive"};
- my $ClassName = get_ShortName($MethodInfo{1}{$Method}{"Class"}, 1);
+ my $ClassName = getShortName($MethodInfo{1}{$Method}{"Class"}, 1);
foreach my $Kind (sort keys(%{$CompatProblems{$Method}}))
{
- if($Kind eq "Added_Method"
- or $Kind eq "Removed_Method") {
- next;
- }
-
- if(my $Severity = $MethodProblems_Kind{$Level}{$Kind})
- {
- if($Severity ne $TargetSeverity) {
+ if($CompatRules{$Level}{$Kind}{"Kind"} eq "Methods")
+ {
+ if($Kind eq "Added_Method"
+ or $Kind eq "Removed_Method") {
next;
}
- $MethodChanges{$Method}{$Kind} = $CompatProblems{$Method}{$Kind};
- $ReportMap{$ArchiveName}{$ClassName}{$Method} = 1;
+ if(my $Severity = $CompatRules{$Level}{$Kind}{"Severity"})
+ {
+ if($Severity ne $TargetSeverity) {
+ next;
+ }
+
+ $MethodChanges{$Method}{$Kind} = $CompatProblems{$Method}{$Kind};
+ $ReportMap{$ArchiveName}{$ClassName}{$Method} = 1;
+ }
}
}
@@ -4063,5 +3057,5 @@
foreach my $NameSpace (sort keys(%NameSpace_Method))
{
- $METHOD_PROBLEMS .= "$ArchiveName, ".htmlSpecChars($ShowClass).".class
\n";
+ $METHOD_PROBLEMS .= "$ArchiveName, ".specChars($ShowClass).".class
\n";
if($NameSpace) {
$METHOD_PROBLEMS .= "package $NameSpace
\n";
@@ -4071,158 +3065,21 @@
foreach my $Method (@SortedMethods)
{
- my $ShortSignature = get_Signature($Method, 1, "Short");
- my $ClassName_Full = get_TypeName($MethodInfo{1}{$Method}{"Class"}, 1);
+ my %AddAttr = ();
+
+ $AddAttr{"Method_Short"} = $Method;
+ $AddAttr{"Class"} = getTypeName($MethodInfo{1}{$Method}{"Class"}, 1);
+
my $METHOD_REPORT = "";
my $ProblemNum = 1;
foreach my $Kind (sort keys(%{$MethodChanges{$Method}}))
{
- foreach my $Location (sort keys(%{$MethodChanges{$Method}{$Kind}}))
+ foreach my $Loc (sort keys(%{$MethodChanges{$Method}{$Kind}}))
{
- my %Problems = %{$MethodChanges{$Method}{$Kind}{$Location}};
+ my $ProblemAttr = $MethodChanges{$Method}{$Kind}{$Loc};
- my $Target = $Problems{"Target"};
-
- my ($Change, $Effect) = ("", "");
- my $Old_Value = htmlSpecChars($Problems{"Old_Value"});
- my $New_Value = htmlSpecChars($Problems{"New_Value"});
-
- if($Kind eq "Method_Became_Static")
+ if(my $Change = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Change"}, $ProblemAttr, \%AddAttr))
{
- $Change = "Method became static.\n";
- $Effect = "A client program may be interrupted by NoSuchMethodError exception.";
- }
- elsif($Kind eq "Method_Became_NonStatic")
- {
- $Change = "Method became non-static.\n";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchMethodError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: non-static method ".htmlSpecChars($ShortSignature)." cannot be referenced from a static context.";
- }
- }
- elsif($Kind eq "Changed_Method_Return_From_Void")
- {
- $Change = "Return value type has been changed from void to ".htmlSpecChars($New_Value).".\n";
- $Effect = "This method has been removed because the return type is part of the method signature.";
- }
- elsif($Kind eq "Static_Method_Became_Final")
- {# Source Only
- $Change = "Method became final.\n";
- $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." in client class C cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method is final.";
- }
- elsif($Kind eq "NonStatic_Method_Became_Final")
- {
- $Change = "Method became final.\n";
- if($Level eq "Binary") {
- $Effect = "A client program trying to reimplement this method may be interrupted by VerifyError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." in client class C cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method is final.";
- }
- }
- elsif($Kind eq "Method_Became_Abstract")
- {
- $Change = "Method became abstract.\n";
- if($Level eq "Binary") {
- $Effect = "A client program trying to create an instance of the method's class may be interrupted by InstantiationError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: A client class C is not abstract and does not override abstract method ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full).".";
- }
- }
- elsif($Kind eq "Method_Became_NonAbstract")
- {
- $Change = "Method became non-abstract.\n";
- if($Level eq "Binary") {
- $Effect = "A client program may change behavior.";
- }
- else {
- $Effect = "No effect.";
- }
- }
- elsif($Kind eq "Method_Became_Default")
- {
- $Change = "Method became default.\n";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "No effect.";
- }
- }
- elsif($Kind eq "Method_Became_NonDefault")
- {
- $Change = "Method became non-default.\n";
- if($Level eq "Binary") {
- $Effect = "A client program trying to create an instance of a class may be interrupted by AbstractMethodError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: A client class C is not abstract and does not override abstract method ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full).".";
- }
- }
- elsif($Kind eq "Method_Became_Synchronized")
- {
- $Change = "Method became synchronized.\n";
- $Effect = "A multi-threaded client program may change behavior.";
- }
- elsif($Kind eq "Method_Became_NonSynchronized")
- {
- $Change = "Method became non-synchronized.\n";
- $Effect = "A multi-threaded client program may change behavior.";
- }
- elsif($Kind eq "Changed_Method_Access")
- {
- $Change = "Access level has been changed from ".htmlSpecChars($Old_Value)." to ".htmlSpecChars($New_Value).".";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by IllegalAccessError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." has $New_Value access in ".htmlSpecChars($ClassName_Full).".";
- }
- }
- elsif($Kind eq "Abstract_Method_Added_Checked_Exception")
- {# Source Only
- $Change = "Added ".htmlSpecChars($Target)." exception thrown.\n";
- $Effect = "Recompilation of a client program may be terminated with the message: unreported exception ".htmlSpecChars($Target)." must be caught or declared to be thrown.";
- }
- elsif($Kind eq "NonAbstract_Method_Added_Checked_Exception")
- {
- $Change = "Added ".htmlSpecChars($Target)." exception thrown.\n";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by added exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: unreported exception ".htmlSpecChars($Target)." must be caught or declared to be thrown.";
- }
- }
- elsif($Kind eq "Abstract_Method_Removed_Checked_Exception")
- {# Source Only
- $Change = "Removed ".htmlSpecChars($Target)." exception thrown.\n";
- $Effect = "Recompilation of a client program may be terminated with the message: cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method does not throw ".htmlSpecChars($Target).".";
- }
- elsif($Kind eq "NonAbstract_Method_Removed_Checked_Exception")
- {
- $Change = "Removed ".htmlSpecChars($Target)." exception thrown.\n";
- if($Level eq "Binary") {
- $Effect = "A client program may change behavior because the removed exception will not be thrown any more and client will not catch and handle it.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method does not throw ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Added_Unchecked_Exception")
- {# Binary Only
- $Change = "Added ".htmlSpecChars($Target)." exception thrown.\n";
- $Effect = "A client program may be interrupted by added exception.";
- }
- elsif($Kind eq "Removed_Unchecked_Exception")
- {# Binary Only
- $Change = "Removed ".htmlSpecChars($Target)." exception thrown.\n";
- $Effect = "A client program may change behavior because the removed exception will not be thrown any more and client will not catch and handle it.";
- }
- if($Change)
- {
- $METHOD_REPORT .= "| $ProblemNum | ".$Change." | ".$Effect." |
|---|
\n";
+ my $Effect = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Effect"}, $ProblemAttr, \%AddAttr);
+ $METHOD_REPORT .= "\n| $ProblemNum | \n".$Change." | \n".$Effect." | \n
\n";
$ProblemNum += 1;
$ProblemsNum += 1;
@@ -4233,13 +3090,13 @@
if($METHOD_REPORT)
{
- my $ShowMethod = highLight_Signature_Italic_Color($Method, 1);
+ my $ShowMethod = highLight_ItalicColor($Method, 1);
if($NameSpace)
{
- $METHOD_REPORT = cut_Namespace($METHOD_REPORT, $NameSpace);
- $ShowMethod = cut_Namespace($ShowMethod, $NameSpace);
+ $METHOD_REPORT = cutNs($METHOD_REPORT, $NameSpace);
+ $ShowMethod = cutNs($ShowMethod, $NameSpace);
}
$METHOD_PROBLEMS .= $ContentSpanStart."[+] ".$ShowMethod;
- if($OldStyle) {
+ if($In::Opt{"OldStyle"}) {
$METHOD_PROBLEMS .= " ($ProblemNum)";
}
@@ -4250,6 +3107,6 @@
$METHOD_PROBLEMS .= $ContentDivStart;
- if(not $Compact) {
- $METHOD_PROBLEMS .= " [mangled: ".htmlSpecChars($Method)."]
\n";
+ if(not $In::Opt{"Compact"}) {
+ $METHOD_PROBLEMS .= "".specChars($Method)."
\n";
}
@@ -4272,5 +3129,5 @@
$Title = "Other Changes in Methods";
}
- if($OldStyle) {
+ if($In::Opt{"OldStyle"}) {
$METHOD_PROBLEMS = "$Title ($ProblemsNum)
\n".$METHOD_PROBLEMS;
}
@@ -4278,5 +3135,5 @@
$METHOD_PROBLEMS = "$Title $ProblemsNum
\n".$METHOD_PROBLEMS;
}
- $METHOD_PROBLEMS = "\n".$METHOD_PROBLEMS;
+ $METHOD_PROBLEMS = "\n".$METHOD_PROBLEMS;
$METHOD_PROBLEMS .= $TOP_REF."
\n";
}
@@ -4284,8 +3141,22 @@
}
-sub get_Report_TypeProblems($$)
+sub showType($$$)
+{
+ my ($Name, $Html, $LVer) = @_;
+ my $TType = $TypeInfo{$LVer}{$TName_Tid{$LVer}{$Name}}{"Type"};
+ if($Html) {
+ $Name = "".$TType." ".specChars($Name);
+ }
+ else {
+ $Name = $TType." ".$Name;
+ }
+ return $Name;
+}
+
+sub getReportTypeProblems($$)
{
my ($TargetSeverity, $Level) = @_;
my $TYPE_PROBLEMS = "";
+
my %ReportMap = ();
my %TypeChanges_Sev = ();
@@ -4297,14 +3168,12 @@
foreach my $Kind (keys(%{$TypeChanges{$Level}{$TypeName}}))
{
- my $Severity = $TypeProblems_Kind{$Level}{$Kind};
+ if($CompatRules{$Level}{$Kind}{"Severity"} ne $TargetSeverity) {
+ next;
+ }
- if($Severity ne $TargetSeverity) {
- next;
- }
-
- foreach my $Location (keys(%{$TypeChanges{$Level}{$TypeName}{$Kind}}))
+ foreach my $Loc (keys(%{$TypeChanges{$Level}{$TypeName}{$Kind}}))
{
$ReportMap{$ArchiveName}{$TypeName} = 1;
- $TypeChanges_Sev{$TypeName}{$Kind}{$Location} = $TypeChanges{$Level}{$TypeName}{$Kind}{$Location};
+ $TypeChanges_Sev{$TypeName}{$Kind}{$Loc} = $TypeChanges{$Level}{$TypeName}{$Kind}{$Loc};
}
}
@@ -4314,7 +3183,6 @@
foreach my $ArchiveName (sort {lc($a) cmp lc($b)} keys(%ReportMap))
{
- my ($HEADER_REPORT, %NameSpace_Type) = ();
- foreach my $TypeName (keys(%{$ReportMap{$ArchiveName}}))
- {
+ my %NameSpace_Type = ();
+ foreach my $TypeName (keys(%{$ReportMap{$ArchiveName}})) {
$NameSpace_Type{$TypeInfo{1}{$TName_Tid{1}{$TypeName}}{"Package"}}{$TypeName} = 1;
}
@@ -4326,11 +3194,13 @@
}
- my @SortedTypes = sort {lc($a) cmp lc($b)} keys(%{$NameSpace_Type{$NameSpace}});
+ my @SortedTypes = sort {lc(showType($a, 0, 1)) cmp lc(showType($b, 0, 1))} keys(%{$NameSpace_Type{$NameSpace}});
foreach my $TypeName (@SortedTypes)
{
my $TypeId = $TName_Tid{1}{$TypeName};
+
my $ProblemNum = 1;
my $TYPE_REPORT = "";
my (%Kinds_Locations, %Kinds_Target) = ();
+
foreach my $Kind (sort keys(%{$TypeChanges_Sev{$TypeName}}))
{
@@ -4345,475 +3215,29 @@
$Kinds_Target{$Kind}{$Target} = 1;
- my ($Change, $Effect) = ("", "");
- my %Problems = %{$TypeChanges_Sev{$TypeName}{$Kind}{$Location}};
+ my %AddAttr = ();
- my $Old_Value = $Problems{"Old_Value"};
- my $New_Value = $Problems{"New_Value"};
- my $Field_Type = $Problems{"Field_Type"};
- my $Field_Value = $Problems{"Field_Value"};
- my $Type_Type = $Problems{"Type_Type"};
-
- if($Kind eq "NonAbstract_Class_Added_Abstract_Method")
+ if($Kind=~/Method/)
{
- $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "This class became abstract and a client program may be interrupted by InstantiationError exception.";
+ if(defined $MethodInfo{1}{$Target} and $MethodInfo{1}{$Target}{"Name"})
+ {
+ $AddAttr{"Method_Short"} = $Target;
+ $AddAttr{"Class"} = getTypeName($MethodInfo{1}{$Target}{"Class"}, 1);
}
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 2, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2)).".";
+ elsif(defined $MethodInfo{2}{$Target} and $MethodInfo{2}{$Target}{"Name"})
+ {
+ $AddAttr{"Method_Short"} = $Target;
+ $AddAttr{"Class"} = getTypeName($MethodInfo{2}{$Target}{"Class"}, 2);
}
}
- elsif($Kind eq "Abstract_Class_Added_Abstract_Method")
+
+ my $ProblemAttr = $TypeChanges_Sev{$TypeName}{$Kind}{$Location};
+
+ if(my $Change = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Change"}, $ProblemAttr, \%AddAttr))
{
- $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 2, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2)).".";
- }
- }
- elsif($Kind eq "Abstract_Class_Added_Abstract_Method_Invoked_By_Others")
- {
- $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by AbstractMethodError exception. Added abstract method is called in 2nd library version by the method ".black_Name($Problems{"InvokedBy"}, 1)." and may not be implemented by old clients.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 2, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2)).".";
- }
- }
- elsif($Kind eq "Class_Removed_Abstract_Method"
- or $Kind eq "Interface_Removed_Abstract_Method")
- {
- $Change = "Abstract method ".black_Name($Target, 1)." has been removed from this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchMethodError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find method ".htmlSpecChars(get_Signature($Target, 1, "Short"))." in $Type_Type ".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1)).".";
- }
- }
- elsif($Kind eq "Interface_Added_Abstract_Method")
- {
- $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 2, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2)).".";
- }
- }
- elsif($Kind eq "Interface_Added_Abstract_Method_Invoked_By_Others")
- {
- $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by AbstractMethodError exception. Added abstract method is called in 2nd library version by the method ".black_Name($Problems{"InvokedBy"}, 1)." and may not be implemented by old clients.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 2, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2)).".";
- }
- }
- elsif($Kind eq "Class_Method_Became_Abstract")
- {
- $Change = "Method ".black_Name($Target, 1)." became abstract.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by InstantiationError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 1, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1)).".";
- }
- }
- elsif($Kind eq "Class_Method_Became_NonAbstract")
- {
- $Change = "Abstract method ".black_Name($Target, 1)." became non-abstract.";
- if($Level eq "Binary") {
- $Effect = "Some methods in this class may change behavior.";
- }
- else {
- $Effect = "No effect.";
- }
- }
- elsif($Kind eq "Interface_Method_Became_NonDefault")
- {
- $Change = "Method ".black_Name($Target, 1)." became non-default.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by AbstractMethodError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method ".htmlSpecChars(get_Signature($Target, 1, "Short"))." in ".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1)).".";
- }
- }
- elsif($Kind eq "Interface_Method_Became_Default")
- {
- $Change = "Method ".black_Name($Target, 1)." became default.";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "No effect.";
- }
- }
- elsif($Kind eq "Class_Overridden_Method")
- {
- $Change = "Method ".black_Name($Old_Value, 2)." has been overridden by ".black_Name($New_Value, 2);
- $Effect = "Method ".black_Name($New_Value, 2)." will be called instead of ".black_Name($Old_Value, 2)." in a client program.";
- }
- elsif($Kind eq "Class_Method_Moved_Up_Hierarchy")
- {
- $Change = "Method ".black_Name($Old_Value, 1)." has been moved up type hierarchy to ".black_Name($New_Value, 2);
- $Effect = "Method ".black_Name($New_Value, 2)." will be called instead of ".black_Name($Old_Value, 1)." in a client program.";
- }
- elsif($Kind eq "Abstract_Class_Added_Super_Interface")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary")
- {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Abstract_Class_Added_Super_Interface_Invoked_By_Others")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "If abstract methods from an added super-interface must be implemented by client then it may be interrupted by AbstractMethodError exception.
Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added super-interface is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Abstract_Class_Added_Super_Interface_With_Implemented_Methods")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- $Effect = "No effect.";
- }
- elsif($Kind eq "Interface_Added_Super_Interface")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Interface_Added_Super_Interface_Used_By_Others")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary")
- {
- $Effect = "If abstract methods from an added super-interface must be implemented by client then it may be interrupted by AbstractMethodError exception.
Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added super-interface is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Interface_Added_Super_Interface_With_Implemented_Methods")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "No effect.";
- }
- }
- elsif($Kind eq "Interface_Added_Super_Constant_Interface")
- {
- $Change = "Added super-interface ".htmlSpecChars($Target)." containing constants only.";
- if($Level eq "Binary") {
- $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from a super-class and cause IncompatibleClassChangeError exception.";
- }
- else {
- $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from a super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
- }
- }
- elsif($Kind eq "Interface_Removed_Super_Interface"
- or $Kind eq "Class_Removed_Super_Interface")
- {
- $Change = "Removed super-interface ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchMethodError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find method in $Type_Type ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Interface_Removed_Super_Constant_Interface")
- {
- $Change = "Removed super-interface ".htmlSpecChars($Target)." containing constants only.";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable in $Type_Type ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Added_Super_Class")
- {
- $Change = "Added super-class ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class and cause IncompatibleClassChangeError exception.";
- }
- else {
- $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
- }
- }
- elsif($Kind eq "Abstract_Class_Added_Super_Abstract_Class")
- {
- $Change = "Added abstract super-class ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Abstract_Class_Added_Super_Abstract_Class_Invoked_By_Others")
- {
- $Change = "Added abstract super-class ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "If abstract methods from an added super-class must be implemented by client then it may be interrupted by AbstractMethodError exception.
Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added abstract super-class is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in ".htmlSpecChars($Target).".";
- }
- }
- elsif($Kind eq "Removed_Super_Class")
- {
- $Change = "Removed super-class ".htmlSpecChars($Target).".";
- if($Level eq "Binary") {
- $Effect = "Access of a client program to the fields or methods of the old super-class may be interrupted by NoSuchFieldError or NoSuchMethodError exceptions.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable (or method) in ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Changed_Super_Class")
- {
- $Change = "Superclass has been changed from ".htmlSpecChars($Old_Value)." to ".htmlSpecChars($New_Value).".";
- if($Level eq "Binary") {
- $Effect = "1) Access of a client program to the fields or methods of the old super-class may be interrupted by NoSuchFieldError or NoSuchMethodError exceptions.
2) A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class and cause IncompatibleClassChangeError exception.";
- }
- else {
- $Effect = "1) Recompilation of a client program may be terminated with the message: cannot find variable (or method) in ".htmlSpecChars($TypeName).".
2) A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
- }
- }
- elsif($Kind eq "Class_Added_Field")
- {
- $Change = "Field $Target has been added to this class.";
- if($Level eq "Binary")
- {
- $Effect = "No effect.";
- # $Effect .= "
NOTE: A static field from a super-interface of a client class may hide an added field (with the same name) inherited from the super-class of a client class and cause IncompatibleClassChangeError exception.";
- }
- else
- {
- $Effect = "No effect.";
- # $Effect .= "
NOTE: A static field from a super-interface of a client class may hide an added field (with the same name) inherited from the super-class of a client class. Recompilation of a client class may be terminated with the message: reference to $Target is ambiguous.";
- }
- }
- elsif($Kind eq "Interface_Added_Field")
- {
- $Change = "Field $Target has been added to this interface.";
- if($Level eq "Binary") {
- $Effect = "No effect.
NOTE: An added static field from a super-interface of a client class may hide a field (with the same name) inherited from the super-class of a client class and cause IncompatibleClassChangeError exception.";
- }
- else {
- $Effect = "No effect.
NOTE: An added static field from a super-interface of a client class may hide a field (with the same name) inherited from the super-class of a client class. Recompilation of a client class may be terminated with the message: reference to $Target is ambiguous.";
- }
- }
- elsif($Kind eq "Renamed_Field")
- {
- $Change = "Field $Target has been renamed to ".htmlSpecChars($New_Value).".";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchFieldError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable $Target in ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Renamed_Constant_Field")
- {
- if($Level eq "Binary") {
- $Change = "Field $Target (".htmlSpecChars($Field_Type).") with the compile-time constant value $Field_Value has been renamed to ".htmlSpecChars($New_Value).".";
- $Effect = "A client program may change behavior.";
- }
- else {
- $Change = "Field $Target has been renamed to ".htmlSpecChars($New_Value).".";
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable $Target in ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Removed_NonConstant_Field")
- {
- $Change = "Field $Target of type ".htmlSpecChars($Field_Type)." has been removed from this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchFieldError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable $Target in ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Removed_Constant_Field")
- {
- $Change = "Field $Target (".htmlSpecChars($Field_Type).") with the compile-time constant value $Field_Value has been removed from this $Type_Type.";
- if($Level eq "Binary") {
- $Effect = "A client program may change behavior.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable $Target in ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Changed_Field_Type")
- {
- $Change = "Type of field $Target has been changed from ".htmlSpecChars($Old_Value)." to ".htmlSpecChars($New_Value).".";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoSuchFieldError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: incompatible types, found: ".htmlSpecChars($Old_Value).", required: ".htmlSpecChars($New_Value).".";
- }
- }
- elsif($Kind eq "Changed_Field_Access")
- {
- $Change = "Access level of field $Target has been changed from $Old_Value to $New_Value.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by IllegalAccessError exception.";
- }
- else
- {
- if($New_Value eq "package-private") {
- $Effect = "Recompilation of a client program may be terminated with the message: $Target is not public in ".htmlSpecChars($TypeName)."; cannot be accessed from outside package.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: $Target has $New_Value access in ".htmlSpecChars($TypeName).".";
- }
- }
- }
- elsif($Kind eq "Changed_Final_Field_Value")
- { # Binary Only
- $Change = "Value of final field $Target ($Field_Type) has been changed from ".htmlSpecChars($Old_Value)." to ".htmlSpecChars($New_Value).".";
- $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
- }
- elsif($Kind eq "Changed_Final_Version_Field_Value")
- { # Binary Only
- $Change = "Value of final field $Target ($Field_Type) has been changed from ".htmlSpecChars($Old_Value)." to ".htmlSpecChars($New_Value).".";
- $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
- }
- elsif($Kind eq "Field_Became_Final")
- {
- $Change = "Field $Target became final.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by IllegalAccessError exception when attempt to assign new values to the field.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot assign a value to final variable $Target.";
- }
- }
- elsif($Kind eq "Field_Became_NonFinal")
- { # Binary Only
- $Change = "Field $Target became non-final.";
- $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
- }
- elsif($Kind eq "NonConstant_Field_Became_Static")
- { # Binary Only
- $Change = "Non-final field $Target became static.";
- $Effect = "A client program may be interrupted by IncompatibleClassChangeError exception.";
- }
- elsif($Kind eq "NonConstant_Field_Became_NonStatic")
- {
- if($Level eq "Binary") {
- $Change = "Non-constant field $Target became non-static.";
- $Effect = "A client program may be interrupted by IncompatibleClassChangeError exception.";
- }
- else {
- $Change = "Field $Target became non-static.";
- $Effect = "Recompilation of a client program may be terminated with the message: non-static variable $Target cannot be referenced from a static context.";
- }
- }
- elsif($Kind eq "Constant_Field_Became_NonStatic")
- { # Source Only
- $Change = "Field $Target became non-static.";
- $Effect = "Recompilation of a client program may be terminated with the message: non-static variable $Target cannot be referenced from a static context.";
- }
- elsif($Kind eq "Class_Became_Interface")
- {
- $Change = "This class became interface.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by IncompatibleClassChangeError or InstantiationError exception dependent on the usage of this class.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($TypeName)." is abstract; cannot be instantiated.";
- }
- }
- elsif($Kind eq "Interface_Became_Class")
- {
- $Change = "This interface became class.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by IncompatibleClassChangeError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: interface expected.";
- }
- }
- elsif($Kind eq "Class_Became_Final")
- {
- $Change = "This class became final.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by VerifyError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot inherit from final ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Class_Became_Abstract")
- {
- $Change = "This class became abstract.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by InstantiationError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($TypeName)." is abstract; cannot be instantiated.";
- }
- }
- elsif($Kind eq "Removed_Class")
- {
- $Change = "This class has been removed.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoClassDefFoundError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find class ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Removed_Interface")
- {
- $Change = "This interface has been removed.";
- if($Level eq "Binary") {
- $Effect = "A client program may be interrupted by NoClassDefFoundError exception.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the message: cannot find class ".htmlSpecChars($TypeName).".";
- }
- }
- elsif($Kind eq "Removed_Annotation")
- {
- $Change = "This annotation type has been removed.";
- if($Level eq "Binary") {
- $Effect = "No effect.";
- }
- else {
- $Effect = "Recompilation of a client program may be terminated with the error message: cannot find symbol \@".htmlSpecChars($TypeName).".";
- }
- }
- if($Change)
- {
- $TYPE_REPORT .= "| $ProblemNum | ".$Change." | ".$Effect." |
|---|
\n";
+ my $Effect = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Effect"}, $ProblemAttr, \%AddAttr);
+
+ $TYPE_REPORT .= "\n| $ProblemNum | \n".$Change." | \n".$Effect." | \n
\n";
$ProblemNum += 1;
$ProblemsNum += 1;
- $Kinds_Locations{$Kind}{$Location} = 1;
}
}
@@ -4827,14 +3251,14 @@
}
- my $ShowType = $TypeName;
+ my $ShowType = showType($TypeName, 1, 1);
if($NameSpace)
{
- $TYPE_REPORT = cut_Namespace($TYPE_REPORT, $NameSpace);
- $ShowType = cut_Namespace($ShowType, $NameSpace);
- $Affected = cut_Namespace($Affected, $NameSpace);
+ $TYPE_REPORT = cutNs($TYPE_REPORT, $NameSpace);
+ $ShowType = cutNs($ShowType, $NameSpace);
+ $Affected = cutNs($Affected, $NameSpace);
}
- $TYPE_PROBLEMS .= $ContentSpanStart."[+] ".htmlSpecChars($ShowType);
- if($OldStyle) {
+ $TYPE_PROBLEMS .= $ContentSpanStart."[+] ".$ShowType;
+ if($In::Opt{"OldStyle"}) {
$TYPE_PROBLEMS .= " ($ProblemNum)";
}
@@ -4861,5 +3285,5 @@
$Title = "Other Changes in Data Types";
}
- if($OldStyle) {
+ if($In::Opt{"OldStyle"}) {
$TYPE_PROBLEMS = "$Title ($ProblemsNum)
\n".$TYPE_PROBLEMS;
}
@@ -4867,5 +3291,5 @@
$TYPE_PROBLEMS = "$Title $ProblemsNum
\n".$TYPE_PROBLEMS;
}
- $TYPE_PROBLEMS = "\n".$TYPE_PROBLEMS;
+ $TYPE_PROBLEMS = "\n".$TYPE_PROBLEMS;
$TYPE_PROBLEMS .= $TOP_REF."
\n";
}
@@ -4873,5 +3297,5 @@
}
-sub cut_Namespace($$)
+sub cutNs($$)
{
my ($N, $Ns) = @_;
@@ -4885,70 +3309,39 @@
my $LIMIT = 10;
- if(defined $AffectLimit) {
- $LIMIT = $AffectLimit;
- }
-
- my @Kinds = sort keys(%{$Kinds_Locations});
- my %KLocs = ();
- foreach my $Kind (@Kinds)
- {
- my @Locs = sort {$a=~/retval/ cmp $b=~/retval/} sort {length($a)<=>length($b)} sort keys(%{$Kinds_Locations->{$Kind}});
- $KLocs{$Kind} = \@Locs;
- }
-
- my %SymLocKind = ();
- foreach my $Method (sort keys(%{$TypeProblemsIndex{$Target_TypeName}}))
- {
- if($Method eq ".client_method") {
- next;
- }
-
- foreach my $Kind (@Kinds)
- {
- foreach my $Loc (@{$KLocs{$Kind}})
- {
- if(not defined $CompatProblems{$Method}{$Kind}{$Loc}) {
+ if(defined $In::Opt{"AffectLimit"}) {
+ $LIMIT = $In::Opt{"AffectLimit"};
+ }
+
+ my %SymSel = ();
+
+ foreach my $Kind (sort keys(%{$Kinds_Locations}))
+ {
+ my @Locs = sort {(index($a, "retval")!=-1) cmp (index($b, "retval")!=-1)} sort {length($a)<=>length($b)} sort keys(%{$Kinds_Locations->{$Kind}});
+
+ foreach my $Loc (@Locs)
+ {
+ foreach my $Method (keys(%{$TypeProblemsIndex{$Level}{$Target_TypeName}{$Kind}{$Loc}}))
+ {
+ if($Method eq ".client_method") {
next;
}
- my $Type_Name = $CompatProblems{$Method}{$Kind}{$Loc}{"Type_Name"};
- if($Type_Name ne $Target_TypeName) {
- next;
- }
-
- $SymLocKind{$Method}{$Loc}{$Kind} = 1;
- last;
- }
- }
- }
-
- %KLocs = (); # clear
-
- if(not keys(%SymLocKind)) {
+ if(not defined $SymSel{$Method})
+ {
+ $SymSel{$Method}{"Kind"} = $Kind;
+ $SymSel{$Method}{"Loc"} = $Loc;
+ }
+ }
+ }
+ }
+
+ my $Total = keys(%SymSel);
+
+ if(not $Total) {
return "";
}
- my %SymSel = ();
- my $Num = 0;
- foreach my $Method (sort keys(%SymLocKind))
- {
- LOOP: foreach my $Loc (sort {$a=~/retval/ cmp $b=~/retval/} sort {length($a)<=>length($b)} sort keys(%{$SymLocKind{$Method}}))
- {
- foreach my $Kind (sort keys(%{$SymLocKind{$Method}{$Loc}}))
- {
- $SymSel{$Method}{"Loc"} = $Loc;
- $SymSel{$Method}{"Kind"} = $Kind;
- last LOOP;
- }
- }
-
- $Num += 1;
-
- if($Num>=$LIMIT) {
- last;
- }
- }
-
my $Affected = "";
+ my $SNum = 0;
foreach my $Method (sort {lc($a) cmp lc($b)} keys(%SymSel))
@@ -4961,9 +3354,13 @@
my $Pos = getParamPos($PName, $Method, 1);
- $Affected .= "".get_Signature($Method, 1, "HTML|Italic|Param|Class|Target=".$Pos)."
";
+ $Affected .= "".getSignature($Method, 1, "HTML|Italic|Param|Class|Target=".$Pos)."
";
$Affected .= "".$Desc."
\n";
- }
-
- if(keys(%SymLocKind)>$LIMIT) {
+
+ if(++$SNum>=$LIMIT) {
+ last;
+ }
+ }
+
+ if($Total>$LIMIT) {
$Affected .= " ...\n
\n"; # and others ...
}
@@ -4972,11 +3369,10 @@
if($Affected)
{
- my $Num = keys(%SymLocKind);
- my $Per = show_number($Num*100/keys(%CheckedMethods));
+ my $Per = showNum($Total*100/keys(%CheckedMethods));
$Affected = $ContentDivStart.$Affected.$ContentDivEnd;
- $Affected = $ContentSpanStart_Affected."[+] affected methods: $Num ($Per\%)".$ContentSpanEnd.$Affected;
- }
-
- return ($Affected);
+ $Affected = $ContentSpanStart_Affected."[+] affected methods: $Total ($Per\%)".$ContentSpanEnd.$Affected;
+ }
+
+ return $Affected;
}
@@ -4991,20 +3387,20 @@
$Location=~s/\.[^.]+?\Z//;
- my %TypeAttr = get_Type($MethodInfo{1}{$Method}{"Class"}, 1);
- my $Type_Type = $TypeAttr{"Type"};
+ my $TypeAttr = getType($MethodInfo{1}{$Method}{"Class"}, 1);
+ my $Type_Type = $TypeAttr->{"Type"};
my $ABSTRACT_M = $MethodInfo{1}{$Method}{"Abstract"}?" abstract":"";
- my $ABSTRACT_C = $TypeAttr{"Abstract"}?" abstract":"";
+ my $ABSTRACT_C = $TypeAttr->{"Abstract"}?" abstract":"";
my $METHOD_TYPE = $MethodInfo{1}{$Method}{"Constructor"}?"constructor":"method";
if($Kind eq "Class_Overridden_Method" or $Kind eq "Class_Method_Moved_Up_Hierarchy") {
- return "Method '".highLight_Signature($New_Value, 2)."' will be called instead of this method in a client program.";
- }
- elsif($TypeProblems_Kind{$Level}{$Kind})
+ return "Method '".getSignature($New_Value, 2, "Class|HTML|Italic")."' will be called instead of this method in a client program.";
+ }
+ elsif($CompatRules{$Level}{$Kind}{"Kind"} eq "Types")
{
my %MInfo = %{$MethodInfo{1}{$Method}};
if($Location eq "this") {
- return "This$ABSTRACT_M $METHOD_TYPE is from \'".htmlSpecChars($Type_Name)."\'$ABSTRACT_C $Type_Type.";
+ return "This$ABSTRACT_M $METHOD_TYPE is from \'".specChars($Type_Name)."\'$ABSTRACT_C $Type_Type.";
}
@@ -5014,5 +3410,5 @@
{ # return value
if($Location=~/\./) {
- push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in return value");
+ push(@Sentence_Parts, "Field \'".specChars($Location)."\' in the return value");
}
else {
@@ -5024,5 +3420,5 @@
elsif($Location=~/this/)
{ # "this" reference
- push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in the object");
+ push(@Sentence_Parts, "Field \'".specChars($Location)."\' in the object");
$TypeID = $MInfo{"Class"};
@@ -5034,5 +3430,5 @@
if($Location=~/\./) {
- push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in ".showPos($PPos)." parameter");
+ push(@Sentence_Parts, "Field \'".specChars($Location)."\' in ".showPos($PPos)." parameter");
}
else {
@@ -5058,8 +3454,8 @@
if($TypeInfo{1}{$TypeID_Problem}{"Name"} eq $Type_Name) {
- push(@Sentence_Parts, "has type \'".htmlSpecChars($Type_Name)."\'.");
+ push(@Sentence_Parts, "is of type \'".specChars($Type_Name)."\'.");
}
else {
- push(@Sentence_Parts, "has base type \'".htmlSpecChars($Type_Name)."\'.");
+ push(@Sentence_Parts, "has base type \'".specChars($Type_Name)."\'.");
}
}
@@ -5069,10 +3465,10 @@
sub getParamPos($$$)
{
- my ($Name, $Method, $LibVersion) = @_;
-
- if(defined $MethodInfo{$LibVersion}{$Method}
- and defined $MethodInfo{$LibVersion}{$Method}{"Param"})
- {
- my $Info = $MethodInfo{$LibVersion}{$Method};
+ my ($Name, $Method, $LVer) = @_;
+
+ if(defined $MethodInfo{$LVer}{$Method}
+ and defined $MethodInfo{$LVer}{$Method}{"Param"})
+ {
+ my $Info = $MethodInfo{$LVer}{$Method};
foreach (keys(%{$Info->{"Param"}}))
{
@@ -5096,5 +3492,5 @@
sub getFieldType($$$)
{
- my ($Location, $TypeId, $LibVersion) = @_;
+ my ($Location, $TypeId, $LVer) = @_;
my @Fields = split(/\./, $Location);
@@ -5102,11 +3498,11 @@
foreach my $Name (@Fields)
{
- my %Info = get_BaseType($TypeId, $LibVersion);
-
- foreach my $N (keys(%{$Info{"Fields"}}))
+ my $TInfo = getBaseType($TypeId, $LVer);
+
+ foreach my $N (keys(%{$TInfo->{"Fields"}}))
{
if($N eq $Name)
{
- $TypeId = $Info{"Fields"}{$N}{"Type"};
+ $TypeId = $TInfo->{"Fields"}{$N}{"Type"};
last;
}
@@ -5124,26 +3520,19 @@
}
-sub getRelPath($$)
-{
- my ($A, $B) = @_;
- return abs2rel($A, get_dirname($B));
-}
-
sub createReport()
{
- if($JoinReport)
- { # --stdout
+ if($In::Opt{"JoinReport"}) {
writeReport("Join", getReport("Join"));
}
- elsif($DoubleReport)
+ elsif($In::Opt{"DoubleReport"})
{ # default
writeReport("Binary", getReport("Binary"));
writeReport("Source", getReport("Source"));
}
- elsif($BinaryOnly)
+ elsif($In::Opt{"BinaryOnly"})
{ # --binary
writeReport("Binary", getReport("Binary"));
}
- elsif($SourceOnly)
+ elsif($In::Opt{"SourceOnly"})
{ # --source
writeReport("Source", getReport("Source"));
@@ -5151,259 +3540,12 @@
}
-sub getCssStyles()
-{
- my $CssStyles = "
- body {
- font-family:Arial, sans-serif;
- background-color:White;
- color:Black;
- }
- hr {
- color:Black;
- background-color:Black;
- height:1px;
- border:0;
- }
- h1 {
- margin-bottom:0px;
- padding-bottom:0px;
- font-size:1.625em;
- }
- h2 {
- margin-bottom:0px;
- padding-bottom:0px;
- font-size:1.25em;
- white-space:nowrap;
- }
- div.symbols {
- color:#003E69;
- }
- div.symbols i {
- color:Brown;
- }
- span.section {
- font-weight:bold;
- cursor:pointer;
- color:#003E69;
- white-space:nowrap;
- margin-left:5px;
- }
- span:hover.section {
- color:#336699;
- }
- span.sect_aff {
- cursor:pointer;
- margin-left:7px;
- padding-left:15px;
- font-size:0.875em;
- color:#cc3300;
- }
- span.ext {
- font-weight:100;
- }
- span.jar {
- color:#cc3300;
- font-size:0.875em;
- font-weight:bold;
- }
- div.jar_list {
- padding-left:5px;
- font-size:0.94em;
- }
- span.pkg_t {
- color:#408080;
- font-size:0.875em;
- }
- span.pkg {
- color:#408080;
- font-size:0.875em;
- font-weight:bold;
- }
- span.cname {
- color:Green;
- font-size:0.875em;
- font-weight:bold;
- }
- span.iname_b {
- font-weight:bold;
- font-size:1.1em;
- }
- span.iname_a {
- color:#333333;
- font-weight:bold;
- font-size:0.94em;
- }
- span.sym_p {
- font-weight:normal;
- white-space:normal;
- }
- span.sym_p span {
- white-space:nowrap;
- }
- span.attr {
- color:Black;
- font-weight:100;
- }
- span.deprecated {
- color:Red;
- font-weight:bold;
- font-family:Monaco, monospace;
- }
- div.affect {
- padding-left:15px;
- padding-bottom:10px;
- font-size:0.87em;
- font-style:italic;
- line-height:0.75em;
- }
- div.affected {
- padding-left:30px;
- padding-top:10px;
- }
- table.ptable {
- border-collapse:collapse;
- border:1px outset black;
- line-height:1em;
- margin-left:15px;
- margin-top:3px;
- margin-bottom:3px;
- width:900px;
- }
- table.ptable td {
- border:1px solid Gray;
- padding: 3px;
- font-size:0.875em;
- text-align:left;
- vertical-align:top;
- }
- table.ptable th {
- background-color:#eeeeee;
- font-weight:bold;
- color:#333333;
- font-family:Verdana, Arial;
- font-size:0.875em;
- border:1px solid Gray;
- text-align:center;
- vertical-align:top;
- white-space:nowrap;
- padding: 3px;
- }
- table.summary {
- border-collapse:collapse;
- border:1px outset black;
- }
- table.summary th {
- background-color:#eeeeee;
- font-weight:100;
- text-align:left;
- font-size:0.94em;
- white-space:nowrap;
- border:1px inset Gray;
- padding: 3px;
- }
- table.summary td {
- text-align:right;
- white-space:nowrap;
- border:1px inset Gray;
- padding: 3px 5px 3px 10px;
- }
- span.mngl {
- padding-left:15px;
- font-size:0.875em;
- cursor:text;
- color:#444444;
- }
- span.color_p {
- font-style:italic;
- color:Brown;
- }
- span.param {
- font-style:italic;
- }
- span.focus_p {
- font-style:italic;
- background-color:#DCDCDC;
- }
- span.nowrap {
- white-space:nowrap;
- }
- .passed {
- background-color:#CCFFCC;
- font-weight:100;
- }
- .warning {
- background-color:#F4F4AF;
- font-weight:100;
- }
- .failed {
- background-color:#FFCCCC;
- font-weight:100;
- }
- .new {
- background-color:#C6DEFF;
- font-weight:100;
- }
-
- .compatible {
- background-color:#CCFFCC;
- font-weight:100;
- }
- .almost_compatible {
- background-color:#FFDAA3;
- font-weight:100;
- }
- .incompatible {
- background-color:#FFCCCC;
- font-weight:100;
- }
- .gray {
- background-color:#DCDCDC;
- font-weight:100;
- }
-
- .top_ref {
- font-size:0.69em;
- }
- .footer {
- font-size:0.75em;
- }";
-
- if($JoinReport or $ExternCss)
- {
- $CssStyles .= "
- .tabset {
- float:left;
- }
- a.tab {
- border:1px solid Black;
- float:left;
- margin:0px 5px -1px 0px;
- padding:3px 5px 3px 5px;
- position:relative;
- font-size:0.875em;
- background-color:#DDD;
- text-decoration:none;
- color:Black;
- }
- a.disabled:hover
- {
- color:Black;
- background:#EEE;
- }
- a.active:hover
- {
- color:Black;
- background:White;
- }
- a.active {
- border-bottom-color:White;
- background-color:White;
- }
- div.tab {
- border-top:1px solid Black;
- padding:0px;
- width:100%;
- clear:both;
- }";
+sub getCssStyles($)
+{
+ my $Level = $_[0];
+
+ my $CssStyles = readModule("Css", "Report.css");
+
+ if($Level eq "Join" or $In::Opt{"ExternCss"}) {
+ $CssStyles .= readModule("Css", "Tabs.css");
}
@@ -5411,88 +3553,12 @@
}
-sub getJsScript()
-{
- my $JScripts = "
- function sC(header, id)
- {
- e = document.getElementById(id);
- if(e.style.display == 'none')
- {
- e.style.display = 'block';
- e.style.visibility = 'visible';
- header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[−]\");
- }
- else
- {
- e.style.display = 'none';
- e.style.visibility = 'hidden';
- header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[+]\");
- }
- }";
-
- if($JoinReport or $ExternJs)
- {
- $JScripts .= "
- function initTabs()
- {
- var url = window.location.href;
- if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1)
- {
- var tab1 = document.getElementById('BinaryID');
- var tab2 = document.getElementById('SourceID');
- tab1.className='tab disabled';
- tab2.className='tab active';
- }
- var sets = document.getElementsByTagName('div');
- for (var i = 0; i < sets.length; i++)
- {
- if (sets[i].className.indexOf('tabset') != -1)
- {
- var tabs = [];
- var links = sets[i].getElementsByTagName('a');
- for (var j = 0; j < links.length; j++)
- {
- if (links[j].className.indexOf('tab') != -1)
- {
- tabs.push(links[j]);
- links[j].tabs = tabs;
- var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1));
- //reset all tabs on start
- if (tab)
- {
- if (links[j].className.indexOf('active')!=-1) {
- tab.style.display = 'block';
- }
- else {
- tab.style.display = 'none';
- }
- }
- links[j].onclick = function()
- {
- var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1));
- if (tab)
- {
- //reset all tabs before change
- for (var k = 0; k < this.tabs.length; k++)
- {
- document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none';
- this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled');
- }
- this.className = 'tab active';
- tab.style.display = 'block';
- // window.location.hash = this.id.replace('ID', '');
- return false;
- }
- }
- }
- }
- }
- }
- if(url.indexOf('#')!=-1) {
- location.href=location.href;
- }
- }
- if (window.addEventListener) window.addEventListener('load', initTabs, false);
- else if (window.attachEvent) window.attachEvent('onload', initTabs);";
+sub getJsScript($)
+{
+ my $Level = $_[0];
+
+ my $JScripts = readModule("Js", "Sections.js");
+
+ if($Level eq "Join" or $In::Opt{"ExternJs"}) {
+ $JScripts .= readModule("Js", "Tabs.js");
}
@@ -5504,34 +3570,36 @@
my $Level = $_[0];
- my $CssStyles = getCssStyles();
- my $JScripts = getJsScript();
-
- if(defined $ExternCss)
- {
- $CssStyles=~s/\n /\n/g;
- writeFile($ExternCss, $CssStyles);
- }
-
- if(defined $ExternJs)
- {
- $JScripts=~s/\n /\n/g;
- writeFile($ExternJs, $JScripts);
+ my $CssStyles = getCssStyles($Level);
+ my $JScripts = getJsScript($Level);
+
+ if(defined $In::Opt{"ExternCss"}) {
+ writeFile($In::Opt{"ExternCss"}, $CssStyles);
+ }
+
+ if(defined $In::Opt{"ExternJs"}) {
+ writeFile($In::Opt{"ExternJs"}, $JScripts);
}
if($Level eq "Join")
{
- my $Title = "$TargetTitle: ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." compatibility report";
- my $Keywords = "$TargetTitle, compatibility";
- my $Description = "Compatibility report for the $TargetTitle library between ".$Descriptor{1}{"Version"}." and ".$Descriptor{2}{"Version"}." versions";
- my ($BSummary, $BMetaData) = get_Summary("Binary");
- my ($SSummary, $SMetaData) = get_Summary("Source");
+ my $Title = $In::Opt{"TargetTitle"}.": ".$In::Desc{1}{"Version"}." to ".$In::Desc{2}{"Version"}." compatibility report";
+ my $Keywords = $In::Opt{"TargetTitle"}.", compatibility";
+ my $Description = "Compatibility report for the ".$In::Opt{"TargetTitle"}." library between ".$In::Desc{1}{"Version"}." and ".$In::Desc{2}{"Version"}." versions";
+
+ my ($BSummary, $BMetaData) = getSummary("Binary");
+ my ($SSummary, $SMetaData) = getSummary("Source");
+
my $Report = "\n\n".composeHTML_Head($Level, $Title, $Keywords, $Description, $CssStyles, $JScripts)."";
- $Report .= get_Report_Header("Join")."
-
";
- $Report .= "\n$BSummary\n".get_Report_Added("Binary").get_Report_Removed("Binary").get_Report_Problems("High", "Binary").get_Report_Problems("Medium", "Binary").get_Report_Problems("Low", "Binary").get_Report_Problems("Safe", "Binary").get_SourceInfo()."
";
- $Report .= "\n$SSummary\n".get_Report_Added("Source").get_Report_Removed("Source").get_Report_Problems("High", "Source").get_Report_Problems("Medium", "Source").get_Report_Problems("Low", "Source").get_Report_Problems("Safe", "Source").get_SourceInfo()."
";
+
+ $Report .= getReportHeader("Join");
+ $Report .= "
\n";
+
+ $Report .= "\n$BSummary\n".getReportAdded("Binary").getReportRemoved("Binary").getReportProblems("High", "Binary").getReportProblems("Medium", "Binary").getReportProblems("Low", "Binary").getReportProblems("Safe", "Binary").getSourceInfo()."
";
+
+ $Report .= "\n$SSummary\n".getReportAdded("Source").getReportRemoved("Source").getReportProblems("High", "Source").getReportProblems("Medium", "Source").getReportProblems("Low", "Source").getReportProblems("Safe", "Source").getSourceInfo()."
";
+
$Report .= getReportFooter();
$Report .= "\n