precedence field is protected now

This commit is contained in:
Honfika
2013-12-27 15:07:07 +01:00
parent 6b1ebb910c
commit ff6f875c07
18 changed files with 28 additions and 24 deletions
@@ -49,7 +49,7 @@ public abstract class AVM2Item extends GraphTargetItem {
}
if (!empty) {
if (object.precedence > PRECEDENCE_PRIMARY) {
if (object.getPrecedence() > PRECEDENCE_PRIMARY) {
writer.append("(");
object.toString(writer, localData);
writer.append(")");
@@ -44,7 +44,7 @@ public class CallAVM2Item extends AVM2Item {
if (receiver instanceof ThisAVM2Item) {
recPart = "";
}*/
if (function.precedence > precedence) {
if (function.getPrecedence() > precedence) {
writer.append("(");
function.toString(writer, localData);
writer.append(")");
@@ -35,7 +35,7 @@ public class DeclarationAVM2Item extends AVM2Item {
public String type;
public DeclarationAVM2Item(GraphTargetItem assignment, String type) {
super(assignment.src, assignment.precedence);
super(assignment.src, assignment.getPrecedence());
this.type = type;
this.assignment = assignment;
}
@@ -32,8 +32,8 @@ public class AddAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { //string + vs number +
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { //string + vs number +
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");
@@ -39,8 +39,8 @@ public class DivideAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");
@@ -39,8 +39,8 @@ public class ModuloAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");
@@ -37,7 +37,7 @@ public class MultiplyAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide instanceof ModuloAVM2Item) {
if (leftSide.precedence > precedence) {
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");
@@ -36,8 +36,8 @@ public class SubtractAVM2Item extends BinaryOpItem {
@Override
protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (rightSide.precedence >= precedence) { // >= add or subtract too
if (leftSide.precedence > precedence) {
if (rightSide.getPrecedence() >= precedence) { // >= add or subtract too
if (leftSide.getPrecedence() > precedence) {
writer.append("(");
leftSide.toString(writer, localData);
writer.append(")");