refactoring

extracted methods parseTypeConstructor, parseTypeArguments

runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java

@@ -144,15 +144,19 @@ public class JetSignatureReader {
         }
         
         char c;
-        int start, end;
+        int start;
-        boolean visited, inner;
+        int end;
-        String name;
+        boolean visited;
+        boolean inner;
 
-        boolean nullable = false;
+        boolean nullable;
         if (signature.charAt(pos) == '?') {
             nullable = true;
             pos++;
         }
+        else {
+            nullable = false;
+        }
 
         switch (c = signature.charAt(pos++)) {
             case 'Z':
@@ -186,13 +190,7 @@ public class JetSignatureReader {
                         case '.':
                         case ';':
                             if (!visited) {
-                                name = signature.substring(start, pos - 1);
+                                parseTypeConstructor(signature, v, start, pos, inner, nullable, forceReal);
-                                if (inner) {
-                                    v.visitInnerClassType(name, nullable);
-                                }
-                                else {
-                                    v.visitClassType(name, nullable, forceReal);
-                                }
                             }
                             if (c == ';') {
                                 v.visitEnd();
@@ -204,18 +202,43 @@ public class JetSignatureReader {
                             break;
 
                         case '<':
-                            name = signature.substring(start, pos - 1);
+                            parseTypeConstructor(signature, v, start, pos, inner, nullable, forceReal);
+                            visited = true;
+                            pos = parseTypeArguments(signature, pos, v);
+
+                        default:
+                            break;
+                    }
+                }
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    private static void parseTypeConstructor(
+            String signature,
+            JetSignatureVisitor v,
+            int start,
+            int pos,
+            boolean inner,
+            boolean nullable,
+            boolean forceReal
+    ) {
+        String name = signature.substring(start, pos - 1);
         if (inner) {
             v.visitInnerClassType(name, nullable);
         }
         else {
             v.visitClassType(name, nullable, forceReal);
         }
-                            visited = true;
+    }
-                            top: while (true) {
+
+    private static int parseTypeArguments(String signature, int pos, JetSignatureVisitor v) {
+        char c;
+        while (true) {
             switch (c = signature.charAt(pos)) {
                 case '>':
-                                        break top;
+                    return pos;
                 case '*':
                     ++pos;
                     v.visitTypeArgument();
@@ -234,11 +257,4 @@ public class JetSignatureReader {
             }
         }
     }
-                }
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-
 }