move jet signature read/write utils into stdlib module

compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java

@@ -1,10 +1,11 @@
 package org.jetbrains.jet.codegen;
 
+import jet.typeinfo.TypeInfoVariance;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureAdapter;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureReader;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureWriter;
+import jet.typeinfo.internal.signature.JetSignatureAdapter;
+import jet.typeinfo.internal.signature.JetSignatureReader;
+import jet.typeinfo.internal.signature.JetSignatureWriter;
 import org.jetbrains.jet.lang.types.Variance;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.signature.SignatureVisitor;
@@ -183,11 +184,20 @@ public class BothSignatureWriter {
         jetSignatureWriter.visitTypeVariable(name, nullable);
     }
     
+    private TypeInfoVariance translateVariance(Variance variance) {
+        switch (variance) {
+            case IN_VARIANCE: return TypeInfoVariance.IN;
+            case OUT_VARIANCE: return TypeInfoVariance.OUT;
+            case INVARIANT: return TypeInfoVariance.INVARIANT;
+            default: throw new IllegalStateException();
+        }
+    }
+    
     public void writeFormalTypeParameter(final String name, Variance variance) {
         checkTopLevel();
 
         signatureVisitor().visitFormalTypeParameter(name);
-        jetSignatureWriter.visitFormalTypeParameter(name, variance);
+        jetSignatureWriter.visitFormalTypeParameter(name, translateVariance(variance));
     }
 
     public void writerFormalTypeParametersStart() {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java

@@ -2,12 +2,11 @@ package org.jetbrains.jet.lang.resolve.java;
 
 import com.google.common.collect.Lists;
 import com.intellij.psi.*;
+import jet.typeinfo.internal.signature.JetSignatureReader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureReader;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureVisitor;
 import org.jetbrains.jet.lang.types.*;
 
 import java.util.Collections;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java

@@ -1,11 +1,10 @@
 package org.jetbrains.jet.lang.resolve.java;
 
+import jet.typeinfo.TypeInfoVariance;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureReader;
-import org.jetbrains.jet.lang.resolve.java.signature.JetSignatureVisitor;
-import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+import jet.typeinfo.internal.signature.JetSignatureVisitor;
 import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetStandardClasses;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
@@ -34,7 +33,7 @@ public abstract class JetTypeJetSignatureReader implements JetSignatureVisitor {
     
 
     @Override
-    public void visitFormalTypeParameter(String name, Variance variance) {
+    public void visitFormalTypeParameter(String name, TypeInfoVariance variance) {
         throw new IllegalStateException();
     }
 

stdlib/src/jet/typeinfo/internal/signature/JetSignatureAdapter.java

@@ -1,13 +1,13 @@
-package org.jetbrains.jet.lang.resolve.java.signature;
+package jet.typeinfo.internal.signature;
 
-import org.jetbrains.jet.lang.types.Variance;
+import jet.typeinfo.TypeInfoVariance;
 
 /**
  * @author Stepan Koltsov
  */
 public class JetSignatureAdapter implements JetSignatureVisitor {
     @Override
-    public void visitFormalTypeParameter(String name, Variance variance) {
+    public void visitFormalTypeParameter(String name, TypeInfoVariance variance) {
     }
 
     @Override

stdlib/src/jet/typeinfo/internal/signature/JetSignatureReader.java

@@ -1,8 +1,6 @@
-package org.jetbrains.jet.lang.resolve.java.signature;
+package jet.typeinfo.internal.signature;
 
-import org.jetbrains.jet.lang.types.Variance;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
+import jet.typeinfo.TypeInfoVariance;
 
 /**
  * @author Stepan Koltsov
@@ -27,15 +25,15 @@ public class JetSignatureReader {
         if (signature.charAt(0) == '<') {
             pos = 2;
             do {
-                Variance variance;
+                TypeInfoVariance variance;
                 if (signature.substring(pos).startsWith("in ")) {
-                    variance = Variance.IN_VARIANCE;
+                    variance = TypeInfoVariance.IN;
                     pos += "in ".length();
                 } else if (signature.substring(pos).startsWith("out ")) {
-                    variance = Variance.OUT_VARIANCE;
+                    variance = TypeInfoVariance.OUT;
                     pos += "out ".length();
                 } else {
-                    variance = Variance.INVARIANT;
+                    variance = TypeInfoVariance.INVARIANT;
                     pos += "".length();
                 }
                 int end = signature.indexOf(':', pos);

stdlib/src/jet/typeinfo/internal/signature/JetSignatureVisitor.java

@@ -1,7 +1,6 @@
-package org.jetbrains.jet.lang.resolve.java.signature;
+package jet.typeinfo.internal.signature;
 
-import org.jetbrains.jet.lang.types.Variance;
-import org.objectweb.asm.signature.SignatureVisitor;
+import jet.typeinfo.TypeInfoVariance;
 
 /**
  * @author Stepan Koltsov
@@ -31,7 +30,7 @@ public interface JetSignatureVisitor {
      *
      * @param name the name of the formal parameter.
      */
-    void visitFormalTypeParameter(String name, Variance variance);
+    void visitFormalTypeParameter(String name, TypeInfoVariance variance);
 
     /**
      * Visits the class bound of the last visited formal type parameter.

stdlib/src/jet/typeinfo/internal/signature/JetSignatureWriter.java

@@ -1,7 +1,6 @@
-package org.jetbrains.jet.lang.resolve.java.signature;
+package jet.typeinfo.internal.signature;
 
-import org.jetbrains.jet.lang.types.Variance;
-import org.objectweb.asm.signature.SignatureWriter;
+import jet.typeinfo.TypeInfoVariance;
 
 /**
  * @author Stepan Koltsov
@@ -44,16 +43,16 @@ public class JetSignatureWriter implements JetSignatureVisitor {
     // ------------------------------------------------------------------------
 
     @Override
-    public void visitFormalTypeParameter(final String name, Variance variance) {
+    public void visitFormalTypeParameter(final String name, TypeInfoVariance variance) {
         if (!hasFormals) {
             hasFormals = true;
             buf.append('<');
         }
         switch (variance) {
-            case OUT_VARIANCE:
+            case OUT:
                 buf.append("out ");
                 break;
-            case IN_VARIANCE:
+            case IN:
                 buf.append("in ");
                 break;
             case INVARIANT: