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/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() {