From 7c96aec630e76c14bb06f19c3de57f2fac7cfec1 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 11 May 2012 18:17:48 +0400
Subject: [PATCH] Renamed "std" library containing Any, Nothing, tuple and
 function types to "jet.src" and added readme file.

---
 compiler/frontend/generator/TuplesAndFunctionsGenerator.java  | 2 +-
 compiler/frontend/src/{std => jet.src}/Any.jet                | 0
 compiler/frontend/src/{std => jet.src}/ExtensionFunctions.jet | 0
 compiler/frontend/src/{std => jet.src}/Functions.jet          | 0
 compiler/frontend/src/{std => jet.src}/Nothing.jet            | 0
 compiler/frontend/src/jet.src/README.md                       | 4 ++++
 compiler/frontend/src/{std => jet.src}/Tuples.jet             | 0
 .../plugin/references/StandardLibraryReferenceResolver.java   | 2 +-
 8 files changed, 6 insertions(+), 2 deletions(-)
 rename compiler/frontend/src/{std => jet.src}/Any.jet (100%)
 rename compiler/frontend/src/{std => jet.src}/ExtensionFunctions.jet (100%)
 rename compiler/frontend/src/{std => jet.src}/Functions.jet (100%)
 rename compiler/frontend/src/{std => jet.src}/Nothing.jet (100%)
 create mode 100644 compiler/frontend/src/jet.src/README.md
 rename compiler/frontend/src/{std => jet.src}/Tuples.jet (100%)

diff --git a/compiler/frontend/generator/TuplesAndFunctionsGenerator.java b/compiler/frontend/generator/TuplesAndFunctionsGenerator.java
index 1c58cbd9c44..0157768f0f5 100644
--- a/compiler/frontend/generator/TuplesAndFunctionsGenerator.java
+++ b/compiler/frontend/generator/TuplesAndFunctionsGenerator.java
@@ -87,7 +87,7 @@ public class TuplesAndFunctionsGenerator {
     }
 
     public static void main(String[] args) throws FileNotFoundException {
-        File baseDir = new File("compiler/frontend/src/std/");
+        File baseDir = new File("compiler/frontend/src/jet.src/");
         assert baseDir.exists() : "Base dir does not exist: " + baseDir.getAbsolutePath();
 
         PrintStream tuples = new PrintStream(new File(baseDir, "Tuples.jet"));
diff --git a/compiler/frontend/src/std/Any.jet b/compiler/frontend/src/jet.src/Any.jet
similarity index 100%
rename from compiler/frontend/src/std/Any.jet
rename to compiler/frontend/src/jet.src/Any.jet
diff --git a/compiler/frontend/src/std/ExtensionFunctions.jet b/compiler/frontend/src/jet.src/ExtensionFunctions.jet
similarity index 100%
rename from compiler/frontend/src/std/ExtensionFunctions.jet
rename to compiler/frontend/src/jet.src/ExtensionFunctions.jet
diff --git a/compiler/frontend/src/std/Functions.jet b/compiler/frontend/src/jet.src/Functions.jet
similarity index 100%
rename from compiler/frontend/src/std/Functions.jet
rename to compiler/frontend/src/jet.src/Functions.jet
diff --git a/compiler/frontend/src/std/Nothing.jet b/compiler/frontend/src/jet.src/Nothing.jet
similarity index 100%
rename from compiler/frontend/src/std/Nothing.jet
rename to compiler/frontend/src/jet.src/Nothing.jet
diff --git a/compiler/frontend/src/jet.src/README.md b/compiler/frontend/src/jet.src/README.md
new file mode 100644
index 00000000000..2aef103ac7a
--- /dev/null
+++ b/compiler/frontend/src/jet.src/README.md
@@ -0,0 +1,4 @@
+These files are used only for navigation from user code in IDE.
+
+These files are not processed by Kotlin compiler. Compiler creates Any, Nothing, tuple and function
+types on-the-fly.
\ No newline at end of file
diff --git a/compiler/frontend/src/std/Tuples.jet b/compiler/frontend/src/jet.src/Tuples.jet
similarity index 100%
rename from compiler/frontend/src/std/Tuples.jet
rename to compiler/frontend/src/jet.src/Tuples.jet
diff --git a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
index 5e79fd3198a..1801901aee9 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
@@ -79,7 +79,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
         scope.changeLockLevel(WritableScope.LockLevel.BOTH);
         jetNamespace.initialize(scope);
 
-        TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("std"));
+        TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet.src"));
 
         ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, new FqName("jet.Tuple0"));
         assert tuple0 != null;