azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move utilities from 'frontend' to 'util'

Browse Source 
They're also used in 'serialization'
This commit is contained in:
Alexander Udalov
2013-09-17 23:06:43 +04:00
parent 3504246983
commit 43596f7450
19 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+1 -1
View File
@@ -47,8 +47,8 @@ import org.jetbrains.jet.lang.types.expressions.LabelResolver;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.util.Box;
import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
import org.jetbrains.jet.util.slicedmap.WritableSlice;
import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
import javax.inject.Inject;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+2 -2
View File
@@ -42,8 +42,8 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import javax.inject.Inject;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import javax.inject.Inject;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import javax.inject.Inject;
import java.util.ArrayList;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.DeferredType;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import java.util.Collection;
import java.util.Collections;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
public class LazyScopeAdapter extends AbstractScopeAdapter {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
+2 -2
View File
@@ -21,8 +21,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.util.Box;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import java.util.HashMap;
import java.util.Iterator;
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
import org.jetbrains.jet.util.slicedmap.WritableSlice;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.DeferredType;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetTypeInfo;
import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM;
compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValueWithDefault.java → compiler/frontend/src/org/jetbrains/jet/util/RecursionIntolerantLazyValueWithDefault.java
+3 -1
View File
@@ -14,7 +14,9 @@
* limitations under the License.
*/
package org.jetbrains.jet.util.lazy;
package org.jetbrains.jet.util;
import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
public abstract class RecursionIntolerantLazyValueWithDefault<T> extends RecursionIntolerantLazyValue<T> {
private final T defaultValue;
compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import java.util.Collection;
import java.util.HashMap;
compiler/frontend/src/org/jetbrains/jet/util/CommonSuppliers.java → core/util.runtime/src/org/jetbrains/jet/utils/CommonSuppliers.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.util;
package org.jetbrains.jet.utils;
import com.google.common.base.Supplier;
import com.google.common.collect.*;
compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValue.java → core/util.runtime/src/org/jetbrains/jet/utils/RecursionIntolerantLazyValue.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.util.lazy;
package org.jetbrains.jet.utils;
public abstract class RecursionIntolerantLazyValue<T> {
compiler/frontend/src/org/jetbrains/jet/util/lazy/ReenteringLazyValueComputationException.java → core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java
+4 -1
View File
@@ -14,12 +14,15 @@
* limitations under the License.
*/
package org.jetbrains.jet.util.lazy;
package org.jetbrains.jet.utils;
import org.jetbrains.annotations.NotNull;
public class ReenteringLazyValueComputationException extends RuntimeException {
public ReenteringLazyValueComputationException() {
}
@NotNull
@Override
public synchronized Throwable fillInStackTrace() {
return this;
idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+5 -2
View File
@@ -24,14 +24,17 @@ import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.util.CommonSuppliers;
import org.jetbrains.jet.utils.CommonSuppliers;
import java.util.Collection;
import java.util.Collections;