christoph/lecture-compilers
1
Fork 0
Code Actions Activity

use unmodifiable collection views

Browse Source
This commit is contained in:
ChUrl
2020-12-15 16:57:09 +01:00
parent 774f0f45f2
commit 1738771d1d
3 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/parser/ParsingTable.java
View File

@ -4,6 +4,7 @@ import parser.grammar.Grammar;
import parser.grammar.GrammarAnalyzer;
import java.util.AbstractMap.SimpleEntry;
import java.util.Collections;
import java.util.Formatter;
import java.util.HashMap;
import java.util.List;
@ -19,11 +20,11 @@ public class ParsingTable {
public ParsingTable(Grammar grammar, Map<Entry<String, String>, String> parsetable) {
this.grammar = grammar;
this.parsetable = parsetable;
this.parsetable = Collections.unmodifiableMap(parsetable);
}
public static ParsingTable fromGrammar(Grammar grammar) {
GrammarAnalyzer analyzer = new GrammarAnalyzer(grammar);
final GrammarAnalyzer analyzer = new GrammarAnalyzer(grammar);
return analyzer.getTable();
}
@ -49,16 +50,16 @@ public class ParsingTable {
@Override
public String toString() {
StringBuilder output = new StringBuilder();
Formatter format = new Formatter(output);
final StringBuilder output = new StringBuilder();
final Formatter format = new Formatter(output);
List<String> inputSymbols = this.parsetable.keySet().stream()
.map(Entry::getValue)
.distinct()
.collect(Collectors.toList());
final List<String> inputSymbols = this.parsetable.keySet().stream()
.map(Entry::getValue)
.distinct()
.collect(Collectors.toList());
// Determine margins
Map<String, Integer> margins = new HashMap<>();
// Determine margins (column-sizes)
final Map<String, Integer> margins = new HashMap<>();
margins.put("NTERM", 0);
for (String terminal : inputSymbols) {
margins.put(terminal, 0);
@ -69,17 +70,16 @@ public class ParsingTable {
margins.put("NTERM", Math.max(margins.get("NTERM"), nonterminal.length()));
for (String terminal : inputSymbols) {
String prod = this.parsetable.get(new SimpleEntry<>(nonterminal, terminal));
final String prod = this.parsetable.get(new SimpleEntry<>(nonterminal, terminal));
int length;
final int length;
if (prod == null) {
length = 0;
} else {
length = prod.length();
}
margins.put(terminal, Math.max(margins.get(terminal), length));
margins.put(terminal, Math.max(margins.get(terminal), terminal.length()));
margins.put(terminal, Math.max(margins.get(terminal), Math.max(length, terminal.length())));
}
}
@ -103,7 +103,7 @@ public class ParsingTable {
format.format("%-Xs| ".replaceAll("X", String.valueOf(margins.get("NTERM"))), nonterminal);
for (String terminal : inputSymbols) {
String prod = this.parsetable.get(new SimpleEntry<>(nonterminal, terminal));
final String prod = this.parsetable.get(new SimpleEntry<>(nonterminal, terminal));
format.format("%-Xs ".replaceAll("X", String.valueOf(margins.get(terminal))), prod == null ? " ".repeat(9) : prod);
}
output.append("|\n");

19
src/main/java/parser/grammar/Grammar.java
View File

@ -6,6 +6,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
@ -47,16 +48,18 @@ public class Grammar {
Map<String, List<String>> valToValMappings,
Map<String, List<String>> delChildMappings,
Set<GrammarRule> rules) {
this.terminals = terminals;
this.nonterminals = nonterminals;
this.terminals = Collections.unmodifiableSet(terminals);
this.nonterminals = Collections.unmodifiableSet(nonterminals);
this.rules = Collections.unmodifiableSet(rules);
this.startSymbol = startSymbol;
this.epsilonSymbol = epsilonSymbol;
this.actions = actions;
this.renameMappings = renameMappings;
this.nameToValMappings = nameToValMappings;
this.valToValMappings = valToValMappings;
this.delChildMappings = delChildMappings;
this.rules = rules;
this.actions = Collections.unmodifiableMap(actions);
this.renameMappings = Collections.unmodifiableMap(renameMappings);
this.nameToValMappings = Collections.unmodifiableMap(nameToValMappings);
this.valToValMappings = Collections.unmodifiableMap(valToValMappings);
this.delChildMappings = Collections.unmodifiableMap(delChildMappings);
}
public static Grammar fromFile(Path path) throws IOException {