From 648f5b2fdae96296bde609f26d13f7a66a82722d Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 29 Mar 2006 00:34:52 +0000 Subject: [PATCH] Fixed errors --- Robust/src/IR/Flat/BuildCode.java | 2 +- Robust/src/IR/Flat/FlatMethod.java | 2 +- Robust/src/Parse/java14.cup | 2 +- Robust/src/t.test | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java index 6c44f7be..c778b1d6 100644 --- a/Robust/src/IR/Flat/BuildCode.java +++ b/Robust/src/IR/Flat/BuildCode.java @@ -225,7 +225,7 @@ public class BuildCode { //1) Edge >1 of node nodetolabel.put(nn,new Integer(labelindex++)); } - if (!visited.contains(nn)) { + if (!visited.contains(nn)&&!tovisit.contains(nn)) { tovisit.add(nn); } else { //2) Join point diff --git a/Robust/src/IR/Flat/FlatMethod.java b/Robust/src/IR/Flat/FlatMethod.java index 4f8916da..70d11512 100644 --- a/Robust/src/IR/Flat/FlatMethod.java +++ b/Robust/src/IR/Flat/FlatMethod.java @@ -75,7 +75,7 @@ public class FlatMethod extends FlatNode { //1) Edge >1 of node nodetolabel.put(nn,new Integer(labelindex++)); } - if (!visited.contains(nn)) { + if (!visited.contains(nn)&&!tovisit.contains(nn)) { tovisit.add(nn); } else { //2) Join point diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup index 60abe1e9..7bb3ffef 100644 --- a/Robust/src/Parse/java14.cup +++ b/Robust/src/Parse/java14.cup @@ -784,7 +784,7 @@ statement_without_trailing_substatement ::= // | assert_statement ; empty_statement ::= - SEMICOLON {: RESULT=(new ParseNode("statement")).addChild("nop").getRoot(); :} + SEMICOLON {: RESULT=new ParseNode("nop"); :} ; //labeled_statement ::= // IDENTIFIER COLON statement diff --git a/Robust/src/t.test b/Robust/src/t.test index a5ba1dd6..c8244f49 100644 --- a/Robust/src/t.test +++ b/Robust/src/t.test @@ -137,9 +137,8 @@ public class ParseNode extends Object { } public String doIndent(int indent) { - String output = null; - for(int i=0;i