Skip to content

Commit 1c43020

Browse files
SteworiStewori
committed
Applied AbstractDict-unification of PyDictionary and PyStringMap on derived classes.
1 parent 8834295 commit 1c43020

138 files changed

Lines changed: 691 additions & 691 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/org/python/antlr/ast/AssertDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/AssignDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/AttributeDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/AugAssignDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/BinOpDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/BoolOpDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/BreakDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/CallDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/ClassDefDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

‎src/org/python/antlr/ast/CompareDerived.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private PyObject dict;
50+
private AbstractDict dict;
5151

52-
public PyObject fastGetDict() {
52+
public AbstractDict fastGetDict() {
5353
return dict;
5454
}
5555

56-
public PyObject getDict() {
56+
public AbstractDict getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
61-
if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
62-
dict=newDict;
61+
if (newDict instanceof AbstractDict) {
62+
dict=(AbstractDict)newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

0 commit comments

Comments
 (0)