Changeset 12872 in josm for trunk/tools/japicc/modules/Internals/APIDump.pm

Timestamp:

2017-09-17T15:47:18+02:00 (9 years ago)

Author:

Don-vip

Message:

update to JAPICC 2.3

File:

• trunk/tools/japicc/modules/Internals/APIDump.pm (modified) (11 diffs)

trunk/tools/japicc/modules/Internals/APIDump.pm

@@ -135 +135 @@
         
         my $ClassName = getFilename($ClassPath);
-        if($ClassName=~/\$\d/) {
+        if($ClassName=~/\$\d/ or $ClassName eq "module-info") {
             next;
         }
+        
         $ClassPath = cutPrefix($ClassPath, $ExtractPath); # javap decompiler accepts relative paths only
         
@@ -220 +221 @@
 }
 
-sub simpleDecl($)
+sub simpleDecl($$)
 {
-    my $Line = $_[0];
+    my ($Line, $LVer) = @_;
     
     my %B = ( "<"=>0, ">"=>0 );
@@ -287 +288 @@
     {
         if($Line=~s/([A-Za-z\d\?]+) extends \Q$R\E/$1/) {
-            $Tmpl{$1} = $R;
+            $Tmpl{$1} = registerType($R, $LVer);
         }
     }
@@ -317 +318 @@
     close(IN);
     
-    my (%TypeAttr, $CurrentMethod, $CurrentPackage, $CurrentClass) = ();
+    my (%TypeAttr, $CurrentMethod, $CurrentPackage, $CurrentClass, $CurrentClass_Short) = ();
     my ($InParamTable, $InVarTypeTable, $InExceptionTable, $InCode) = (0, 0, 0, 0);
     
@@ -488 +489 @@
           # <KEYIN extends java.lang.Object ...
             if($LINE=~/<[A-Z\d\?]+ /i) {
-                ($LINE, $TmplP) = simpleDecl($LINE);
+                ($LINE, $TmplP) = simpleDecl($LINE, $LVer);
             }
         }
@@ -628 +629 @@
             }
             $MethodAttr{"Class"} = registerType($TypeAttr{"Name"}, $LVer);
-            if($MethodAttr{"ShortName"}=~/\A(|(.+)\.)\Q$CurrentClass\E\Z/)
+            if($MethodAttr{"ShortName"}=~/\A(|(.+)\.)(\Q$CurrentClass\E|\Q$CurrentClass_Short\E)\Z/)
             {
                 if($2)
@@ -688 +689 @@
             and $LINE_N=~/(Signature|descriptor):\s*(.+?)\s*\Z/i)
             { # create run-time unique name ( java/io/PrintStream.println (Ljava/lang/String;)V )
+                my $SignParams = $2;
+                
+                # Generic classes
+                my $ShortClass = $CurrentClass;
+                $ShortClass=~s/<.*>//g;
+                
                 if($MethodAttr{"Constructor"}) {
-                    $CurrentMethod = $CurrentClass.".\"<init>\":".$2;
+                    $CurrentMethod = $ShortClass.".\"<init>\":".$SignParams;
                 }
                 else {
-                    $CurrentMethod = $CurrentClass.".".$MethodAttr{"ShortName"}.":".$2;
+                    $CurrentMethod = $ShortClass.".".$MethodAttr{"ShortName"}.":".$SignParams;
                 }
                 if(my $PackageName = getSFormat($CurrentPackage)) {
@@ -832 +839 @@
                 $CurrentPackage = "";
             }
+            
             if($CurrentClass=~s/#/./g)
             { # javax.swing.text.GlyphView.GlyphPainter <=> GlyphView$GlyphPainter
                 $TypeAttr{"Name"}=~s/#/./g;
             }
+            
+            $CurrentClass_Short = $CurrentClass;
+            if(index($CurrentClass_Short, "<")!=-1) {
+                $CurrentClass_Short=~s/<.+>//g;
+            }
+            
             if($LINE=~/(\A|\s+)(public|protected|private)\s+/) {
                 $TypeAttr{"Access"} = $2;
@@ -885 +899 @@
                 $TypeAttr{"Static"} = 1;
             }
+            
+            if($TmplP) {
+                $TypeAttr{"GenericParam"} = $TmplP;
+            }
         }
         elsif(index($LINE, "Deprecated: true")!=-1
@@ -919 +937 @@
     chdir($In::Opt{"OrigDir"});
     
+    if(my $Err = $?>>8) {
+        exitStatus("Error", "failed to run javap");
+    }
+    
     if(not $NonEmpty) {
         exitStatus("Error", "internal error in parser");
@@ -961 +983 @@
             $TypeInfo{$LVer}{$Tid}{"BaseType"} = $BaseTypeId;
             $TypeInfo{$LVer}{$Tid}{"Type"} = "array";
+        }
+    }
+    elsif($TName=~/(.+)\.\.\.\Z/)
+    {
+        if(my $BaseTypeId = registerType($1, $LVer))
+        {
+            $TypeInfo{$LVer}{$Tid}{"BaseType"} = $BaseTypeId;
+            $TypeInfo{$LVer}{$Tid}{"Type"} = "variable-arity";
         }
     }