christoph/lecture-compilers
1
Fork 0
Code Actions Activity

fix logging of nullable strings

Browse Source
This commit is contained in:
ChUrl
2020-12-12 17:35:12 +01:00
parent 0783531711
commit b083702030
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/parser/grammar/LL1GrammarAnalyzer.java
View File

@ -232,7 +232,7 @@ public class LL1GrammarAnalyzer {
String prev = tableOut.put(new AbstractMap.SimpleEntry<>(leftside, sym), rightside);
log("Add " + rightside + " to cell (" + leftside + ", " + sym + ") (" + sym + " in first of " + rightside + ")");
logNullable("Overwritten " + prev + "!\n");
logNullable("Overwritten " + prev + "!\n", prev);
}
final Set<String> followLeftside = this.follow(leftside);
@ -250,7 +250,7 @@ public class LL1GrammarAnalyzer {
String prev = tableOut.put(new AbstractMap.SimpleEntry<>(leftside, sym), rightside);
log("Add " + rightside + " to cell (" + leftside + ", " + sym + ") (" + sym + " in follow of " + leftside + ")");
logNullable("Overwritten " + prev + "!\n");
logNullable("Overwritten " + prev + "!\n", prev);
}
if (followLeftside.contains("$")) {
@ -259,7 +259,7 @@ public class LL1GrammarAnalyzer {
String prev = tableOut.put(new AbstractMap.SimpleEntry<>(leftside, "$"), rightside);
log("Add " + rightside + " to cell (" + leftside + ", $) (epsilon in first of " + rightside + " and $ in follow of " + leftside + ")");
logNullable("Overwritten " + prev + "!\n");
logNullable("Overwritten " + prev + "!\n", prev);
}
}
}

4
src/main/java/util/Logger.java
View File

@ -13,8 +13,8 @@ public final class Logger {
}
}
public static void logNullable(String message) {
if (message != null && !message.isBlank() && !message.isEmpty() && !"null".equals(message)) {
public static void logNullable(String message, String nullable) {
if (nullable != null && !nullable.isBlank() && !nullable.isEmpty() && !"null".equals(nullable)) {
log(message);
}
}