Rename package jet -> kotlin in grammar
org.jetbrains.jet.grammar -> org.jetbrains.kotlin.grammar
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
</macrodef>
|
||||
|
||||
<target name="lexer">
|
||||
<flex flexfile="${home}/src/org/jetbrains/jet/grammar/Grammar.flex"
|
||||
destdir="${home}//src/org/jetbrains/jet/grammar/"/>
|
||||
<flex flexfile="${home}/src/org/jetbrains/kotlin/grammar/Grammar.flex"
|
||||
destdir="${home}//src/org/jetbrains/kotlin/grammar/"/>
|
||||
</target>
|
||||
</project>
|
||||
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Annotation extends Token {
|
||||
public Annotation(CharSequence text, String fileName, int line) {
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Comment extends Token {
|
||||
public Comment(CharSequence text, String fileName, int line) {
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
import com.google.common.base.Supplier;
|
||||
import com.google.common.collect.*;
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Declaration extends Token {
|
||||
private final String name;
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class DocComment extends Token {
|
||||
public DocComment(CharSequence text, String fileName, int line) {
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
/* 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.psi.*;
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Identifier extends Token {
|
||||
private final String name;
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Other extends Token {
|
||||
public Other(CharSequence text, String fileName, int line) {
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class StringToken extends Token {
|
||||
public StringToken(CharSequence text, String fileName, int line) {
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class SymbolToken extends Token {
|
||||
public SymbolToken(CharSequence text, String fileName, int line) {
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class Token {
|
||||
private final String fileName;
|
||||
+2
-2
@@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
public class WhiteSpace extends Token {
|
||||
public WhiteSpace(CharSequence text, String fileName, int line) {
|
||||
+6
-6
@@ -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. */
|
||||
package org.jetbrains.jet.grammar;
|
||||
package org.jetbrains.kotlin.grammar;
|
||||
|
||||
//import com.intellij.lexer.*;
|
||||
//import com.intellij.psi.*;
|
||||
@@ -13,8 +13,8 @@ package org.jetbrains.jet.grammar;
|
||||
/**
|
||||
* This class is a scanner generated by
|
||||
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
|
||||
* on 8/31/12 4:09 PM from the specification file
|
||||
* <tt>/Users/abreslav/work/kotlin/grammar/src/org/jetbrains/jet/grammar/Grammar.flex</tt>
|
||||
* on 1/3/15 1:59 PM from the specification file
|
||||
* <tt>/Users/udalov/kotlin/grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex</tt>
|
||||
*/
|
||||
class _GrammarLexer {
|
||||
/** initial size of the lookahead buffer */
|
||||
@@ -538,7 +538,7 @@ class _GrammarLexer {
|
||||
while (true) {
|
||||
|
||||
if (zzCurrentPosL < zzEndReadL)
|
||||
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
|
||||
zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
|
||||
else if (zzAtEOF) {
|
||||
zzInput = YYEOF;
|
||||
break zzForAction;
|
||||
@@ -558,7 +558,7 @@ class _GrammarLexer {
|
||||
break zzForAction;
|
||||
}
|
||||
else {
|
||||
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
|
||||
zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
|
||||
}
|
||||
}
|
||||
int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
|
||||
Reference in New Issue
Block a user