Skip to content

Commit

Permalink
Several fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thihup
Thihup committed Jun 20, 2024
1 parent 65e8db9 commit 8d18ee0
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 104 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
java-version: '22'
java-version: 'dev'
distribution: 'graalvm'
cache: 'maven'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
36 changes: 36 additions & 0 deletions dev.thihup.jvisualg.ide/src/main/java/dev/thihup/jvisualg/ide/ReplaceListener.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package dev.thihup.jvisualg.ide;

import org.fife.rsta.ui.search.SearchEvent;
import org.fife.rsta.ui.search.SearchListener;
import org.fife.ui.rtextarea.RTextArea;
import org.fife.ui.rtextarea.SearchContext;
import org.fife.ui.rtextarea.SearchEngine;

import javax.swing.*;
import java.awt.*;
import java.util.function.Supplier;

class ReplaceListener implements SearchListener {
private final RTextArea textArea;
private final Supplier<SearchContext[]> searchContext;

public ReplaceListener(RTextArea textArea, Supplier<SearchContext[]> searchContext) {
this.textArea = textArea;
this.searchContext = searchContext;
}

@Override
public void searchEvent(SearchEvent searchEvent) {
switch (searchEvent.getType()) {
case FIND -> SearchEngine.find(textArea, searchContext.get()[0]);
case REPLACE -> SearchEngine.replace(textArea, searchContext.get()[0]);
case REPLACE_ALL -> SearchEngine.replaceAll(textArea, searchContext.get()[0]);
case MARK_ALL -> SearchEngine.markAll(textArea, searchContext.get()[0]);
}
}

@Override
public String getSelectedText() {
return textArea.getSelectedText();
}
}
90 changes: 24 additions & 66 deletions dev.thihup.jvisualg.ide/src/main/java/dev/thihup/jvisualg/ide/SwingIDE.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

import com.formdev.flatlaf.FlatLightLaf;
import com.formdev.flatlaf.icons.FlatAbstractIcon;
import dev.thihup.jvisualg.frontend.ASTResult;
import dev.thihup.jvisualg.frontend.Error;
import dev.thihup.jvisualg.frontend.TypeCheckerResult;
import dev.thihup.jvisualg.frontend.VisualgParser;
import dev.thihup.jvisualg.interpreter.*;
import dev.thihup.jvisualg.lsp.CodeCompletion;
import org.fife.rsta.ui.search.*;
Expand All @@ -19,20 +15,15 @@
import javax.swing.table.DefaultTableModel;
import javax.swing.text.BadLocationException;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.*;
import java.awt.print.PrinterException;
import java.io.IOException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.function.Supplier;

public class SwingIDE extends JFrame {

Expand Down Expand Up @@ -65,13 +56,30 @@ public SwingIDE() {

dosContent.setBackground(Color.BLACK);
dosContent.setForeground(Color.WHITE);
dosContent.setFont(Font.getFont(Font.MONOSPACED));
Font monospacedFont = new Font("Consolas", Font.PLAIN, 12);
dosContent.setFont(monospacedFont);
dosContent.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER){
try {
callback.accept(dosContent.getText(lastPromptPosition, dosContent.getText().length()));
lastPromptPosition = dosContent.getText().length();
} catch (BadLocationException ex) {
throw new RuntimeException(ex);
}
}
}
});
dosWindow.add(dosContent);
dosWindow.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
dosWindow.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
public void windowClosing(WindowEvent e) {
interpreter.stop();
dosWindow.setVisible(false);
}

});

interpreter = new Interpreter(new IO(this::readVariable, this::handleOutputEvent),
Expand Down Expand Up @@ -169,7 +177,7 @@ public void actionPerformed(ActionEvent e) {


SearchContext[] searchContexts = new SearchContext[1];
ReplaceToolBar replaceToolBar = new ReplaceToolBar(new ReplaceListener(() -> searchContexts));
ReplaceToolBar replaceToolBar = new ReplaceToolBar(new ReplaceListener(textArea, () -> searchContexts));
searchContexts[0] = replaceToolBar.getSearchContext();


Expand Down Expand Up @@ -202,6 +210,7 @@ public void actionPerformed(ActionEvent e) {
bottomSplitPane.setLeftComponent(debugScrollPane);

outputArea = new JTextArea();
outputArea.setFont(monospacedFont);
JScrollPane outputScrollPane = new JScrollPane(outputArea);
bottomSplitPane.setRightComponent(outputScrollPane);

Expand Down Expand Up @@ -588,11 +597,12 @@ private void resetExecution() {


private void handleExecutionError(Throwable e) {
if (e.getCause() instanceof CancellationException) {
if (e.getCause() instanceof InterruptedException) {
appendOutput("\n*** Execução terminada pelo usuário.", ToWhere.DOS, When.LATER);
appendOutput("\n*** Feche esta janela para retornar ao Visual.", ToWhere.DOS, When.LATER);

appendOutput("\nExecução terminada pelo usuário.", ToWhere.OUTPUT, When.LATER);
return;
} else if (e.getCause() instanceof TypeException) {
appendOutput(e.getCause().getMessage(), ToWhere.OUTPUT, When.LATER);
} else if (e.getCause() != null) {
Expand Down Expand Up @@ -641,56 +651,4 @@ private void updateDebugArea(ProgramState programState) {
.forEach(debugTable::addRow);
}

private static class TypeChecker extends AbstractParser {
@Override
public ParseResult parse(RSyntaxDocument doc, String style) {
DefaultParseResult parseResult = new DefaultParseResult(this);
long start = System.currentTimeMillis();
parseResult.setParsedLines(0, doc.getDefaultRootElement().getElementCount());

try {
String text = doc.getText(0, doc.getLength());
ASTResult astResult = VisualgParser.parse(text);

List<Error> errors = astResult.errors();

astResult.node()
.map(dev.thihup.jvisualg.frontend.TypeChecker::semanticAnalysis)
.map(TypeCheckerResult::errors)
.ifPresent(errors::addAll);

errors.stream()
.map(x -> {
int offset = doc.getTokenListForLine(x.location().startLine() - 1).getOffset();
return new DefaultParserNotice(this, x.message(), x.location().startLine() - 1, offset + x.location().startColumn(), x.location().endColumn() - x.location().startColumn() + 1);
})
.forEach(parseResult::addNotice);
} catch (Exception e) {
parseResult.setError(e);
}
parseResult.setParseTime(System.currentTimeMillis() - start);
return parseResult;
}
}

private class ReplaceListener implements SearchListener {
private final Supplier<SearchContext[]> searchContext;

public ReplaceListener(Supplier<SearchContext[]> searchContext) {
this.searchContext = searchContext;
}

@Override
public void searchEvent(SearchEvent searchEvent) {
switch (searchEvent.getType()) {
case FIND -> SearchEngine.find(textArea, searchContext.get()[0]);
case REPLACE -> SearchEngine.replace(textArea, searchContext.get()[0]);
}
}

@Override
public String getSelectedText() {
return textArea.getSelectedText();
}
}
}
45 changes: 45 additions & 0 deletions dev.thihup.jvisualg.ide/src/main/java/dev/thihup/jvisualg/ide/TypeChecker.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package dev.thihup.jvisualg.ide;

import dev.thihup.jvisualg.frontend.ASTResult;
import dev.thihup.jvisualg.frontend.Error;
import dev.thihup.jvisualg.frontend.TypeCheckerResult;
import dev.thihup.jvisualg.frontend.VisualgParser;
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.parser.AbstractParser;
import org.fife.ui.rsyntaxtextarea.parser.DefaultParseResult;
import org.fife.ui.rsyntaxtextarea.parser.DefaultParserNotice;
import org.fife.ui.rsyntaxtextarea.parser.ParseResult;

import java.util.List;

class TypeChecker extends AbstractParser {
@Override
public ParseResult parse(RSyntaxDocument doc, String style) {
DefaultParseResult parseResult = new DefaultParseResult(this);
long start = System.currentTimeMillis();
parseResult.setParsedLines(0, doc.getDefaultRootElement().getElementCount());

try {
String text = doc.getText(0, doc.getLength());
ASTResult astResult = VisualgParser.parse(text);

List<Error> errors = astResult.errors();

astResult.node()
.map(dev.thihup.jvisualg.frontend.TypeChecker::semanticAnalysis)
.map(TypeCheckerResult::errors)
.ifPresent(errors::addAll);

errors.stream()
.map(x -> {
int offset = doc.getTokenListForLine(x.location().startLine() - 1).getOffset();
return new DefaultParserNotice(this, x.message(), x.location().startLine() - 1, offset + x.location().startColumn(), x.location().endColumn() - x.location().startColumn() + 1);
})
.forEach(parseResult::addNotice);
} catch (Exception e) {
parseResult.setError(e);
}
parseResult.setParseTime(System.currentTimeMillis() - start);
return parseResult;
}
}
54 changes: 25 additions & 29 deletions ...thihup.jvisualg.interpreter/src/main/java/dev/thihup/jvisualg/interpreter/InputState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,29 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import java.util.Locale;
import java.util.Optional;
import java.util.Scanner;
import java.util.random.RandomGenerator;

sealed interface InputState {

default Optional<InputValue> generateValue(InputRequestValue requestValue) {
return Optional.empty();
}
<E extends Throwable> InputValue generateValue(InputRequestValue requestValue) throws E;

static InputState compose(InputState first, InputState second) {
return new CompositeInputState(first, second);
}

record Aleatorio(RandomGenerator random, int start, int end, int decimalPlaces) implements InputState {
@Override
public Optional<InputValue> generateValue(InputRequestValue requestValue) {
return Optional.of(switch (requestValue.type()) {
public InputValue generateValue(InputRequestValue requestValue) {
return switch (requestValue.type()) {
case CARACTER -> new InputValue.CaracterValue(random.ints(65, 91)
.limit(5)
.collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append).toString());
case LOGICO -> new InputValue.LogicoValue(random.nextBoolean());
case REAL -> new InputValue.RealValue(generateRandomDouble(this));
case INTEIRO -> new InputValue.InteiroValue(random.nextInt(start, end));
});
};

}

Expand All @@ -49,12 +44,8 @@ private double generateRandomDouble(Aleatorio aleatorio) {

record ReadInput(IO io) implements InputState {
@Override
public Optional<InputValue> generateValue(InputRequestValue requestValue) {
try {
return io.input().apply(requestValue).join();
} catch (Exception _) {
return Optional.empty();
}
public InputValue generateValue(InputRequestValue requestValue) throws Exception {
return io.input().apply(requestValue).get().orElseThrow();
}
}

Expand All @@ -67,18 +58,14 @@ public Arquivo(String filePath) throws IOException {
}

@Override
public Optional<InputValue> generateValue(InputRequestValue requestValue) {
try {
final String value = scanner.nextLine();
return Optional.of(switch (requestValue.type()) {
case CARACTER -> new InputValue.CaracterValue(value);
case LOGICO -> new InputValue.LogicoValue(value.equalsIgnoreCase("VERDADEIRO"));
case REAL -> new InputValue.RealValue(Double.parseDouble(value));
case INTEIRO -> new InputValue.InteiroValue(Integer.parseInt(value));
});
} catch (Exception _) {
return Optional.empty();
}
public InputValue generateValue(InputRequestValue requestValue) {
String value = scanner.nextLine();
return switch (requestValue.type()) {
case CARACTER -> new InputValue.CaracterValue(value);
case LOGICO -> new InputValue.LogicoValue(value.equalsIgnoreCase("VERDADEIRO"));
case REAL -> new InputValue.RealValue(Double.parseDouble(value));
case INTEIRO -> new InputValue.InteiroValue(Integer.parseInt(value));
};
}
}
}
Expand All @@ -93,7 +80,16 @@ public CompositeInputState(InputState first, InputState second) {
}

@Override
public Optional<InputValue> generateValue(InputRequestValue requestValue) {
return first.generateValue(requestValue).or(() -> second.generateValue(requestValue));
public InputValue generateValue(InputRequestValue requestValue) {
try {
return first.generateValue(requestValue);
} catch (Exception e) {
try {
return second.generateValue(requestValue);
} catch (Exception ee){
ee.addSuppressed(e);
throw e;
}
}
}
}
Loading

0 comments on commit 8d18ee0

Please sign in to comment.