Skip to content

Commit 9ca79e1

Browse files
hnshns
committed
Remove unused code + minor reformatting.
1 parent ae6ce42 commit 9ca79e1

File tree

1 file changed

+25
-39
lines changed

1 file changed

+25
-39
lines changed

‎src/org/mozilla/javascript/Parser.java‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,9 +2598,9 @@ private AstNode propertyAccess(int tt, AstNode pn)
25982598

25992599
if (!compilerEnv.isXmlAvailable()) {
26002600
int maybeName = nextToken();
2601-
if (maybeName != Token.NAME &&
2602-
!(compilerEnv.isReservedKeywordAsIdentifier()
2603-
&& TokenStream.isKeyword(ts.getString()))) {
2601+
if (maybeName != Token.NAME
2602+
&& !(compilerEnv.isReservedKeywordAsIdentifier()
2603+
&& TokenStream.isKeyword(ts.getString()))) {
26042604
reportError("msg.no.name.after.dot");
26052605
}
26062606

@@ -3194,7 +3194,6 @@ private ObjectLiteral objectLiteral()
31943194
Comment jsdocNode = getAndResetJsDoc();
31953195
switch(tt) {
31963196
case Token.NAME:
3197-
afterComma = -1;
31983197
Name name = createNameNode();
31993198
propertyName = ts.getString();
32003199
int ppos = ts.tokenBeg;
@@ -3210,27 +3209,28 @@ private ObjectLiteral objectLiteral()
32103209
// many tokens.)
32113210
int peeked = peekToken();
32123211
boolean maybeGetterOrSetter =
3213-
"get".equals(propertyName)
3214-
|| "set".equals(propertyName);
3212+
"get".equals(propertyName)
3213+
|| "set".equals(propertyName);
32153214
if (maybeGetterOrSetter
3216-
&& peeked != Token.COMMA && peeked != Token.COLON && peeked != Token.RC)
3215+
&& peeked != Token.COMMA
3216+
&& peeked != Token.COLON
3217+
&& peeked != Token.RC)
32173218
{
32183219
boolean isGet = "get".equals(propertyName);
32193220
entryKind = isGet ? GET_ENTRY : SET_ENTRY;
32203221
AstNode pname = objliteralProperty();
32213222
if (pname == null) {
3222-
propertyName = null;
3223+
propertyName = null;
32233224
} else {
3224-
propertyName = ts.getString();
3225-
ObjectProperty objectProp = getterSetterProperty(
3226-
ppos, pname, isGet);
3227-
pname.setJsDocNode(jsdocNode);
3228-
elems.add(objectProp);
3225+
propertyName = ts.getString();
3226+
ObjectProperty objectProp = getterSetterProperty(
3227+
ppos, pname, isGet);
3228+
pname.setJsDocNode(jsdocNode);
3229+
elems.add(objectProp);
32293230
}
32303231
} else {
3231-
AstNode pname = name;
3232-
pname.setJsDocNode(jsdocNode);
3233-
elems.add(plainProperty(pname, tt));
3232+
name.setJsDocNode(jsdocNode);
3233+
elems.add(plainProperty(name, tt));
32343234
}
32353235
break;
32363236

@@ -3242,12 +3242,11 @@ private ObjectLiteral objectLiteral()
32423242
default:
32433243
AstNode pname = objliteralProperty();
32443244
if (pname == null) {
3245-
propertyName = null;
3245+
propertyName = null;
32463246
} else {
3247-
afterComma = -1;
3248-
propertyName = ts.getString();
3249-
pname.setJsDocNode(jsdocNode);
3250-
elems.add(plainProperty(pname, tt));
3247+
propertyName = ts.getString();
3248+
pname.setJsDocNode(jsdocNode);
3249+
elems.add(plainProperty(pname, tt));
32513250
}
32523251
break;
32533252
}
@@ -3256,21 +3255,21 @@ private ObjectLiteral objectLiteral()
32563255
switch (entryKind) {
32573256
case PROP_ENTRY:
32583257
if (getterNames.contains(propertyName)
3259-
|| setterNames.contains(propertyName)) {
3258+
|| setterNames.contains(propertyName)) {
32603259
addError("msg.dup.obj.lit.prop.strict", propertyName);
32613260
}
32623261
getterNames.add(propertyName);
32633262
setterNames.add(propertyName);
32643263
break;
32653264
case GET_ENTRY:
32663265
if (getterNames.contains(propertyName)) {
3267-
addError("msg.dup.obj.lit.prop.strict", propertyName);
3266+
addError("msg.dup.obj.lit.prop.strict", propertyName);
32683267
}
32693268
getterNames.add(propertyName);
32703269
break;
32713270
case SET_ENTRY:
32723271
if (setterNames.contains(propertyName)) {
3273-
addError("msg.dup.obj.lit.prop.strict", propertyName);
3272+
addError("msg.dup.obj.lit.prop.strict", propertyName);
32743273
}
32753274
setterNames.add(propertyName);
32763275
break;
@@ -3279,7 +3278,6 @@ private ObjectLiteral objectLiteral()
32793278

32803279
// Eat any dangling jsdoc in the property.
32813280
getAndResetJsDoc();
3282-
jsdocNode = null;
32833281

32843282
if (matchToken(Token.COMMA)) {
32853283
afterComma = ts.tokenEnd;
@@ -3312,12 +3310,12 @@ private AstNode objliteralProperty() throws IOException {
33123310

33133311
case Token.NUMBER:
33143312
pname = new NumberLiteral(
3315-
ts.tokenBeg, ts.getString(), ts.getNumber());
3313+
ts.tokenBeg, ts.getString(), ts.getNumber());
33163314
break;
33173315

33183316
default:
33193317
if (compilerEnv.isReservedKeywordAsIdentifier()
3320-
&& TokenStream.isKeyword(ts.getString())) {
3318+
&& TokenStream.isKeyword(ts.getString())) {
33213319
// convert keyword to property name, e.g. ({if: 1})
33223320
pname = createNameNode();
33233321
break;
@@ -3497,18 +3495,6 @@ private void saveNameTokenData(int pos, String name, int lineno) {
34973495
prevNameTokenLineno = lineno;
34983496
}
34993497

3500-
// Check whether token is a reserved keyword that is allowed as property id.
3501-
private boolean convertToName(int token) {
3502-
if (compilerEnv.isReservedKeywordAsIdentifier()) {
3503-
String conv = Token.keywordToName(token);
3504-
if (conv != null) {
3505-
saveNameTokenData(ts.tokenBeg, conv, ts.lineno);
3506-
return true;
3507-
}
3508-
}
3509-
return false;
3510-
}
3511-
35123498
/**
35133499
* Return the file offset of the beginning of the input source line
35143500
* containing the passed position.

0 commit comments

Comments
 (0)