regen: GK 1.4.3

This commit is contained in:
Gregory.Shrago
2016-10-18 22:22:08 +03:00
parent 9e95149430
commit 9af39845b5
18 changed files with 118 additions and 71 deletions
@@ -44,9 +44,6 @@ public interface JsonElementTypes {
else if (type == BOOLEAN_LITERAL) {
return new JsonBooleanLiteralImpl(node);
}
else if (type == LITERAL) {
return new JsonLiteralImpl(node);
}
else if (type == NULL_LITERAL) {
return new JsonNullLiteralImpl(node);
}
@@ -65,9 +62,6 @@ public interface JsonElementTypes {
else if (type == STRING_LITERAL) {
return new JsonStringLiteralImpl(node);
}
else if (type == VALUE) {
return new JsonValueImpl(node);
}
throw new AssertionError("Unknown element type: " + type);
}
}
+28 -31
View File
@@ -64,9 +64,6 @@ public class JsonParser implements PsiParser, LightPsiParser {
}
public static final TokenSet[] EXTENDS_SETS_ = new TokenSet[] {
create_token_set_(ARRAY, OBJECT),
create_token_set_(BOOLEAN_LITERAL, LITERAL, NULL_LITERAL, NUMBER_LITERAL,
STRING_LITERAL),
create_token_set_(ARRAY, BOOLEAN_LITERAL, LITERAL, NULL_LITERAL,
NUMBER_LITERAL, OBJECT, REFERENCE_EXPRESSION, STRING_LITERAL,
VALUE),
@@ -78,12 +75,12 @@ public class JsonParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "array")) return false;
if (!nextTokenIs(b, L_BRACKET)) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, null);
Marker m = enter_section_(b, l, _NONE_, ARRAY, null);
r = consumeToken(b, L_BRACKET);
p = r; // pin = 1
r = r && report_error_(b, array_1(b, l + 1));
r = p && consumeToken(b, R_BRACKET) && r;
exit_section_(b, l, m, ARRAY, r, p, null);
exit_section_(b, l, m, r, p, null);
return r || p;
}
@@ -104,11 +101,11 @@ public class JsonParser implements PsiParser, LightPsiParser {
static boolean array_element(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "array_element")) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, null);
Marker m = enter_section_(b, l, _NONE_);
r = value(b, l + 1);
p = r; // pin = 1
r = r && array_element_1(b, l + 1);
exit_section_(b, l, m, null, r, p, not_bracket_or_next_value_parser_);
exit_section_(b, l, m, r, p, not_bracket_or_next_value_parser_);
return r || p;
}
@@ -127,9 +124,9 @@ public class JsonParser implements PsiParser, LightPsiParser {
private static boolean array_element_1_1(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "array_element_1_1")) return false;
boolean r;
Marker m = enter_section_(b, l, _AND_, null);
Marker m = enter_section_(b, l, _AND_);
r = consumeToken(b, R_BRACKET);
exit_section_(b, l, m, null, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -139,10 +136,10 @@ public class JsonParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "boolean_literal")) return false;
if (!nextTokenIs(b, "<boolean literal>", FALSE, TRUE)) return false;
boolean r;
Marker m = enter_section_(b, l, _NONE_, "<boolean literal>");
Marker m = enter_section_(b, l, _NONE_, BOOLEAN_LITERAL, "<boolean literal>");
r = consumeToken(b, TRUE);
if (!r) r = consumeToken(b, FALSE);
exit_section_(b, l, m, BOOLEAN_LITERAL, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -168,12 +165,12 @@ public class JsonParser implements PsiParser, LightPsiParser {
public static boolean literal(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "literal")) return false;
boolean r;
Marker m = enter_section_(b, l, _COLLAPSE_, "<literal>");
Marker m = enter_section_(b, l, _COLLAPSE_, LITERAL, "<literal>");
r = string_literal(b, l + 1);
if (!r) r = number_literal(b, l + 1);
if (!r) r = boolean_literal(b, l + 1);
if (!r) r = null_literal(b, l + 1);
exit_section_(b, l, m, LITERAL, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -182,9 +179,9 @@ public class JsonParser implements PsiParser, LightPsiParser {
static boolean not_brace_or_next_value(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "not_brace_or_next_value")) return false;
boolean r;
Marker m = enter_section_(b, l, _NOT_, null);
Marker m = enter_section_(b, l, _NOT_);
r = !not_brace_or_next_value_0(b, l + 1);
exit_section_(b, l, m, null, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -204,9 +201,9 @@ public class JsonParser implements PsiParser, LightPsiParser {
static boolean not_bracket_or_next_value(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "not_bracket_or_next_value")) return false;
boolean r;
Marker m = enter_section_(b, l, _NOT_, null);
Marker m = enter_section_(b, l, _NOT_);
r = !not_bracket_or_next_value_0(b, l + 1);
exit_section_(b, l, m, null, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -251,12 +248,12 @@ public class JsonParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "object")) return false;
if (!nextTokenIs(b, L_CURLY)) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, null);
Marker m = enter_section_(b, l, _NONE_, OBJECT, null);
r = consumeToken(b, L_CURLY);
p = r; // pin = 1
r = r && report_error_(b, object_1(b, l + 1));
r = p && consumeToken(b, R_CURLY) && r;
exit_section_(b, l, m, OBJECT, r, p, null);
exit_section_(b, l, m, r, p, null);
return r || p;
}
@@ -277,11 +274,11 @@ public class JsonParser implements PsiParser, LightPsiParser {
static boolean object_element(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "object_element")) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, null);
Marker m = enter_section_(b, l, _NONE_);
r = property(b, l + 1);
p = r; // pin = 1
r = r && object_element_1(b, l + 1);
exit_section_(b, l, m, null, r, p, not_brace_or_next_value_parser_);
exit_section_(b, l, m, r, p, not_brace_or_next_value_parser_);
return r || p;
}
@@ -300,9 +297,9 @@ public class JsonParser implements PsiParser, LightPsiParser {
private static boolean object_element_1_1(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "object_element_1_1")) return false;
boolean r;
Marker m = enter_section_(b, l, _AND_, null);
Marker m = enter_section_(b, l, _AND_);
r = consumeToken(b, R_CURLY);
exit_section_(b, l, m, null, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -311,11 +308,11 @@ public class JsonParser implements PsiParser, LightPsiParser {
public static boolean property(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "property")) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, "<property>");
Marker m = enter_section_(b, l, _NONE_, PROPERTY, "<property>");
r = property_name(b, l + 1);
p = r; // pin = 1
r = r && property_1(b, l + 1);
exit_section_(b, l, m, PROPERTY, r, p, null);
exit_section_(b, l, m, r, p, null);
return r || p;
}
@@ -323,11 +320,11 @@ public class JsonParser implements PsiParser, LightPsiParser {
private static boolean property_1(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "property_1")) return false;
boolean r, p;
Marker m = enter_section_(b, l, _NONE_, null);
Marker m = enter_section_(b, l, _NONE_);
r = consumeToken(b, COLON);
p = r; // pin = 1
r = r && value(b, l + 1);
exit_section_(b, l, m, null, r, p, null);
exit_section_(b, l, m, r, p, null);
return r || p;
}
@@ -361,10 +358,10 @@ public class JsonParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "string_literal")) return false;
if (!nextTokenIs(b, "<string literal>", DOUBLE_QUOTED_STRING, SINGLE_QUOTED_STRING)) return false;
boolean r;
Marker m = enter_section_(b, l, _NONE_, "<string literal>");
Marker m = enter_section_(b, l, _NONE_, STRING_LITERAL, "<string literal>");
r = consumeToken(b, SINGLE_QUOTED_STRING);
if (!r) r = consumeToken(b, DOUBLE_QUOTED_STRING);
exit_section_(b, l, m, STRING_LITERAL, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -373,12 +370,12 @@ public class JsonParser implements PsiParser, LightPsiParser {
public static boolean value(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "value")) return false;
boolean r;
Marker m = enter_section_(b, l, _COLLAPSE_, "<value>");
Marker m = enter_section_(b, l, _COLLAPSE_, VALUE, "<value>");
r = object(b, l + 1);
if (!r) r = array(b, l + 1);
if (!r) r = literal(b, l + 1);
if (!r) r = reference_expression(b, l + 1);
exit_section_(b, l, m, VALUE, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -17,8 +17,12 @@ public class JsonArrayImpl extends JsonContainerImpl implements JsonArray {
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitArray(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitArray(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -16,8 +16,12 @@ public class JsonBooleanLiteralImpl extends JsonLiteralImpl implements JsonBoole
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitBooleanLiteral(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitBooleanLiteral(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -16,8 +16,12 @@ public class JsonContainerImpl extends JsonValueImpl implements JsonContainer {
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitContainer(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitContainer(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -10,14 +10,18 @@ import com.intellij.psi.util.PsiTreeUtil;
import static com.intellij.json.JsonElementTypes.*;
import com.intellij.json.psi.*;
public class JsonLiteralImpl extends JsonLiteralMixin implements JsonLiteral {
public abstract class JsonLiteralImpl extends JsonLiteralMixin implements JsonLiteral {
public JsonLiteralImpl(ASTNode node) {
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitLiteral(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitLiteral(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -16,8 +16,12 @@ public class JsonNullLiteralImpl extends JsonLiteralImpl implements JsonNullLite
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitNullLiteral(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitNullLiteral(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -16,8 +16,12 @@ public class JsonNumberLiteralImpl extends JsonLiteralImpl implements JsonNumber
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitNumberLiteral(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitNumberLiteral(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -17,8 +17,12 @@ public class JsonObjectImpl extends JsonObjectMixin implements JsonObject {
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitObject(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitObject(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -17,8 +17,12 @@ public class JsonPropertyImpl extends JsonPropertyMixin implements JsonProperty
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitProperty(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitProperty(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -16,8 +16,12 @@ public class JsonReferenceExpressionImpl extends JsonValueImpl implements JsonRe
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitReferenceExpression(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitReferenceExpression(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -18,8 +18,12 @@ public class JsonStringLiteralImpl extends JsonStringLiteralMixin implements Jso
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitStringLiteral(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitStringLiteral(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -10,14 +10,18 @@ import com.intellij.psi.util.PsiTreeUtil;
import static com.intellij.json.JsonElementTypes.*;
import com.intellij.json.psi.*;
public class JsonValueImpl extends JsonElementImpl implements JsonValue {
public abstract class JsonValueImpl extends JsonElementImpl implements JsonValue {
public JsonValueImpl(ASTNode node) {
super(node);
}
public void accept(@NotNull JsonElementVisitor visitor) {
visitor.visitValue(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JsonElementVisitor) ((JsonElementVisitor)visitor).visitValue(this);
if (visitor instanceof JsonElementVisitor) accept((JsonElementVisitor)visitor);
else super.accept(visitor);
}
@@ -1,15 +1,15 @@
// This is a generated file. Not intended for manual editing.
package com.jetbrains.commandInterface.commandLine;
import com.intellij.lang.ASTNode;
import com.intellij.lang.LightPsiParser;
import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilder.Marker;
import com.intellij.lang.PsiParser;
import com.intellij.psi.tree.IElementType;
import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
import static com.jetbrains.commandInterface.commandLine.CommandLineParserUtil.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.lang.ASTNode;
import com.intellij.psi.tree.TokenSet;
import com.intellij.lang.PsiParser;
import com.intellij.lang.LightPsiParser;
@SuppressWarnings({"SimplifiableIfStatement", "UnusedAssignment"})
public class CommandLineParser implements PsiParser, LightPsiParser {
@@ -47,11 +47,11 @@ public class CommandLineParser implements PsiParser, LightPsiParser {
public static boolean argument(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "argument")) return false;
boolean r;
Marker m = enter_section_(b, l, _NONE_, "<argument>");
Marker m = enter_section_(b, l, _NONE_, ARGUMENT, "<argument>");
r = consumeToken(b, LITERAL_STARTS_FROM_LETTER);
if (!r) r = consumeToken(b, LITERAL_STARTS_FROM_DIGIT);
if (!r) r = consumeToken(b, LITERAL_STARTS_FROM_SYMBOL);
exit_section_(b, l, m, ARGUMENT, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -79,10 +79,10 @@ public class CommandLineParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "option")) return false;
if (!nextTokenIs(b, "<option>", LONG_OPTION_NAME_TOKEN, SHORT_OPTION_NAME_TOKEN)) return false;
boolean r;
Marker m = enter_section_(b, l, _NONE_, "<option>");
Marker m = enter_section_(b, l, _NONE_, OPTION, "<option>");
r = option_0(b, l + 1);
if (!r) r = option_1(b, l + 1);
exit_section_(b, l, m, OPTION, r, false, null);
exit_section_(b, l, m, r, false, null);
return r;
}
@@ -1,12 +1,13 @@
// This is a generated file. Not intended for manual editing.
package com.jetbrains.commandInterface.commandLine.psi;
import java.util.List;
import org.jetbrains.annotations.*;
import com.intellij.psi.PsiElement;
import com.jetbrains.commandInterface.commandLine.CommandLinePart;
import com.jetbrains.commandInterface.command.Argument;
import com.jetbrains.commandInterface.command.Help;
import com.jetbrains.commandInterface.command.Option;
import com.jetbrains.commandInterface.commandLine.CommandLinePart;
import org.jetbrains.annotations.Nullable;
public interface CommandLineArgument extends CommandLinePart {
@@ -1,19 +1,18 @@
// This is a generated file. Not intended for manual editing.
package com.jetbrains.commandInterface.commandLine.psi.impl;
import java.util.List;
import org.jetbrains.annotations.*;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.util.PsiTreeUtil;
import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
import com.jetbrains.commandInterface.commandLine.CommandLineElement;
import com.jetbrains.commandInterface.commandLine.psi.*;
import com.jetbrains.commandInterface.command.Argument;
import com.jetbrains.commandInterface.command.Help;
import com.jetbrains.commandInterface.command.Option;
import com.jetbrains.commandInterface.commandLine.CommandLineElement;
import com.jetbrains.commandInterface.commandLine.psi.CommandLineArgument;
import com.jetbrains.commandInterface.commandLine.psi.CommandLineVisitor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
public class CommandLineArgumentImpl extends CommandLineElement implements CommandLineArgument {
@@ -21,8 +20,12 @@ public class CommandLineArgumentImpl extends CommandLineElement implements Comma
super(node);
}
public void accept(@NotNull CommandLineVisitor visitor) {
visitor.visitArgument(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitArgument(this);
if (visitor instanceof CommandLineVisitor) accept((CommandLineVisitor)visitor);
else super.accept(visitor);
}
@@ -17,8 +17,12 @@ public class CommandLineCommandImpl extends CommandLineElement implements Comman
super(node);
}
public void accept(@NotNull CommandLineVisitor visitor) {
visitor.visitCommand(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitCommand(this);
if (visitor instanceof CommandLineVisitor) accept((CommandLineVisitor)visitor);
else super.accept(visitor);
}
@@ -18,8 +18,12 @@ public class CommandLineOptionImpl extends CommandLineElement implements Command
super(node);
}
public void accept(@NotNull CommandLineVisitor visitor) {
visitor.visitOption(this);
}
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitOption(this);
if (visitor instanceof CommandLineVisitor) accept((CommandLineVisitor)visitor);
else super.accept(visitor);
}