Skip to content

Commit 48a7128

Browse files
committed
Fix tests
1 parent b86a10f commit 48a7128

6 files changed

Lines changed: 27 additions & 44 deletions

File tree

.idea/workspace.xml

Lines changed: 16 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TinyRustSymbolTable.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,9 @@ public void newBlock() {
275275
@CalledByParser
276276
public void endBlock() {
277277
List<StatementEntry> statementList = new ArrayList<>();
278-
while (!(statementStack.peek() instanceof BlockStatementEntry)) {
278+
while (!(statementStack.peek() instanceof BlockStatementEntry block)) {
279279
statementList.add(statementStack.pop());
280280
}
281-
BlockStatementEntry block = (BlockStatementEntry) statementStack.peek();
282281
block.setStatements(statementList);
283282
Logger.output("Block: " + block);
284283
}

src/main/java/ko/carbonel/compiler/stream/PeekableStream.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public T peek(int offset) {
6565
return peeks.get(offset);
6666
}
6767

68-
public boolean isClosed() {
69-
return !isNotEOF(peek());
68+
public boolean isOpen() {
69+
return isNotEOF(peek());
7070
}
7171

7272
public Stream<T> stream() {
@@ -78,7 +78,7 @@ public Iterator<T> iterator() {
7878
return new Iterator<>() {
7979
@Override
8080
public boolean hasNext() {
81-
return !isClosed();
81+
return isOpen();
8282
}
8383

8484
@Override

src/main/java/ko/carbonel/config/FileArgument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void setValue(String value) {
4343
value = value.substring(value.indexOf('=') + 1);
4444
File file = new File(value);
4545
if (mustExist && !file.exists()) throw new IllegalArgumentException("File does not exist: " + value + " [CWD = " + Utils.getCWD() + " ]");
46-
if (forRead ? !file.canRead() : !file.canWrite()) throw new IllegalArgumentException("No permissions on file: " + value);
46+
if (forRead ? !file.canRead() : (file.exists() && !file.canWrite())) throw new IllegalArgumentException("No permissions on file: " + value);
4747
if (!extensions.isEmpty() && extensions.stream().noneMatch(value::endsWith)) throw new IllegalArgumentException("Invalid argument: " + value);
4848
this.value = value;
4949
}

src/main/java/ko/carbonel/syntax/grammar/generator/output/RuleTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public boolean canGenerate(String list) {
7272
public boolean canGenerate(PeekableStream<UnannotatedToken> input) {
7373
Deque<UnannotatedToken> stack = new ArrayDeque<>();
7474
stack.push(Generator.START);
75-
while (!input.isClosed()) {
75+
while (input.isOpen()) {
7676
Logger.output(stack.peek() + " <> " + input.peek());
7777
List<UnannotatedTo> unannotatedTos = table.getOrDefault(new Pair<>(stack.peek(), input.peek()), new HashSet<>()).stream().toList();
7878
switch (unannotatedTos.size()) {

src/test/java/ko/carbonel/compiler/config/ConfigTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ void config00() {
2626

2727
@Test
2828
void config01() {
29-
Assertions.assertEquals("", Config.get(ArgumentName.INPUT_RS_FILE).getStringValue());
30-
Config.main(new String[]{"-INPUT_FILE=foo"});
31-
Assertions.assertEquals("foo", Config.get(ArgumentName.INPUT_RS_FILE).getStringValue());
32-
Config.main(new String[]{"+INPUT_FILE=bar"});
33-
Assertions.assertEquals("bar", Config.get(ArgumentName.INPUT_RS_FILE).getStringValue());
29+
Assertions.assertEquals("", Config.get(ArgumentName.OUTPUT_ASM_FILE).getStringValue());
30+
Config.main(new String[]{"-OUTPUT_ASM_FILE=./foo.asm"});
31+
Assertions.assertEquals("./foo.asm", Config.get(ArgumentName.OUTPUT_ASM_FILE).getStringValue());
32+
Config.main(new String[]{"+OUTPUT_ASM_FILE=./bar.asm"});
33+
Assertions.assertEquals("./bar.asm", Config.get(ArgumentName.OUTPUT_ASM_FILE).getStringValue());
3434
}
3535

3636
@Test

0 commit comments

Comments
 (0)