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

Rename package jet -> kotlin in grammar

Browse Source 
org.jetbrains.jet.grammar -> org.jetbrains.kotlin.grammar
This commit is contained in:
Alexander Udalov
2015-01-03 13:00:38 +03:00
parent 2fdd63fa53
commit b5c7f885a8
14 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grammar/buildGrammarLexer.xml
+2 -2
View File
@@ -34,7 +34,7 @@
</macrodef> </macrodef>
<target name="lexer"> <target name="lexer">
<flex flexfile="${home}/src/org/jetbrains/jet/grammar/Grammar.flex" <flex flexfile="${home}/src/org/jetbrains/kotlin/grammar/Grammar.flex"
destdir="${home}//src/org/jetbrains/jet/grammar/"/> destdir="${home}//src/org/jetbrains/kotlin/grammar/"/>
</target> </target>
</project> </project>
grammar/src/org/jetbrains/jet/grammar/Annotation.java → grammar/src/org/jetbrains/kotlin/grammar/Annotation.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Annotation extends Token { public class Annotation extends Token {
public Annotation(CharSequence text, String fileName, int line) { public Annotation(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/Comment.java → grammar/src/org/jetbrains/kotlin/grammar/Comment.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Comment extends Token { public class Comment extends Token {
public Comment(CharSequence text, String fileName, int line) { public Comment(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java → grammar/src/org/jetbrains/kotlin/grammar/ConfluenceHyperlinksGenerator.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.*; import com.google.common.collect.*;
grammar/src/org/jetbrains/jet/grammar/Declaration.java → grammar/src/org/jetbrains/kotlin/grammar/Declaration.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Declaration extends Token { public class Declaration extends Token {
private final String name; private final String name;
grammar/src/org/jetbrains/jet/grammar/DocComment.java → grammar/src/org/jetbrains/kotlin/grammar/DocComment.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class DocComment extends Token { public class DocComment extends Token {
public DocComment(CharSequence text, String fileName, int line) { public DocComment(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/Grammar.flex → grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex
+1 -1
View File
@@ -1,5 +1,5 @@
/* It's an automatically generated code. Do not modify it. */ /* It's an automatically generated code. Do not modify it. */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
//import com.intellij.lexer.*; //import com.intellij.lexer.*;
//import com.intellij.psi.*; //import com.intellij.psi.*;
grammar/src/org/jetbrains/jet/grammar/Identifier.java → grammar/src/org/jetbrains/kotlin/grammar/Identifier.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Identifier extends Token { public class Identifier extends Token {
private final String name; private final String name;
grammar/src/org/jetbrains/jet/grammar/Other.java → grammar/src/org/jetbrains/kotlin/grammar/Other.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Other extends Token { public class Other extends Token {
public Other(CharSequence text, String fileName, int line) { public Other(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/StringToken.java → grammar/src/org/jetbrains/kotlin/grammar/StringToken.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class StringToken extends Token { public class StringToken extends Token {
public StringToken(CharSequence text, String fileName, int line) { public StringToken(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/SymbolToken.java → grammar/src/org/jetbrains/kotlin/grammar/SymbolToken.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class SymbolToken extends Token { public class SymbolToken extends Token {
public SymbolToken(CharSequence text, String fileName, int line) { public SymbolToken(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/Token.java → grammar/src/org/jetbrains/kotlin/grammar/Token.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class Token { public class Token {
private final String fileName; private final String fileName;
grammar/src/org/jetbrains/jet/grammar/WhiteSpace.java → grammar/src/org/jetbrains/kotlin/grammar/WhiteSpace.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
public class WhiteSpace extends Token { public class WhiteSpace extends Token {
public WhiteSpace(CharSequence text, String fileName, int line) { public WhiteSpace(CharSequence text, String fileName, int line) {
grammar/src/org/jetbrains/jet/grammar/_GrammarLexer.java → grammar/src/org/jetbrains/kotlin/grammar/_GrammarLexer.java
+6 -6
View File
@@ -1,7 +1,7 @@
/* The following code was generated by JFlex 1.4.3 on 8/31/12 4:09 PM */ /* The following code was generated by JFlex 1.4.3 on 1/3/15 1:59 PM */
/* It's an automatically generated code. Do not modify it. */ /* It's an automatically generated code. Do not modify it. */
package org.jetbrains.jet.grammar; package org.jetbrains.kotlin.grammar;
//import com.intellij.lexer.*; //import com.intellij.lexer.*;
//import com.intellij.psi.*; //import com.intellij.psi.*;
@@ -13,8 +13,8 @@ package org.jetbrains.jet.grammar;
/** /**
* This class is a scanner generated by * This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3 * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 8/31/12 4:09 PM from the specification file * on 1/3/15 1:59 PM from the specification file
* <tt>/Users/abreslav/work/kotlin/grammar/src/org/jetbrains/jet/grammar/Grammar.flex</tt> * <tt>/Users/udalov/kotlin/grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex</tt>
*/ */
class _GrammarLexer { class _GrammarLexer {
/** initial size of the lookahead buffer */ /** initial size of the lookahead buffer */
@@ -538,7 +538,7 @@ class _GrammarLexer {
while (true) { while (true) {
if (zzCurrentPosL < zzEndReadL) if (zzCurrentPosL < zzEndReadL)
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++); zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
else if (zzAtEOF) { else if (zzAtEOF) {
zzInput = YYEOF; zzInput = YYEOF;
break zzForAction; break zzForAction;
@@ -558,7 +558,7 @@ class _GrammarLexer {
break zzForAction; break zzForAction;
} }
else { else {
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++); zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
} }
} }
int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];