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

GreatSyntacticShift: 'namespace' -> 'package'

Browse Source
This commit is contained in:
Andrey Breslav
2011-12-25 15:51:59 +04:00
parent 9f4cd37dbb
commit f52eae71d0
141 changed files with 447 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/regressions/kt857.jet
+1 -1
View File
@@ -1,4 +1,4 @@
namespace container_test
package container_test
class Container<T>(var t : T) {
fun getT() : T = t
compiler/testData/compiler/smoke/Smoke.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Smoke
package Smoke
import std.io.*
compiler/testData/diagnostics/tests/NamespaceAsExpression.jet
+1 -1
View File
@@ -5,4 +5,4 @@ package a {
}
val x = <!EXPRESSION_EXPECTED_NAMESPACE_FOUND!>a<!>
val y2 = <!NAMESPACE_IS_NOT_AN_EXPRESSION!>namespace<!>
val y2 = <!NAMESPACE_IS_NOT_AN_EXPRESSION!>package<!>
compiler/testData/diagnostics/tests/ShiftFunctionTypes.jet
+2 -2
View File
@@ -1,12 +1,12 @@
class A {
}
namespace n {
package n {
class B
}
abstract class XXX() {
abstract val a : Int
abstract val a1 : namespace.<!UNRESOLVED_REFERENCE!>Int<!>
abstract val a1 : package.<!UNRESOLVED_REFERENCE!>Int<!>
abstract val a2 : n.B
abstract val a3 : (A)
abstract val a31 : (n.B)
compiler/testData/diagnostics/tests/scopes/Imports.jet
+2 -2
View File
@@ -1,5 +1,5 @@
//FILE:a.kt
namespace a
package a
import b.B //class
import b.foo //function
@@ -14,7 +14,7 @@ fun test(arg: B) {
}
//FILE:b.kt
namespace b
package b
class B() {}
compiler/testData/psi/Imports.jet
+1 -1
View File
@@ -1,6 +1,6 @@
package foo.bar.goo
import namespace.foo
import package.foo
import foo
import foo.bar
import foo as bar
compiler/testData/psi/Imports.txt
+1 -1
View File
@@ -14,7 +14,7 @@ JetFile: Imports.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/Imports_ERR.jet
+3 -3
View File
@@ -1,8 +1,8 @@
package foo.bar.goo
import namespace ;
import namespace.*
import namespace. ;
import package ;
import package.*
import package. ;
import foo as
import foo.
compiler/testData/psi/Imports_ERR.txt
+3 -3
View File
@@ -14,7 +14,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiErrorElement:Expecting '.'
<empty list>
PsiWhiteSpace(' ')
@@ -26,7 +26,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiErrorElement:Expecting qualified name
@@ -37,7 +37,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
compiler/testData/psi/RootNamespace.jet
+3 -3
View File
@@ -4,10 +4,10 @@ class X
package foo.bar {
fun foo() {
namespace.foo.bar.X
namespace.foo.bar.X()
package.foo.bar.X
package.foo.bar.X()
when (e) {
is namespace.foo.bar.X #(x) -> {}
is package.foo.bar.X #(x) -> {}
}
}
}
compiler/testData/psi/RootNamespace.txt
+3 -3
View File
@@ -43,7 +43,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -58,7 +58,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -92,7 +92,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/When.jet
+1 -1
View File
@@ -45,7 +45,7 @@ fun foo() {
is a #(a, b) -> c
is a.a #(a, b) -> c
is a.a #(foo = a, bar = b) -> c
is namespace.a.a #(a, b) -> c
is package.a.a #(a, b) -> c
is a #(val a is T, b) -> c
is a #(b, 1) -> c
in 1..2 -> dsf
compiler/testData/psi/When.txt
+1 -1
View File
@@ -599,7 +599,7 @@ JetFile: When.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('namespace')
PsiElement(namespace)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
compiler/testData/psi/greatSyntacticShift/functionTypes.jet
+1 -1
View File
@@ -1,7 +1,7 @@
class A {
}
namespace n {
package n {
class B
}
abstract class XXX() {
compiler/testData/readClass/class/Class.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Ramification
compiler/testData/readClass/class/ClassInParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Wine<in T>
compiler/testData/readClass/class/ClassOutParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Juice<in T>
compiler/testData/readClass/class/ClassParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Beer<T>
compiler/testData/readClass/class/ClassParamUpperClassBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Clock<A : java.lang.Number>
compiler/testData/readClass/class/ClassParamUpperClassInterfaceBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Clock<A> where A : java.lang.Number, A : java.lang.CharSequence
compiler/testData/readClass/class/ClassParamUpperInterfaceBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Clock<A : java.lang.CharSequence>
compiler/testData/readClass/class/ClassParamUpperInterfaceClassBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
class Clock<A> where A : java.lang.CharSequence, A : java.lang.Number
compiler/testData/readClass/class/Trait.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
trait Trtrtr
compiler/testData/readClass/fun/ClassFun.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
class River {
fun song() = 1
compiler/testData/readClass/fun/ExtFun.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun Int.shuffle() = 1
compiler/testData/readClass/fun/ExtFunInClass.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
class ExtFunInClass {
fun Int.shuffle() = 1
compiler/testData/readClass/fun/FunClassParamNotNull.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
import java.util.List
import java.lang.CharSequence
compiler/testData/readClass/fun/FunClassParamNullable.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
import java.util.List
import java.lang.CharSequence
compiler/testData/readClass/fun/FunDefaultArg.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun funDefaultArg(p: Int, q: Int = 17, r: Int = 18) = 19
compiler/testData/readClass/fun/FunGenericParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <T> f() = 1
compiler/testData/readClass/fun/FunInParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <in T> f() = 1
compiler/testData/readClass/fun/FunOutParam.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <out T> f() = 1
compiler/testData/readClass/fun/FunParamNotNull.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun fff(a: java.lang.CharSequence) = 1
compiler/testData/readClass/fun/FunParamNullable.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun fff(a: java.lang.CharSequence?) = 1
compiler/testData/readClass/fun/FunParamUpperClassBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <A : java.lang.Number> uno() = 1
compiler/testData/readClass/fun/FunParamUpperClassInterfaceBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <A> tres() where A : java.lang.Number, A : java.lang.CharSequence = 1
compiler/testData/readClass/fun/FunParamUpperInterfaceBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <A : java.lang.CharSequence> dos() = 1
compiler/testData/readClass/fun/FunParamUpperInterfaceClassBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun <A> cuatro() where A : java.lang.CharSequence, A : java.lang.Number = 1
compiler/testData/readClass/fun/FunVarargCharSequence.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun varargCharSequence(a: Int, vararg b: java.lang.CharSequence) = 1
compiler/testData/readClass/fun/FunVarargInt.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun varargInt(a: Int, vararg b: Int) = 1
compiler/testData/readClass/fun/ModifierAbstract.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
abstract class ModifierAbstract {
abstract fun abs(): Int
compiler/testData/readClass/fun/ModifierOpen.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
open class ModifierOpen {
open fun abs() = 1
compiler/testData/readClass/fun/NsFun.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun f() = 1
compiler/testData/readClass/fun/ReturnTypeClassParamNotNull.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
import java.util.List
import java.util.ArrayList
compiler/testData/readClass/fun/ReturnTypeClassParamNullable.kt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
package test
import java.util.List
import java.util.ArrayList
compiler/testData/readClass/fun/ReturnTypeNotNull.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun ff(): java.lang.CharSequence = throw Exception()
compiler/testData/readClass/fun/ReturnTypeNullable.kt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
package test
fun ff(): java.lang.CharSequence? = null
compiler/testData/resolve/ClassObjects.jet
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Jet86
package Jet86
~A~class A {
class object {
compiler/testData/resolve/Classifiers.jet
+1 -1
View File
@@ -1,4 +1,4 @@
namespace qualified_this {
package qualified_this {
~qtA~class A(val a:Int) {
~qtB~class B() {
compiler/testData/resolve/LocalObjects.jet
+1 -1
View File
@@ -1,4 +1,4 @@
namespace localObjects {
package localObjects {
object ~A~A {
~x~val x : Int
}
compiler/testData/resolve/Namespaces.jet
+3 -3
View File
@@ -1,6 +1,6 @@
namespace root
package root
~a~namespace a {
~a~package a {
import java.*
~a.a~val a : util.List<Int>? = null
@@ -9,7 +9,7 @@ namespace root
}
namespace a {
package a {
import java.util.*
~a.b~val b : List<Int>? = null
compiler/testData/resolve/NestedObjects.jet
+1 -1
View File
@@ -1,4 +1,4 @@
~ns~namespace nestedObjects {
~ns~package nestedObjects {
object ~A~A {
val b = `A.B`B
val d = `A`A.`A.B`B.`A.B.A`A
compiler/testData/resolve/Objects.jet
+1 -1
View File
@@ -1,4 +1,4 @@
namespace toplevelObjectDeclarations {
package toplevelObjectDeclarations {
class Foo(y : Int) {
~foo()~open fun foo() : Int = 1
}
compiler/testData/resolve/PrimaryConstructors.jet
+1 -1
View File
@@ -11,7 +11,7 @@ fun test() {
a.`f`f()`:std::Int`
}
namespace Jet65 {
package Jet65 {
class Foo(~bar~var bar : Int, ~barr~barr : Int, ~barrr~val barrr : Int) {
{