diff --git a/src/main/java/org/sablecc/sablecc/CharSet.java b/src/main/java/org/sablecc/sablecc/CharSet.java
index 38120872c39a593febcab89eda55370c7873bc06..f9a8b5a7d0668f72628264a515eacf1b17f71d90 100644
--- a/src/main/java/org/sablecc/sablecc/CharSet.java
+++ b/src/main/java/org/sablecc/sablecc/CharSet.java
@@ -71,14 +71,12 @@ public class CharSet implements Cloneable
return result;
}
- private void remove
- (Interval interval)
+ private void remove(Interval interval)
{
intervals.remove(interval);
}
- private void add
- (Interval interval)
+ private void add(Interval interval)
{
for(int i = 0; i < intervals.size(); i++)
{
diff --git a/src/main/java/org/sablecc/sablecc/ComputeInlining.java b/src/main/java/org/sablecc/sablecc/ComputeInlining.java
index dbbc7669e973e7526da44e72c3ad45e2d9c895af..6a0b639b24ae69c612cd42d9f9ecce82b38f1237 100644
--- a/src/main/java/org/sablecc/sablecc/ComputeInlining.java
+++ b/src/main/java/org/sablecc/sablecc/ComputeInlining.java
@@ -41,8 +41,7 @@ public class ComputeInlining
Map<String, AProd> productionsMap,
Start tree)
{
- this.setOfProdToBeInline = set
- ;
+ this.setOfProdToBeInline = set;
this.productionsMap = productionsMap;
this.tree = tree;
}
diff --git a/src/main/java/org/sablecc/sablecc/DFA.java b/src/main/java/org/sablecc/sablecc/DFA.java
index 5d5d1ee333877d69b7efabc02b620e77808f16ca..60edb45f70662ea1de639b51d9963de66a5fe143 100644
--- a/src/main/java/org/sablecc/sablecc/DFA.java
+++ b/src/main/java/org/sablecc/sablecc/DFA.java
@@ -250,12 +250,9 @@ public class DFA
{
System.out.print(".");
- IntSet set
- = new IntSet();
- eclosure(i, set
- );
- eclosures[i] = set
- ;
+ IntSet set = new IntSet();
+ eclosure(i, set);
+ eclosures[i] = set;
}
System.out.println();
diff --git a/src/main/java/org/sablecc/sablecc/Grammar.java b/src/main/java/org/sablecc/sablecc/Grammar.java
index 3ee9ec2b30c4b708a74edc8f69ce51ba1f851916..39a835fd719392369eb1d2545c03f13dc33a462f 100644
--- a/src/main/java/org/sablecc/sablecc/Grammar.java
+++ b/src/main/java/org/sablecc/sablecc/Grammar.java
@@ -90,11 +90,9 @@ public final class Grammar
computeFirst();
- LR0ItemSet set
- = new LR0ItemSet();
+ LR0ItemSet set = new LR0ItemSet();
set.set(new LR0Item(startProduction, 0));
- LR1Collection collection = new LR1Collection(set
- );
+ LR1Collection collection = new LR1Collection(set);
System.out.println(" - Computing parse table.");
@@ -418,11 +416,9 @@ public final class Grammar
{
if(!rightside[j].terminal)
{
- SymbolSet set
- = FIRST(rightside, j + 1);
+ SymbolSet set = FIRST(rightside, j + 1);
set.clearEmpty();
- FOLLOW[rightside[j].index].or(set
- );
+ FOLLOW[rightside[j].index].or(set);
}
}
}
@@ -523,8 +519,7 @@ public final class Grammar
// private static final SplayTreeMap fastLr0SetClosure = new SplayTreeMap();
- static LR0ItemSet CLOSURE(LR0ItemSet set
- )
+ static LR0ItemSet CLOSURE(LR0ItemSet set)
{
LR0ItemSet result =
/*
@@ -633,8 +628,7 @@ public final class Grammar
// private static final SplayTreeMap fastLr1SetClosure = new SplayTreeMap();
- static LR1ItemSet CLOSURE(LR1ItemSet set
- )
+ static LR1ItemSet CLOSURE(LR1ItemSet set)
{
LR1ItemSet result =
/*
@@ -666,14 +660,10 @@ public final class Grammar
return result;
}
- static LR0ItemSet GOTO(LR0ItemSet set
- , Symbol symbol)
+ static LR0ItemSet GOTO(LR0ItemSet set, Symbol symbol)
{
- LR0ItemSet initialset = set
- ;
- set
- = CLOSURE(set
- );
+ LR0ItemSet initialset = set;
+ set = CLOSURE(set);
LR0ItemSet result = new LR0ItemSet();
// return all items A->xS.y such that A->x.Sy is in set. (S=symbol)
diff --git a/src/main/java/org/sablecc/sablecc/IntSet.java b/src/main/java/org/sablecc/sablecc/IntSet.java
index 7fe71d8365659453bf08cda7d495a16aba421f17..7b799f991c2888ce7cba3d98f06d18007152e80c 100644
--- a/src/main/java/org/sablecc/sablecc/IntSet.java
+++ b/src/main/java/org/sablecc/sablecc/IntSet.java
@@ -15,17 +15,14 @@ public class IntSet
public IntSet()
{}
- private IntSet(IntSet set
- )
+ private IntSet(IntSet set)
{
elements = set.elements.clone();
}
- public void and(IntSet set
- )
+ public void and(IntSet set)
{
- if(set
- == this)
+ if(set == this)
{
return;
}
@@ -100,8 +97,7 @@ public class IntSet
return false;
}
- IntSet set
- = (IntSet) obj;
+ IntSet set = (IntSet) obj;
if(elements.length != set.elements.length)
{
@@ -119,8 +115,7 @@ public class IntSet
return true;
}
- public boolean get
- (int bit)
+ public boolean get(int bit)
{
int low = 0;
int high = elements.length - 1;
@@ -159,11 +154,9 @@ public class IntSet
return result;
}
- public void or(IntSet set
- )
+ public void or(IntSet set)
{
- if(set
- == this)
+ if(set == this)
{
return;
}
@@ -245,11 +238,9 @@ public class IntSet
}
- public void set
- (int bit)
+ public void set(int bit)
{
- if(!get
- (bit))
+ if(!get(bit))
{
int[] old = elements;
elements = new int[old.length + 1];
@@ -325,11 +316,9 @@ public class IntSet
return s.toString();
}
- public void xor(IntSet set
- )
+ public void xor(IntSet set)
{
- if(set
- == this)
+ if(set == this)
{
set = set.clone();
}
diff --git a/src/main/java/org/sablecc/sablecc/LR0Collection.java b/src/main/java/org/sablecc/sablecc/LR0Collection.java
index 9b0d4293c42788f76afc0cdb395a7f4269b49eef..b11bbd5fa8b8ee0a5b76bd9b36882189964b6480 100644
--- a/src/main/java/org/sablecc/sablecc/LR0Collection.java
+++ b/src/main/java/org/sablecc/sablecc/LR0Collection.java
@@ -19,14 +19,11 @@ final class LR0Collection
private final List<Map<Symbol, Integer>> GOTO = new ArrayList<>();
final List<String> names = new ArrayList<>();
- LR0Collection(LR0ItemSet set
- )
+ LR0Collection(LR0ItemSet set)
{
System.out.println(" - Computing LR(0) items.");
- add
- (set
- , -1, null);
+ add(set, -1, null);
for(int i = 0; i < sets.size(); i++)
{
@@ -35,42 +32,36 @@ final class LR0Collection
for(int j = 0; j < symbols.length; j++)
{
- addGoto(i, symbols[j], Grammar.GOTO(set
- (i), symbols[j]));
+ addGoto(i, symbols[j], Grammar.GOTO(set(i), symbols[j]));
}
}
System.out.println();
}
- private int add
- (LR0ItemSet set
- , int from, Symbol symbol)
+ private int add(LR0ItemSet set, int from, Symbol symbol)
+ {
+ Integer result = set(set);
+
+ if(result == null)
{
- Integer result = set
- (set
- );
+ result = sets.size();
- if(result == null)
+ setIndices.put(set, result);
+ sets.add(set);
+ GOTO.add(new TreeMap<Symbol, Integer>());
+ if(from == -1)
{
- result = sets.size();
-
- setIndices.put(set
- , result);
- sets.add(set);
- GOTO.add(new TreeMap<Symbol, Integer>());
- if(from == -1)
- {
- names.add(" ");
- }
- else
- {
- names.add(names.get(from) + "" + symbol + " ");
- }
+ names.add(" ");
+ }
+ else
+ {
+ names.add(names.get(from) + "" + symbol + " ");
}
-
- return result.intValue();
}
+ return result.intValue();
+ }
+
private static LR0ItemSet empty = new LR0ItemSet();
public static void reinit()
@@ -86,15 +77,12 @@ final class LR0Collection
}
}
- private Integer set
- (LR0ItemSet set
- )
- {
- return setIndices.get(set);
- }
+ private Integer set(LR0ItemSet set)
+ {
+ return setIndices.get(set);
+ }
- private LR0ItemSet set
- (int index)
+ private LR0ItemSet set(int index)
{
return sets.get(index);
}
@@ -104,8 +92,7 @@ final class LR0Collection
return sets.toArray(new LR0ItemSet[0]);
}
- Integer GOTO(int set
- , Symbol symbol)
+ Integer GOTO(int set, Symbol symbol)
{
return GOTO.get(set).get(symbol);
}
diff --git a/src/main/java/org/sablecc/sablecc/LR0ItemAndSetPair.java b/src/main/java/org/sablecc/sablecc/LR0ItemAndSetPair.java
index a411e589dac83217d303994bb281ae1644ca0581..b14678683f13227d600a6148ef1fc60d1b80a3f8 100644
--- a/src/main/java/org/sablecc/sablecc/LR0ItemAndSetPair.java
+++ b/src/main/java/org/sablecc/sablecc/LR0ItemAndSetPair.java
@@ -10,14 +10,11 @@ package org.sablecc.sablecc;
final class LR0ItemAndSetPair
{
public final LR0Item item;
- public final int set
- ;
+ public final int set;
- LR0ItemAndSetPair(LR0Item item, int set
- )
+ LR0ItemAndSetPair(LR0Item item, int set)
{
this.item = item;
- this.set = set
- ;
+ this.set = set;
}
}
diff --git a/src/main/java/org/sablecc/sablecc/LR0ItemSet.java b/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
index 7ff6f80c1b2bf71c6ba688f797ab18b351339b88..f8fe908dbef486a4563c4904befb171eb14dcf9c 100644
--- a/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
+++ b/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
@@ -21,14 +21,12 @@ final class LR0ItemSet implements Cloneable, Comparable<LR0ItemSet>
items = new TreeMap<>();
}
- private LR0ItemSet(LR0ItemSet set
- )
+ private LR0ItemSet(LR0ItemSet set)
{
items = new TreeMap<>(set.items);
}
- void set
- (LR0Item item)
+ void set(LR0Item item)
{
if(items.put(item, item) == null)
{
@@ -37,8 +35,7 @@ final class LR0ItemSet implements Cloneable, Comparable<LR0ItemSet>
}
}
- boolean get
- (LR0Item item)
+ boolean get(LR0Item item)
{
return items.get(item) != null;
}
@@ -77,8 +74,7 @@ final class LR0ItemSet implements Cloneable, Comparable<LR0ItemSet>
for(int j = 0; j <= rightsideLength; j++)
{
LR0Item item = new LR0Item(productions[i].index, j);
- if(get
- (item))
+ if(get(item))
{
if(space)
{
@@ -114,8 +110,7 @@ final class LR0ItemSet implements Cloneable, Comparable<LR0ItemSet>
return false;
}
- LR0ItemSet set
- = (LR0ItemSet) obj;
+ LR0ItemSet set = (LR0ItemSet) obj;
return items.keySet().equals(set.items.keySet());
}
diff --git a/src/main/java/org/sablecc/sablecc/LR1Collection.java b/src/main/java/org/sablecc/sablecc/LR1Collection.java
index 8ed95a7dae19159f06c133ce380a6aa4bc5439bc..250e24ba8b6a6e06bd7e8906ca76c85eb76a1ee5 100644
--- a/src/main/java/org/sablecc/sablecc/LR1Collection.java
+++ b/src/main/java/org/sablecc/sablecc/LR1Collection.java
@@ -18,11 +18,9 @@ final class LR1Collection
final Map<LR0Item, SymbolSet>[] lookaheads;
private final Map<LR0Item, List<LR0ItemAndSetPair>>[] propagation;
- LR1Collection(LR0ItemSet set
- )
+ LR1Collection(LR0ItemSet set)
{
- collection = new LR0Collection(set
- );
+ collection = new LR0Collection(set);
System.out.println(" - Computing LR(1) items.");
diff --git a/src/main/java/org/sablecc/sablecc/LR1ItemSet.java b/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
index c5cd49ec67a39c52cc2e86ceabae4047a62331b3..d6a1e6f76b5b963152a60216e9b05e0041c8a189 100644
--- a/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
+++ b/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
@@ -23,15 +23,13 @@ final class LR1ItemSet implements Cloneable, Comparable<LR1ItemSet>
this.items = new TreeMap<>();
}
- private LR1ItemSet(LR1ItemSet set
- )
+ private LR1ItemSet(LR1ItemSet set)
{
this.items = new TreeMap<>(set.items);
this.hashCode = set.hashCode;
}
- void set
- (LR1Item item)
+ void set(LR1Item item)
{
if(items.put(item, item) == null)
{
@@ -40,8 +38,7 @@ final class LR1ItemSet implements Cloneable, Comparable<LR1ItemSet>
}
}
- boolean get
- (LR1Item item)
+ boolean get(LR1Item item)
{
return items.get(item) != null;
}
@@ -89,8 +86,7 @@ final class LR1ItemSet implements Cloneable, Comparable<LR1ItemSet>
for(int k = 0; k < terminals.length; k++)
{
LR1Item item = new LR1Item(lr0Item, terminals[k].index);
- if(get
- (item))
+ if(get(item))
{
if(comma)
{
@@ -176,8 +172,7 @@ final class LR1ItemSet implements Cloneable, Comparable<LR1ItemSet>
return false;
}
- LR1ItemSet set
- = (LR1ItemSet) obj;
+ LR1ItemSet set = (LR1ItemSet) obj;
return items.keySet().equals(set.items.keySet());
}
diff --git a/src/main/java/org/sablecc/sablecc/SymbolSet.java b/src/main/java/org/sablecc/sablecc/SymbolSet.java
index 6ed30a32655b4b68d59b2a173c7c8b167828651c..c179bd9f5d6e413ba125015c9f4714afd677721a 100644
--- a/src/main/java/org/sablecc/sablecc/SymbolSet.java
+++ b/src/main/java/org/sablecc/sablecc/SymbolSet.java
@@ -46,8 +46,7 @@ final class SymbolSet implements Cloneable
this.nonterminals= new IntSet();
}
- private SymbolSet(SymbolSet set
- )
+ private SymbolSet(SymbolSet set)
{
this.terminals = set.terminals.clone();
this.nonterminals = set.nonterminals.clone();