mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2012-05-15 19:01:08 -07:00
parent e02293b2fe
commit a37a37d4c1
15 changed files with 493 additions and 552 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
View file

@ -376,7 +376,6 @@ public class CoreModel {
return null; return null;
} }
/** /**
* Return true if project has C nature. * Return true if project has C nature.
*/ */

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java
View file

@ -17,7 +17,6 @@ package org.eclipse.cdt.core.dom.ast;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface IASTCompositeTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner, IASTDeclarationListOwner { public interface IASTCompositeTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner, IASTDeclarationListOwner {
/** /**
* <code>TYPE_NAME</code> represents the relationship between an * <code>TYPE_NAME</code> represents the relationship between an
* <code>IASTCompositeTypeSpecifier</code> and its <code>IASTName</code>. * <code>IASTCompositeTypeSpecifier</code> and its <code>IASTName</code>.

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java
View file

@ -17,7 +17,6 @@ package org.eclipse.cdt.core.dom.ast;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner { public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner {
/** /**
* Enumeration. * Enumeration.
*/ */
@ -39,17 +38,16 @@ public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTName
public static final int k_last = k_union; public static final int k_last = k_union;
/** /**
* Get the kind. * Returns the kind.
* *
* @return int (kind). * @return int (kind).
*/ */
public int getKind(); public int getKind();
/** /**
* Set the kind. * Sets the kind.
* *
* @param value * @param value int (kind)
* int (kind)
*/ */
public void setKind(int value); public void setKind(int value);
@ -61,14 +59,14 @@ public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTName
"IASTElaboratedTypeSpecifier.TYPE_NAME - IASTName for IASTElaboratedTypeSpecifier"); //$NON-NLS-1$ "IASTElaboratedTypeSpecifier.TYPE_NAME - IASTName for IASTElaboratedTypeSpecifier"); //$NON-NLS-1$
/** /**
* Get the name. * Returns the name.
* *
* @return <code>IASTName</code> * @return <code>IASTName</code>
*/ */
public IASTName getName(); public IASTName getName();
/** /**
* Set the name. * Sets the name.
* *
* @param name * @param name
* <code>IASTName</code> * <code>IASTName</code>

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
View file

@ -17,7 +17,6 @@ package org.eclipse.cdt.core.dom.ast;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwner { public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwner {
/** /**
* This interface represents an enumerator member of an enum specifier. * This interface represents an enumerator member of an enum specifier.
* *
@ -59,14 +58,14 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
"IASTEnumerator.ENUMERATOR_VALUE - IASTExpression (value) for IASTEnumerator"); //$NON-NLS-1$ "IASTEnumerator.ENUMERATOR_VALUE - IASTExpression (value) for IASTEnumerator"); //$NON-NLS-1$
/** /**
* Set enumerator value. * Sets enumerator value.
* *
* @param expression * @param expression
*/ */
public void setValue(IASTExpression expression); public void setValue(IASTExpression expression);
/** /**
* Get enumerator value. * Returns enumerator value.
* *
* @return <code>IASTExpression</code> value * @return <code>IASTExpression</code> value
*/ */
@ -95,7 +94,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
"IASTEnumerationSpecifier.ENUMERATOR - nested IASTEnumerator for IASTEnumerationSpecifier"); //$NON-NLS-1$ "IASTEnumerationSpecifier.ENUMERATOR - nested IASTEnumerator for IASTEnumerationSpecifier"); //$NON-NLS-1$
/** /**
* Add an enumerator. * Adds an enumerator.
* *
* @param enumerator * @param enumerator
* <code>IASTEnumerator</code> * <code>IASTEnumerator</code>
@ -103,7 +102,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
public void addEnumerator(IASTEnumerator enumerator); public void addEnumerator(IASTEnumerator enumerator);
/** /**
* Get enumerators. * Returns enumerators.
* *
* @return <code>IASTEnumerator []</code> array * @return <code>IASTEnumerator []</code> array
*/ */
@ -117,7 +116,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
"IASTEnumerationSpecifier.ENUMERATION_NAME - IASTName for IASTEnumerationSpecifier"); //$NON-NLS-1$ "IASTEnumerationSpecifier.ENUMERATION_NAME - IASTName for IASTEnumerationSpecifier"); //$NON-NLS-1$
/** /**
* Set the enum's name. * Sets the enum's name.
* *
* @param name * @param name
*/ */

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java
View file

@ -18,11 +18,9 @@ package org.eclipse.cdt.core.dom.ast;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface IASTNamedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner { public interface IASTNamedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner {
/** /**
* <code>NAME</code> describes the relationship between an * <code>NAME</code> describes the relationship between an
* <code>IASTNamedTypeSpecifier</code> and its nested * <code>IASTNamedTypeSpecifier</code> and its nested <code>IASTName</code>.
* <code>IASTName</code>.
*/ */
public static final ASTNodeProperty NAME = new ASTNodeProperty("IASTNamedTypeSpecifier.NAME - IASTName for IASTNamedTypeSpecifier"); //$NON-NLS-1$ public static final ASTNodeProperty NAME = new ASTNodeProperty("IASTNamedTypeSpecifier.NAME - IASTName for IASTNamedTypeSpecifier"); //$NON-NLS-1$

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
View file

@ -27,7 +27,6 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
public static final ASTNodeProperty DECLTYPE_EXPRESSION = new ASTNodeProperty( public static final ASTNodeProperty DECLTYPE_EXPRESSION = new ASTNodeProperty(
"IASTSimpleDeclSpecifier.EXPRESSION [IASTExpression]"); //$NON-NLS-1$ "IASTSimpleDeclSpecifier.EXPRESSION [IASTExpression]"); //$NON-NLS-1$
/** /**
* Used for omitted declaration specifiers. E.g. for declaration of constructors, * Used for omitted declaration specifiers. E.g. for declaration of constructors,
* or in plain c, where this defaults to an integer. * or in plain c, where this defaults to an integer.
@ -109,7 +108,7 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
public IASTSimpleDeclSpecifier copy(); public IASTSimpleDeclSpecifier copy();
/** /**
* This returns the built-in type for the declaration. The type is then * Returns the built-in type for the declaration. The type is then
* refined by qualifiers for signed/unsigned and short/long. The type could * refined by qualifiers for signed/unsigned and short/long. The type could
* also be unspecified which usually means int. * also be unspecified which usually means int.
*/ */
@ -231,5 +230,4 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
*/ */
@Deprecated @Deprecated
public static final int t_last = t_double; // used only in subclasses public static final int t_last = t_double; // used only in subclasses
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java
View file

@ -20,11 +20,9 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface ICASTDeclSpecifier extends IASTDeclSpecifier { public interface ICASTDeclSpecifier extends IASTDeclSpecifier {
/** /**
* @since 5.1 * @since 5.1
*/ */
@Override @Override
public ICASTDeclSpecifier copy(); public ICASTDeclSpecifier copy();
} }

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java
View file

@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier { public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier {
// A declaration in C++ can be a friend declaration // A declaration in C++ can be a friend declaration
/** /**
* Is this a friend declaration? * Is this a friend declaration?
@ -30,10 +29,9 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier {
public boolean isFriend(); public boolean isFriend();
/** /**
* Set this to be a friend declaration true/false. * Sets this to be a friend declaration true/false.
* *
* @param value * @param value the new value
* boolean
*/ */
public void setFriend(boolean value); public void setFriend(boolean value);
@ -45,10 +43,9 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier {
public boolean isVirtual(); public boolean isVirtual();
/** /**
* Set this declaration to be virutal. * Sets this declaration to be virtual.
* *
* @param value * @param value the new value
* boolean
*/ */
public void setVirtual(boolean value); public void setVirtual(boolean value);
@ -60,10 +57,9 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier {
public boolean isExplicit(); public boolean isExplicit();
/** /**
* Set this to be an explicit constructor. * Sets this to be an explicit constructor.
* *
* @param value * @param value the new value
* boolean
*/ */
public void setExplicit(boolean value); public void setExplicit(boolean value);

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java
View file

@ -21,7 +21,6 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
*/ */
@Deprecated @Deprecated
public interface IGPPASTDeclSpecifier extends IASTDeclSpecifier { public interface IGPPASTDeclSpecifier extends IASTDeclSpecifier {
/** /**
* @since 5.1 * @since 5.1
*/ */

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java
View file

@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.core.model.ASTStringUtil;
* Base for all c++ declaration specifiers * Base for all c++ declaration specifiers
*/ */
public abstract class CPPASTBaseDeclSpecifier extends ASTNode implements ICPPASTDeclSpecifier { public abstract class CPPASTBaseDeclSpecifier extends ASTNode implements ICPPASTDeclSpecifier {
private boolean friend; private boolean friend;
private boolean inline; private boolean inline;
private boolean isConst; private boolean isConst;

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java
View file

@ -27,7 +27,6 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTInternalNameOwner;
*/ */
public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier
implements ICPPASTElaboratedTypeSpecifier, IASTInternalNameOwner { implements ICPPASTElaboratedTypeSpecifier, IASTInternalNameOwner {
private int kind; private int kind;
private IASTName name; private IASTName name;

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
View file

@ -24,16 +24,15 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTInternalEnumerationSpecifier
*/ */
public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
implements IASTInternalEnumerationSpecifier, ICPPASTEnumerationSpecifier { implements IASTInternalEnumerationSpecifier, ICPPASTEnumerationSpecifier {
private boolean fIsScoped; private boolean fIsScoped;
private boolean fIsOpaque; private boolean fIsOpaque;
private IASTName fName; private IASTName fName;
private ICPPASTDeclSpecifier fBaseType; private ICPPASTDeclSpecifier fBaseType;
private IASTEnumerator[] fItems = null; private IASTEnumerator[] fItems;
private int fItemPos= -1; private int fItemPos= -1;
private boolean fValuesComputed= false; private boolean fValuesComputed;
private CPPEnumScope fScope; private CPPEnumScope fScope;
public CPPASTEnumerationSpecifier() { public CPPASTEnumerationSpecifier() {
@ -52,8 +51,9 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
@Override @Override
public CPPASTEnumerationSpecifier copy(CopyStyle style) { public CPPASTEnumerationSpecifier copy(CopyStyle style) {
CPPASTEnumerationSpecifier copy = new CPPASTEnumerationSpecifier(fIsScoped, fName == null CPPASTEnumerationSpecifier copy =
? null : fName.copy(style), fBaseType == null ? null : fBaseType.copy(style)); new CPPASTEnumerationSpecifier(fIsScoped, fName == null ? null : fName.copy(style),
fBaseType == null ? null : fBaseType.copy(style));
copy.fIsOpaque = fIsOpaque; copy.fIsOpaque = fIsOpaque;
for (IASTEnumerator enumerator : getEnumerators()) for (IASTEnumerator enumerator : getEnumerators())
copy.addEnumerator(enumerator == null ? null : enumerator.copy(style)); copy.addEnumerator(enumerator == null ? null : enumerator.copy(style));

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java
View file

@ -26,13 +26,11 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics;
public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier
ICPPASTNamedTypeSpecifier, ICPPASTCompletionContext { implements ICPPASTNamedTypeSpecifier, ICPPASTCompletionContext {
private boolean typename; private boolean typename;
private IASTName name; private IASTName name;
public CPPASTNamedTypeSpecifier() { public CPPASTNamedTypeSpecifier() {
} }
@ -47,8 +45,8 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
@Override @Override
public CPPASTNamedTypeSpecifier copy(CopyStyle style) { public CPPASTNamedTypeSpecifier copy(CopyStyle style) {
CPPASTNamedTypeSpecifier copy = new CPPASTNamedTypeSpecifier(name == null ? null CPPASTNamedTypeSpecifier copy =
: name.copy(style)); new CPPASTNamedTypeSpecifier(name == null ? null : name.copy(style));
copyBaseDeclSpec(copy); copyBaseDeclSpec(copy);
copy.typename = typename; copy.typename = typename;
if (style == CopyStyle.withLocations) { if (style == CopyStyle.withLocations) {
@ -73,7 +71,6 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
return name; return name;
} }
@Override @Override
public void setName(IASTName name) { public void setName(IASTName name) {
assertNotFrozen(); assertNotFrozen();

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java
View file

@ -18,16 +18,16 @@ import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier;
import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implements ICPPASTSimpleDeclSpecifier, public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier
IASTAmbiguityParent { implements ICPPASTSimpleDeclSpecifier, IASTAmbiguityParent {
private int type; private int type;
private boolean isSigned; private boolean isSigned;
private boolean isUnsigned; private boolean isUnsigned;
private boolean isShort; private boolean isShort;
private boolean isLong; private boolean isLong;
private boolean isLonglong; private boolean isLonglong;
private boolean isComplex=false; private boolean isComplex;
private boolean isImaginary=false; private boolean isImaginary;
private IASTExpression fDeclTypeExpression; private IASTExpression fDeclTypeExpression;
@Override @Override

112
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/KeywordSets.java
View file

@ -24,8 +24,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
public class KeywordSets { public class KeywordSets {
public static Set<String> getKeywords( KeywordSetKey kind, ParserLanguage language ) public static Set<String> getKeywords(KeywordSetKey kind, ParserLanguage language) {
{
if (kind == KeywordSetKey.EMPTY) if (kind == KeywordSetKey.EMPTY)
return EMPTY_TABLE; return EMPTY_TABLE;
if (kind == KeywordSetKey.DECL_SPECIFIER_SEQUENCE) if (kind == KeywordSetKey.DECL_SPECIFIER_SEQUENCE)
@ -36,8 +35,7 @@ public class KeywordSets {
return STATEMENT_TABLE.get(language); return STATEMENT_TABLE.get(language);
if (kind == KeywordSetKey.BASE_SPECIFIER) if (kind == KeywordSetKey.BASE_SPECIFIER)
return BASE_SPECIFIER_CPP; return BASE_SPECIFIER_CPP;
if( kind == KeywordSetKey.MEMBER ) if (kind == KeywordSetKey.MEMBER) {
{
if (language == ParserLanguage.CPP) if (language == ParserLanguage.CPP)
return CLASS_MEMBER; return CLASS_MEMBER;
return EMPTY_TABLE; return EMPTY_TABLE;
@ -67,23 +65,19 @@ public class KeywordSets {
private static final Set<String> EMPTY_TABLE = new HashSet<String>(0); private static final Set<String> EMPTY_TABLE = new HashSet<String>(0);
private static final Set<String> NAMESPACE_ONLY_SET; private static final Set<String> NAMESPACE_ONLY_SET;
static static {
{
NAMESPACE_ONLY_SET = new HashSet<String>(1); NAMESPACE_ONLY_SET = new HashSet<String>(1);
NAMESPACE_ONLY_SET.add(Keywords.NAMESPACE); NAMESPACE_ONLY_SET.add(Keywords.NAMESPACE);
} }
private static final Set<String> MACRO_ONLY; private static final Set<String> MACRO_ONLY;
static static {
{
MACRO_ONLY = new HashSet<String>(1); MACRO_ONLY = new HashSet<String>(1);
MACRO_ONLY.add("defined()"); //$NON-NLS-1$ MACRO_ONLY.add("defined()"); //$NON-NLS-1$
} }
private static final Set<String> DECL_SPECIFIER_SEQUENCE_C; private static final Set<String> DECL_SPECIFIER_SEQUENCE_C;
static static {
{
DECL_SPECIFIER_SEQUENCE_C = new TreeSet<String>(); DECL_SPECIFIER_SEQUENCE_C = new TreeSet<String>();
DECL_SPECIFIER_SEQUENCE_C.add(Keywords.INLINE); DECL_SPECIFIER_SEQUENCE_C.add(Keywords.INLINE);
DECL_SPECIFIER_SEQUENCE_C.add(Keywords.AUTO); DECL_SPECIFIER_SEQUENCE_C.add(Keywords.AUTO);
@ -112,8 +106,7 @@ public class KeywordSets {
} }
private static final Set<String> DECL_SPECIFIER_SEQUENCE_CPP; private static final Set<String> DECL_SPECIFIER_SEQUENCE_CPP;
static static {
{
DECL_SPECIFIER_SEQUENCE_CPP = new TreeSet<String>(); DECL_SPECIFIER_SEQUENCE_CPP = new TreeSet<String>();
// add all of C then remove the ones we don't need // add all of C then remove the ones we don't need
DECL_SPECIFIER_SEQUENCE_CPP.addAll(DECL_SPECIFIER_SEQUENCE_C); DECL_SPECIFIER_SEQUENCE_CPP.addAll(DECL_SPECIFIER_SEQUENCE_C);
@ -135,16 +128,14 @@ public class KeywordSets {
} }
private static final Map<ParserLanguage, Set<String>> DECL_SPECIFIER_SEQUENCE_TABLE; private static final Map<ParserLanguage, Set<String>> DECL_SPECIFIER_SEQUENCE_TABLE;
static static {
{
DECL_SPECIFIER_SEQUENCE_TABLE = new HashMap<ParserLanguage, Set<String>>(); DECL_SPECIFIER_SEQUENCE_TABLE = new HashMap<ParserLanguage, Set<String>>();
DECL_SPECIFIER_SEQUENCE_TABLE.put(ParserLanguage.CPP, DECL_SPECIFIER_SEQUENCE_CPP); DECL_SPECIFIER_SEQUENCE_TABLE.put(ParserLanguage.CPP, DECL_SPECIFIER_SEQUENCE_CPP);
DECL_SPECIFIER_SEQUENCE_TABLE.put(ParserLanguage.C, DECL_SPECIFIER_SEQUENCE_C); DECL_SPECIFIER_SEQUENCE_TABLE.put(ParserLanguage.C, DECL_SPECIFIER_SEQUENCE_C);
} }
private static final Set<String> DECLARATION_CPP; private static final Set<String> DECLARATION_CPP;
static static {
{
DECLARATION_CPP = new TreeSet<String>(); DECLARATION_CPP = new TreeSet<String>();
DECLARATION_CPP.addAll(DECL_SPECIFIER_SEQUENCE_CPP); DECLARATION_CPP.addAll(DECL_SPECIFIER_SEQUENCE_CPP);
DECLARATION_CPP.add(Keywords.ASM); DECLARATION_CPP.add(Keywords.ASM);
@ -156,24 +147,21 @@ public class KeywordSets {
} }
private static final Set<String> DECLARATION_C; private static final Set<String> DECLARATION_C;
static static {
{
DECLARATION_C = new TreeSet<String>(); DECLARATION_C = new TreeSet<String>();
DECLARATION_C.addAll(DECL_SPECIFIER_SEQUENCE_C); DECLARATION_C.addAll(DECL_SPECIFIER_SEQUENCE_C);
DECLARATION_C.add(Keywords.ASM); DECLARATION_C.add(Keywords.ASM);
} }
private static final Map<ParserLanguage, Set<String>> DECLARATION_TABLE; private static final Map<ParserLanguage, Set<String>> DECLARATION_TABLE;
static static {
{ DECLARATION_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
DECLARATION_TABLE = new HashMap<ParserLanguage,Set<String>>();
DECLARATION_TABLE.put(ParserLanguage.CPP, DECLARATION_CPP); DECLARATION_TABLE.put(ParserLanguage.CPP, DECLARATION_CPP);
DECLARATION_TABLE.put(ParserLanguage.C, DECLARATION_C); DECLARATION_TABLE.put(ParserLanguage.C, DECLARATION_C);
} }
private static final Set<String> EXPRESSION_C; private static final Set<String> EXPRESSION_C;
static static {
{
EXPRESSION_C = new TreeSet<String>(); EXPRESSION_C = new TreeSet<String>();
EXPRESSION_C.add(Keywords.CHAR); EXPRESSION_C.add(Keywords.CHAR);
EXPRESSION_C.add(Keywords.SHORT); EXPRESSION_C.add(Keywords.SHORT);
@ -184,12 +172,10 @@ public class KeywordSets {
EXPRESSION_C.add(Keywords.FLOAT); EXPRESSION_C.add(Keywords.FLOAT);
EXPRESSION_C.add(Keywords.DOUBLE); EXPRESSION_C.add(Keywords.DOUBLE);
EXPRESSION_C.add(Keywords.SIZEOF); EXPRESSION_C.add(Keywords.SIZEOF);
} }
private static final Set<String> EXPRESSION_CPP; private static final Set<String> EXPRESSION_CPP;
static static {
{
EXPRESSION_CPP = new TreeSet<String>(EXPRESSION_C); EXPRESSION_CPP = new TreeSet<String>(EXPRESSION_C);
EXPRESSION_CPP.add(Keywords.BOOL); EXPRESSION_CPP.add(Keywords.BOOL);
EXPRESSION_CPP.add(Keywords.CHAR16_T); EXPRESSION_CPP.add(Keywords.CHAR16_T);
@ -211,16 +197,14 @@ public class KeywordSets {
} }
private static final Map<ParserLanguage, Set<String>> EXPRESSION_TABLE; private static final Map<ParserLanguage, Set<String>> EXPRESSION_TABLE;
static static {
{ EXPRESSION_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
EXPRESSION_TABLE = new HashMap<ParserLanguage,Set<String>>();
EXPRESSION_TABLE.put(ParserLanguage.CPP, EXPRESSION_CPP); EXPRESSION_TABLE.put(ParserLanguage.CPP, EXPRESSION_CPP);
EXPRESSION_TABLE.put(ParserLanguage.C, EXPRESSION_C); EXPRESSION_TABLE.put(ParserLanguage.C, EXPRESSION_C);
} }
private static final Set<String> STATEMENT_C; private static final Set<String> STATEMENT_C;
static static {
{
STATEMENT_C= new TreeSet<String>(); STATEMENT_C= new TreeSet<String>();
STATEMENT_C.addAll(DECLARATION_C); STATEMENT_C.addAll(DECLARATION_C);
STATEMENT_C.addAll(EXPRESSION_C); STATEMENT_C.addAll(EXPRESSION_C);
@ -239,8 +223,7 @@ public class KeywordSets {
} }
private static final Set<String> STATEMENT_CPP; private static final Set<String> STATEMENT_CPP;
static static {
{
STATEMENT_CPP = new TreeSet<String>(DECLARATION_CPP); STATEMENT_CPP = new TreeSet<String>(DECLARATION_CPP);
STATEMENT_CPP.addAll(EXPRESSION_CPP); STATEMENT_CPP.addAll(EXPRESSION_CPP);
STATEMENT_CPP.add(Keywords.TRY); STATEMENT_CPP.add(Keywords.TRY);
@ -260,16 +243,14 @@ public class KeywordSets {
} }
private static final Map<ParserLanguage, Set<String>> STATEMENT_TABLE; private static final Map<ParserLanguage, Set<String>> STATEMENT_TABLE;
static static {
{
STATEMENT_TABLE = new HashMap<ParserLanguage, Set<String>>(); STATEMENT_TABLE = new HashMap<ParserLanguage, Set<String>>();
STATEMENT_TABLE.put(ParserLanguage.CPP, STATEMENT_CPP); STATEMENT_TABLE.put(ParserLanguage.CPP, STATEMENT_CPP);
STATEMENT_TABLE.put(ParserLanguage.C, STATEMENT_C); STATEMENT_TABLE.put(ParserLanguage.C, STATEMENT_C);
} }
private static final Set<String> BASE_SPECIFIER_CPP; private static final Set<String> BASE_SPECIFIER_CPP;
static static {
{
BASE_SPECIFIER_CPP = new TreeSet<String>(); BASE_SPECIFIER_CPP = new TreeSet<String>();
BASE_SPECIFIER_CPP.add(Keywords.PUBLIC); BASE_SPECIFIER_CPP.add(Keywords.PUBLIC);
BASE_SPECIFIER_CPP.add(Keywords.PROTECTED); BASE_SPECIFIER_CPP.add(Keywords.PROTECTED);
@ -278,8 +259,7 @@ public class KeywordSets {
} }
private static final Set<String> CLASS_MEMBER; private static final Set<String> CLASS_MEMBER;
static static {
{
CLASS_MEMBER = new TreeSet<String>(DECL_SPECIFIER_SEQUENCE_CPP); CLASS_MEMBER = new TreeSet<String>(DECL_SPECIFIER_SEQUENCE_CPP);
CLASS_MEMBER.add(Keywords.PUBLIC); CLASS_MEMBER.add(Keywords.PUBLIC);
CLASS_MEMBER.add(Keywords.PROTECTED); CLASS_MEMBER.add(Keywords.PROTECTED);
@ -287,8 +267,7 @@ public class KeywordSets {
} }
private static final Set<String> POST_USING_CPP; private static final Set<String> POST_USING_CPP;
static static {
{
POST_USING_CPP = new TreeSet<String>(); POST_USING_CPP = new TreeSet<String>();
POST_USING_CPP.add(Keywords.NAMESPACE); POST_USING_CPP.add(Keywords.NAMESPACE);
POST_USING_CPP.add(Keywords.TYPENAME); POST_USING_CPP.add(Keywords.TYPENAME);
@ -297,8 +276,7 @@ public class KeywordSets {
private static final Set<String> FUNCTION_MODIFIER_C = EMPTY_TABLE; private static final Set<String> FUNCTION_MODIFIER_C = EMPTY_TABLE;
private static final Set<String> FUNCTION_MODIFIER_CPP; private static final Set<String> FUNCTION_MODIFIER_CPP;
static static {
{
FUNCTION_MODIFIER_CPP = new TreeSet<String>(FUNCTION_MODIFIER_C); FUNCTION_MODIFIER_CPP = new TreeSet<String>(FUNCTION_MODIFIER_C);
FUNCTION_MODIFIER_CPP.add(Keywords.THROW); FUNCTION_MODIFIER_CPP.add(Keywords.THROW);
@ -307,16 +285,14 @@ public class KeywordSets {
} }
private static final Map<ParserLanguage, Set<String>> FUNCTION_MODIFIER_TABLE; private static final Map<ParserLanguage, Set<String>> FUNCTION_MODIFIER_TABLE;
static static {
{
FUNCTION_MODIFIER_TABLE= new HashMap<ParserLanguage, Set<String>>(2); FUNCTION_MODIFIER_TABLE= new HashMap<ParserLanguage, Set<String>>(2);
FUNCTION_MODIFIER_TABLE.put(ParserLanguage.CPP, FUNCTION_MODIFIER_CPP); FUNCTION_MODIFIER_TABLE.put(ParserLanguage.CPP, FUNCTION_MODIFIER_CPP);
FUNCTION_MODIFIER_TABLE.put(ParserLanguage.C, FUNCTION_MODIFIER_C); FUNCTION_MODIFIER_TABLE.put(ParserLanguage.C, FUNCTION_MODIFIER_C);
} }
private static final Set<String> PP_DIRECTIVES_C; private static final Set<String> PP_DIRECTIVES_C;
static static {
{
PP_DIRECTIVES_C = new TreeSet<String>(); PP_DIRECTIVES_C = new TreeSet<String>();
PP_DIRECTIVES_C.add(Directives.POUND_BLANK); PP_DIRECTIVES_C.add(Directives.POUND_BLANK);
PP_DIRECTIVES_C.add(Directives.POUND_DEFINE); PP_DIRECTIVES_C.add(Directives.POUND_DEFINE);
@ -335,10 +311,8 @@ public class KeywordSets {
PP_DIRECTIVES_C.add(Directives.DEFINED); PP_DIRECTIVES_C.add(Directives.DEFINED);
} }
private static final Set<String> PP_DIRECTIVES_CPP; private static final Set<String> PP_DIRECTIVES_CPP;
static static {
{
PP_DIRECTIVES_CPP = new TreeSet<String>(); PP_DIRECTIVES_CPP = new TreeSet<String>();
PP_DIRECTIVES_CPP.add(Directives.POUND_BLANK); PP_DIRECTIVES_CPP.add(Directives.POUND_BLANK);
PP_DIRECTIVES_CPP.add(Directives.POUND_DEFINE); PP_DIRECTIVES_CPP.add(Directives.POUND_DEFINE);
@ -358,8 +332,7 @@ public class KeywordSets {
} }
private static final Set<String> ALL_C; private static final Set<String> ALL_C;
static static {
{
ALL_C = new TreeSet<String>(PP_DIRECTIVES_CPP); ALL_C = new TreeSet<String>(PP_DIRECTIVES_CPP);
ALL_C.add(Keywords.AUTO); ALL_C.add(Keywords.AUTO);
ALL_C.add(Keywords.BREAK); ALL_C.add(Keywords.BREAK);
@ -402,8 +375,7 @@ public class KeywordSets {
} }
private static final Set<String> ALL_CPP; private static final Set<String> ALL_CPP;
static static {
{
ALL_CPP = new TreeSet<String>(PP_DIRECTIVES_CPP); ALL_CPP = new TreeSet<String>(PP_DIRECTIVES_CPP);
ALL_CPP.add(Keywords.AND); ALL_CPP.add(Keywords.AND);
ALL_CPP.add(Keywords.AND_EQ); ALL_CPP.add(Keywords.AND_EQ);
@ -484,19 +456,17 @@ public class KeywordSets {
ALL_CPP.add(Keywords.WHILE); ALL_CPP.add(Keywords.WHILE);
ALL_CPP.add(Keywords.XOR); ALL_CPP.add(Keywords.XOR);
ALL_CPP.add(Keywords.XOR_EQ); ALL_CPP.add(Keywords.XOR_EQ);
} }
private static final Map<ParserLanguage, Set<String>> ALL_TABLE; private static final Map<ParserLanguage, Set<String>> ALL_TABLE;
static static {
{
ALL_TABLE = new HashMap<ParserLanguage, Set<String>>(2); ALL_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
ALL_TABLE.put(ParserLanguage.C, ALL_C); ALL_TABLE.put(ParserLanguage.C, ALL_C);
ALL_TABLE.put(ParserLanguage.CPP, ALL_CPP); ALL_TABLE.put(ParserLanguage.CPP, ALL_CPP);
} }
private static final Set<String> KEYWORDS_CPP; private static final Set<String> KEYWORDS_CPP;
static static {
{
KEYWORDS_CPP = new TreeSet<String>(); KEYWORDS_CPP = new TreeSet<String>();
KEYWORDS_CPP.add(Keywords.AND); KEYWORDS_CPP.add(Keywords.AND);
KEYWORDS_CPP.add(Keywords.AND_EQ); KEYWORDS_CPP.add(Keywords.AND_EQ);
@ -565,12 +535,10 @@ public class KeywordSets {
KEYWORDS_CPP.add(Keywords.WHILE); KEYWORDS_CPP.add(Keywords.WHILE);
KEYWORDS_CPP.add(Keywords.XOR); KEYWORDS_CPP.add(Keywords.XOR);
KEYWORDS_CPP.add(Keywords.XOR_EQ); KEYWORDS_CPP.add(Keywords.XOR_EQ);
} }
private static Set<String> KEYWORDS_C; private static Set<String> KEYWORDS_C;
static static {
{
KEYWORDS_C = new TreeSet<String>(); KEYWORDS_C = new TreeSet<String>();
KEYWORDS_C.add(Keywords.ASM); KEYWORDS_C.add(Keywords.ASM);
KEYWORDS_C.add(Keywords.AUTO); KEYWORDS_C.add(Keywords.AUTO);
@ -600,19 +568,15 @@ public class KeywordSets {
KEYWORDS_C.add(Keywords.WHILE); KEYWORDS_C.add(Keywords.WHILE);
} }
private static final Map<ParserLanguage, Set<String>> KEYWORDS_TABLE; private static final Map<ParserLanguage, Set<String>> KEYWORDS_TABLE;
static static {
{
KEYWORDS_TABLE = new HashMap<ParserLanguage, Set<String>>(2); KEYWORDS_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
KEYWORDS_TABLE.put(ParserLanguage.C, KEYWORDS_C); KEYWORDS_TABLE.put(ParserLanguage.C, KEYWORDS_C);
KEYWORDS_TABLE.put(ParserLanguage.CPP, KEYWORDS_CPP); KEYWORDS_TABLE.put(ParserLanguage.CPP, KEYWORDS_CPP);
} }
private static final Set<String> TYPES_C; private static final Set<String> TYPES_C;
static static {
{
TYPES_C = new TreeSet<String>(); TYPES_C = new TreeSet<String>();
TYPES_C.add(Keywords.CHAR); TYPES_C.add(Keywords.CHAR);
TYPES_C.add(Keywords.DOUBLE); TYPES_C.add(Keywords.DOUBLE);
@ -627,9 +591,9 @@ public class KeywordSets {
TYPES_C.add(Keywords._COMPLEX); TYPES_C.add(Keywords._COMPLEX);
TYPES_C.add(Keywords._IMAGINARY); TYPES_C.add(Keywords._IMAGINARY);
} }
private static final Set<String> TYPES_CPP; private static final Set<String> TYPES_CPP;
static static {
{
TYPES_CPP = new TreeSet<String>(); TYPES_CPP = new TreeSet<String>();
TYPES_CPP.add(Keywords.BOOL); TYPES_CPP.add(Keywords.BOOL);
TYPES_CPP.add(Keywords.CHAR); TYPES_CPP.add(Keywords.CHAR);
@ -647,16 +611,14 @@ public class KeywordSets {
} }
private static Map<ParserLanguage, Set<String>> TYPES_TABLE; private static Map<ParserLanguage, Set<String>> TYPES_TABLE;
static static {
{
TYPES_TABLE = new HashMap<ParserLanguage, Set<String>>(2); TYPES_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
TYPES_TABLE.put(ParserLanguage.C, TYPES_C); TYPES_TABLE.put(ParserLanguage.C, TYPES_C);
TYPES_TABLE.put(ParserLanguage.CPP, TYPES_CPP); TYPES_TABLE.put(ParserLanguage.CPP, TYPES_CPP);
} }
private static Map<ParserLanguage, Set<String>> PP_DIRECTIVES_TABLE; private static Map<ParserLanguage, Set<String>> PP_DIRECTIVES_TABLE;
static static {
{
PP_DIRECTIVES_TABLE = new HashMap<ParserLanguage, Set<String>>(2); PP_DIRECTIVES_TABLE = new HashMap<ParserLanguage, Set<String>>(2);
PP_DIRECTIVES_TABLE.put(ParserLanguage.C, PP_DIRECTIVES_C); PP_DIRECTIVES_TABLE.put(ParserLanguage.C, PP_DIRECTIVES_C);
PP_DIRECTIVES_TABLE.put(ParserLanguage.CPP, PP_DIRECTIVES_CPP); PP_DIRECTIVES_TABLE.put(ParserLanguage.CPP, PP_DIRECTIVES_CPP);