mirror of
https://github.com/Kugelschieber/asl.git
synced 2026-01-18 12:00:25 +00:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41b8b74639 | ||
|
|
df79809cdd | ||
|
|
1c67be7d2e | ||
|
|
8477b443b0 | ||
|
|
511ceb128f | ||
|
|
07ce5e7a0b | ||
|
|
ca26fbf6d4 | ||
|
|
0c63114c44 | ||
|
|
1eb5ce8035 | ||
|
|
68f05f09ea | ||
|
|
aa83a9a093 | ||
|
|
5bcfda10bd | ||
|
|
664b435715 | ||
|
|
f1f564d89b | ||
|
|
fa766cc78c | ||
|
|
59f02f7782 | ||
|
|
1208bda68c | ||
|
|
11c9d19c25 |
@@ -1,5 +1,10 @@
|
||||
# Changelog
|
||||
|
||||
**1.1.1**
|
||||
|
||||
* arrays can now be declared within expressions
|
||||
* code keyword bug fix
|
||||
|
||||
**1.1.0**
|
||||
|
||||
* changed syntax of foreach
|
||||
|
||||
15
README.md
15
README.md
@@ -68,6 +68,9 @@ var one = array[0];
|
||||
|
||||
// accessing using a statement:
|
||||
var zwo = array[33/3-2];
|
||||
|
||||
// it is possble to use arrays in expressions:
|
||||
var emptyArray = one-[0];
|
||||
```
|
||||
|
||||
### Control structures
|
||||
@@ -252,18 +255,14 @@ The following features are not implemented yet, but will be in 1.1.0 or a future
|
||||
|
||||
* scopes
|
||||
* else if
|
||||
* arrays within expressions (like someArray-[someEntity])
|
||||
* selector in expression
|
||||
|
||||
scopes won't be supported, since they are a stupid concept and can be replaced by functions.
|
||||
There is a simple workaround for arrays within expressions:
|
||||
|
||||
Selectors in expressions do not work (yet):
|
||||
|
||||
```
|
||||
// want: ... forEach allCurators-[myCurator];
|
||||
|
||||
var myCuratorArray = [myCurator]; // or a more complex expression within array
|
||||
foreach allCurators-myCuratorArray {
|
||||
// ...
|
||||
}
|
||||
var x = ([1, 2, 3]-[1, 2])[0]; // should result in 3
|
||||
```
|
||||
|
||||
## Contribute
|
||||
|
||||
BIN
gui/ASL GUI.exe
Normal file
BIN
gui/ASL GUI.exe
Normal file
Binary file not shown.
14
gui/README.md
Normal file
14
gui/README.md
Normal file
@@ -0,0 +1,14 @@
|
||||
ASL GUI <img src="https://img.shields.io/badge/version-1.0.0.0-lightgrey.svg" alt="version">
|
||||
=========
|
||||
|
||||
An optional Java interface to make the compile procces of ASL faster and more user-friendly. It's released under the MIT licence just like the core project.
|
||||
|
||||
Maintained by yours truly: [654wak654](https://github.com/654wak654/)
|
||||
|
||||
**Version 1.0.0.0**
|
||||
|
||||
More style changes and bug fixes, marked ready for release.
|
||||
|
||||
**Version 0.3.0.0:**
|
||||
|
||||
Fixed some possible bugs, did some style fixes and other code adjustments. It's now is readable without getting cataracts. Mostly anyway...
|
||||
67
gui/src/asl/gui/DlgError.java
Normal file
67
gui/src/asl/gui/DlgError.java
Normal file
@@ -0,0 +1,67 @@
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright 2015 Ozan Egitmen.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package asl.gui;
|
||||
|
||||
public class DlgError extends javax.swing.JDialog {
|
||||
|
||||
boolean isAbort = true;
|
||||
|
||||
public DlgError(java.awt.Frame parent, boolean modal, String errorMessage) {
|
||||
super(parent, modal);
|
||||
initComponents();
|
||||
lblError.setText(errorMessage);
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
|
||||
lblError = new javax.swing.JLabel();
|
||||
lblTitle = new javax.swing.JLabel();
|
||||
|
||||
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
|
||||
setTitle("ERROR");
|
||||
setIconImage(null);
|
||||
setMinimumSize(new java.awt.Dimension(380, 150));
|
||||
setResizable(false);
|
||||
setType(java.awt.Window.Type.POPUP);
|
||||
|
||||
lblError.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
|
||||
lblError.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
|
||||
lblError.setText("Some error");
|
||||
|
||||
lblTitle.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
|
||||
lblTitle.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
|
||||
lblTitle.setText("asl.exe has encountered an error:");
|
||||
lblTitle.setToolTipText("");
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
|
||||
getContentPane().setLayout(layout);
|
||||
layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblTitle, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE).addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
|
||||
layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addContainerGap().addComponent(lblTitle).addGap(18, 18, 18).addComponent(lblError).addGap(27, 27, 27)));
|
||||
|
||||
pack();
|
||||
}
|
||||
|
||||
private javax.swing.JLabel lblError;
|
||||
private javax.swing.JLabel lblTitle;
|
||||
}
|
||||
370
gui/src/asl/gui/Main.java
Normal file
370
gui/src/asl/gui/Main.java
Normal file
@@ -0,0 +1,370 @@
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright 2015 Ozan Egitmen.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package asl.gui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.prefs.Preferences;
|
||||
import javax.swing.BorderFactory;
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.UnsupportedLookAndFeelException;
|
||||
import javax.swing.border.Border;
|
||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||
import javax.swing.plaf.ColorUIResource;
|
||||
|
||||
public class Main extends javax.swing.JFrame {
|
||||
|
||||
Preferences prefs = Preferences.userRoot().node(this.getClass().getName());
|
||||
boolean inputError = false, outputError = false, aslError = false;
|
||||
|
||||
public Main() {
|
||||
initComponents();
|
||||
getContentPane().setBackground(Color.WHITE);
|
||||
lblASLError.setText(" ");
|
||||
lblInputError.setText(" ");
|
||||
lblOutputError.setText(" ");
|
||||
txtASLDir.setText(prefs.get("aslDir", ""));
|
||||
txtInputDir.setText(prefs.get("inputDir", ""));
|
||||
txtOutputDir.setText(prefs.get("outputDir", ""));
|
||||
cbCompileAll.setSelected(prefs.getBoolean("compileAll", false));
|
||||
cbPrettyPrinting.setSelected(prefs.getBoolean("prettyPrinting", false));
|
||||
}
|
||||
|
||||
private String fileChooser(String title, int fileType) {
|
||||
JFileChooser chooser = new JFileChooser();
|
||||
if (fileType == 0) {
|
||||
chooser.setFileFilter(new FileNameExtensionFilter("Executable", "exe"));
|
||||
chooser.setAcceptAllFileFilterUsed(false);
|
||||
}
|
||||
chooser.setFileSelectionMode(fileType);
|
||||
chooser.setDialogTitle(title);
|
||||
String selectedPath = "";
|
||||
if (chooser.showOpenDialog(null) == 0)
|
||||
selectedPath = chooser.getSelectedFile().toString();
|
||||
else
|
||||
chooser.cancelSelection();
|
||||
return selectedPath;
|
||||
}
|
||||
|
||||
private void setErrorCondition(int i, boolean j) {
|
||||
if (i == 0) {
|
||||
lblASLError.setText(j ? "asl.exe isn't in this location! You can click this message to download it." : " ");
|
||||
aslError = j;
|
||||
} else if (i == 1) {
|
||||
lblInputError.setText(j ? "This folder doesn't exist!" : " ");
|
||||
inputError = j;
|
||||
} else {
|
||||
lblOutputError.setText(j ? "Output folder doesn't exsist! Click this message to create it." : " ");
|
||||
outputError = j;
|
||||
}
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
|
||||
lblInput = new javax.swing.JLabel();
|
||||
txtInputDir = new javax.swing.JTextField();
|
||||
lblOutput = new javax.swing.JLabel();
|
||||
txtOutputDir = new javax.swing.JTextField();
|
||||
btnInput = new javax.swing.JButton();
|
||||
btnOutput = new javax.swing.JButton();
|
||||
lblASL = new javax.swing.JLabel();
|
||||
txtASLDir = new javax.swing.JTextField();
|
||||
btnASL = new javax.swing.JButton();
|
||||
jSeparator = new javax.swing.JSeparator();
|
||||
lblASLSmall = new javax.swing.JLabel();
|
||||
lblInputSmall = new javax.swing.JLabel();
|
||||
lblOutputSmall = new javax.swing.JLabel();
|
||||
cbCompileAll = new javax.swing.JCheckBox();
|
||||
cbPrettyPrinting = new javax.swing.JCheckBox();
|
||||
btnCompile = new javax.swing.JButton();
|
||||
lblASLError = new javax.swing.JLabel();
|
||||
lblInputError = new javax.swing.JLabel();
|
||||
lblOutputError = new javax.swing.JLabel();
|
||||
|
||||
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
|
||||
setTitle("ASL GUI");
|
||||
setResizable(false);
|
||||
|
||||
lblInput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
|
||||
lblInput.setText("Input Directory:");
|
||||
lblInput.setOpaque(true);
|
||||
|
||||
txtInputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
|
||||
|
||||
lblOutput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
|
||||
lblOutput.setText("Output Directory:");
|
||||
lblOutput.setOpaque(true);
|
||||
|
||||
txtOutputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
|
||||
|
||||
btnInput.setText("...");
|
||||
btnInput.setToolTipText("Opens a dialog to select input file");
|
||||
btnInput.setFocusable(false);
|
||||
btnInput.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
btnInputMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
btnOutput.setText("...");
|
||||
btnOutput.setToolTipText("Opens a dialog to select output directory");
|
||||
btnOutput.setFocusable(false);
|
||||
btnOutput.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
btnOutputMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
lblASL.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
|
||||
lblASL.setText("ASL Compiler Directory");
|
||||
lblASL.setOpaque(true);
|
||||
|
||||
txtASLDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
|
||||
|
||||
btnASL.setText("...");
|
||||
btnASL.setToolTipText("Opens a dialog to select the compiler location");
|
||||
btnASL.setFocusable(false);
|
||||
btnASL.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
btnASLMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
jSeparator.setToolTipText("");
|
||||
|
||||
lblASLSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblASLSmall.setText("Location of the asl.exe file.");
|
||||
lblASLSmall.setOpaque(true);
|
||||
|
||||
lblInputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblInputSmall.setText("Directory of scripts that will be compiled in to the output directory.");
|
||||
lblInputSmall.setOpaque(true);
|
||||
|
||||
lblOutputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblOutputSmall.setText("Directory that the compiled .sqf script(s) will be saved in.");
|
||||
lblOutputSmall.setOpaque(true);
|
||||
|
||||
cbCompileAll.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11));
|
||||
cbCompileAll.setText("Compile all scripts in subfolders too.");
|
||||
cbCompileAll.setFocusable(false);
|
||||
cbCompileAll.addChangeListener(new javax.swing.event.ChangeListener() {
|
||||
public void stateChanged(javax.swing.event.ChangeEvent evt) {
|
||||
cbCompileAllStateChanged(evt);
|
||||
}
|
||||
});
|
||||
|
||||
cbPrettyPrinting.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11));
|
||||
cbPrettyPrinting.setText("Activate pretty printing.");
|
||||
cbPrettyPrinting.setFocusable(false);
|
||||
cbPrettyPrinting.addChangeListener(new javax.swing.event.ChangeListener() {
|
||||
public void stateChanged(javax.swing.event.ChangeEvent evt) {
|
||||
cbPrettyPrintingStateChanged(evt);
|
||||
}
|
||||
});
|
||||
|
||||
btnCompile.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
|
||||
btnCompile.setText("Compile");
|
||||
btnCompile.setToolTipText("Opens a dialog to select output directory");
|
||||
btnCompile.setFocusable(false);
|
||||
btnCompile.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
btnCompileMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
lblASLError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblASLError.setForeground(java.awt.Color.red);
|
||||
lblASLError.setText("Some error");
|
||||
lblASLError.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
lblASLErrorMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
lblInputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblInputError.setForeground(java.awt.Color.red);
|
||||
lblInputError.setText("Some error");
|
||||
|
||||
lblOutputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
|
||||
lblOutputError.setForeground(java.awt.Color.red);
|
||||
lblOutputError.setText("Some error");
|
||||
lblOutputError.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
lblOutputErrorMouseClicked(evt);
|
||||
}
|
||||
});
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
|
||||
getContentPane().setLayout(layout);
|
||||
layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jSeparator).addGroup(layout.createSequentialGroup().addGap(15, 15, 15).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblOutputError, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(lblInputError, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false).addComponent(lblASLError, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblASL).addComponent(lblASLSmall).addGroup(layout.createSequentialGroup().addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(6, 6, 6).addComponent(btnASL)).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING).addComponent(txtOutputDir, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(lblOutput, javax.swing.GroupLayout.Alignment.LEADING)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(btnOutput)).addComponent(lblOutputSmall).addComponent(lblInput).addGroup(layout.createSequentialGroup().addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(btnInput)).addComponent(lblInputSmall).addComponent(cbCompileAll).addComponent(cbPrettyPrinting))).addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(20, 20, 20)));
|
||||
layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGap(6, 6, 6).addComponent(lblASL).addGap(3, 3, 3).addComponent(lblASLSmall).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnASL, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblASLError).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(3, 3, 3).addComponent(lblInput).addGap(3, 3, 3).addComponent(lblInputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnInput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblInputError).addGap(6, 6, 6).addComponent(lblOutput).addGap(3, 3, 3).addComponent(lblOutputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(6, 6, 6).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtOutputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnOutput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblOutputError).addGap(6, 6, 6).addComponent(cbCompileAll).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).addComponent(cbPrettyPrinting).addGap(11, 11, 11).addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 41, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(11, 11, 11)));
|
||||
|
||||
pack();
|
||||
setLocationRelativeTo(null);
|
||||
}
|
||||
|
||||
private void btnInputMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt)) {
|
||||
String path = fileChooser("Select input directory", 1);
|
||||
File inputDir = new File(path);
|
||||
if (inputDir.exists()) {
|
||||
prefs.put("inputDir", path);
|
||||
txtInputDir.setText(path);
|
||||
if (inputError)
|
||||
setErrorCondition(1, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnOutputMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt)) {
|
||||
String path = fileChooser("Select output directory", 1);
|
||||
File outputDir = new File(path);
|
||||
if (outputDir.exists()) {
|
||||
prefs.put("outputDir", path);
|
||||
txtOutputDir.setText(path);
|
||||
if (outputError)
|
||||
setErrorCondition(2, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnASLMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt)) {
|
||||
String path = fileChooser("Select 'asl.exe' location", 0);
|
||||
File asl = new File(path);
|
||||
if (asl.exists()) {
|
||||
prefs.put("aslDir", path);
|
||||
txtASLDir.setText(path);
|
||||
if (aslError)
|
||||
setErrorCondition(0, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnCompileMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt)) {
|
||||
JTextField[] dirFields = {txtASLDir, txtInputDir, txtOutputDir};
|
||||
for (byte i = 0; i < 3; i++) {
|
||||
File bleh = new File(dirFields[i].getText());
|
||||
setErrorCondition(i, !bleh.exists());
|
||||
}
|
||||
if (aslError || inputError || outputError)
|
||||
return;
|
||||
String prettyPrinting = cbPrettyPrinting.isSelected() ? "-pretty" : "", compileAll = cbCompileAll.isSelected() ? "-r" : "", asl = txtASLDir.getText(), input = txtInputDir.getText(), output = txtOutputDir.getText(), error = " ";
|
||||
try {
|
||||
Process aslProcess = new ProcessBuilder(asl, compileAll, prettyPrinting, input, output).start();
|
||||
BufferedReader br = new BufferedReader(new InputStreamReader(aslProcess.getInputStream()));
|
||||
String line;
|
||||
while ((line = br.readLine()) != null) {
|
||||
if (line.toLowerCase().contains("panic")) {
|
||||
error = line;
|
||||
}
|
||||
}
|
||||
aslProcess.waitFor();
|
||||
} catch (IOException | InterruptedException ex) {
|
||||
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
if (!error.equals(" ")) {
|
||||
DlgError showError = new DlgError(this, true, error);
|
||||
showError.setLocationRelativeTo(this);
|
||||
showError.setVisible(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cbCompileAllStateChanged(javax.swing.event.ChangeEvent evt) {
|
||||
prefs.putBoolean("compileAll", cbCompileAll.isSelected());
|
||||
}
|
||||
|
||||
private void cbPrettyPrintingStateChanged(javax.swing.event.ChangeEvent evt) {
|
||||
prefs.putBoolean("prettyPrinting", cbPrettyPrinting.isSelected());
|
||||
}
|
||||
|
||||
private void lblOutputErrorMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt) && outputError) {
|
||||
new File(txtOutputDir.getText()).mkdirs();
|
||||
setErrorCondition(2, false);
|
||||
}
|
||||
}
|
||||
|
||||
private void lblASLErrorMouseClicked(java.awt.event.MouseEvent evt) {
|
||||
if (SwingUtilities.isLeftMouseButton(evt) && aslError) {
|
||||
try {
|
||||
URI github = new URI("https://github.com/DeKugelschieber/asl/releases");
|
||||
java.awt.Desktop.getDesktop().browse(github);
|
||||
} catch (URISyntaxException | IOException ex) {
|
||||
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
setErrorCondition(0, false);
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String args[]) {
|
||||
try {
|
||||
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
|
||||
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
|
||||
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
UIManager.put("ToolTip.background", new ColorUIResource(255, 255, 255));
|
||||
UIManager.put("ToolTip.foreground", new ColorUIResource(87, 87, 87));
|
||||
Border lineBorder = BorderFactory.createLineBorder(new Color(118, 118, 118));
|
||||
UIManager.put("ToolTip.border", lineBorder);
|
||||
Border compoundBorder = BorderFactory.createCompoundBorder(UIManager.getBorder("ToolTip.border"), BorderFactory.createEmptyBorder(0, 2, 2, 3));
|
||||
UIManager.put("ToolTip.border", compoundBorder);
|
||||
java.awt.EventQueue.invokeLater(() -> {
|
||||
new Main().setVisible(true);
|
||||
});
|
||||
}
|
||||
|
||||
private javax.swing.JButton btnASL;
|
||||
private javax.swing.JButton btnCompile;
|
||||
private javax.swing.JButton btnInput;
|
||||
private javax.swing.JButton btnOutput;
|
||||
private javax.swing.JCheckBox cbCompileAll;
|
||||
private javax.swing.JCheckBox cbPrettyPrinting;
|
||||
private javax.swing.JSeparator jSeparator;
|
||||
private javax.swing.JLabel lblASL;
|
||||
private javax.swing.JLabel lblASLError;
|
||||
private javax.swing.JLabel lblASLSmall;
|
||||
private javax.swing.JLabel lblInput;
|
||||
private javax.swing.JLabel lblInputError;
|
||||
private javax.swing.JLabel lblInputSmall;
|
||||
private javax.swing.JLabel lblOutput;
|
||||
private javax.swing.JLabel lblOutputError;
|
||||
private javax.swing.JLabel lblOutputSmall;
|
||||
private javax.swing.JTextField txtASLDir;
|
||||
private javax.swing.JTextField txtInputDir;
|
||||
private javax.swing.JTextField txtOutputDir;
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
version = "1.1.0"
|
||||
version = "1.1.1"
|
||||
extension = ".asl"
|
||||
sqfextension = ".sqf"
|
||||
PathSeparator = string(os.PathSeparator)
|
||||
@@ -101,7 +101,7 @@ func compile(path string) {
|
||||
continue
|
||||
}
|
||||
|
||||
token := tokenizer.Tokenize(code)
|
||||
token := tokenizer.Tokenize(code, false)
|
||||
compiler := parser.Compiler{}
|
||||
sqf := compiler.Parse(token, pretty)
|
||||
|
||||
|
||||
@@ -70,34 +70,35 @@ func (c *Compiler) parseVar() {
|
||||
if c.accept("=") {
|
||||
c.next()
|
||||
c.appendOut(" = ", false)
|
||||
|
||||
if c.accept("[") {
|
||||
c.parseArray()
|
||||
} else {
|
||||
c.parseExpression(true)
|
||||
}
|
||||
c.parseExpression(true)
|
||||
}
|
||||
|
||||
c.expect(";")
|
||||
c.appendOut(";", true)
|
||||
}
|
||||
|
||||
func (c *Compiler) parseArray() {
|
||||
func (c *Compiler) parseArray(out bool) string {
|
||||
output := ""
|
||||
c.expect("[")
|
||||
c.appendOut("[", false)
|
||||
output += "["
|
||||
|
||||
if !c.accept("]") {
|
||||
c.parseExpression(true)
|
||||
output += c.parseExpression(false)
|
||||
|
||||
for c.accept(",") {
|
||||
c.next()
|
||||
c.appendOut(",", false)
|
||||
c.parseExpression(true)
|
||||
output += ","+c.parseExpression(false)
|
||||
}
|
||||
}
|
||||
|
||||
c.expect("]")
|
||||
c.appendOut("]", false)
|
||||
output += "]"
|
||||
|
||||
if out {
|
||||
c.appendOut(output, false)
|
||||
}
|
||||
|
||||
return output
|
||||
}
|
||||
|
||||
func (c *Compiler) parseIf() {
|
||||
@@ -313,7 +314,7 @@ func (c *Compiler) parseInlineCode() string {
|
||||
|
||||
if len(code) > 2 {
|
||||
compiler := Compiler{}
|
||||
output = "{"+compiler.Parse(tokenizer.Tokenize([]byte(code[1:len(code)-1])), false)+"}"
|
||||
output = "{"+compiler.Parse(tokenizer.Tokenize([]byte(code[1:len(code)-1]), true), false)+"}"
|
||||
}
|
||||
|
||||
c.expect(")")
|
||||
@@ -463,6 +464,8 @@ func (c *Compiler) parseIdentifier() string {
|
||||
name := c.get().Token
|
||||
c.next()
|
||||
output = "(" + c.parseFunctionCall(false, name) + ")"
|
||||
} else if c.accept("[") {
|
||||
output += c.parseArray(false)
|
||||
} else if c.seek("[") {
|
||||
output += "("+c.get().Token
|
||||
c.next()
|
||||
|
||||
@@ -161,6 +161,13 @@ func TestParserPreprocessor(t *testing.T) {
|
||||
equal(t, got, want)
|
||||
}
|
||||
|
||||
func TestParserExpressionArray(t *testing.T) {
|
||||
got := getCompiled(t, "test/parser_expression_array.asl")
|
||||
want := "x = [1,2,3]-[2,3];\r\n"
|
||||
|
||||
equal(t, got, want)
|
||||
}
|
||||
|
||||
func getCompiled(t *testing.T, file string) string {
|
||||
code, err := ioutil.ReadFile(file)
|
||||
|
||||
|
||||
@@ -58,7 +58,11 @@ var new_line = []byte{'\r', '\n'}
|
||||
|
||||
// Tokenizes the given byte array into syntax tokens,
|
||||
// which can be parsed later.
|
||||
func Tokenize(code []byte) []Token {
|
||||
func Tokenize(code []byte, doStripSlashes bool) []Token {
|
||||
if doStripSlashes {
|
||||
code = stripSlashes(code);
|
||||
}
|
||||
|
||||
code = removeComments(code)
|
||||
tokens := make([]Token, 0)
|
||||
token, mask, isstring, line, column := "", false, false, 0, 0
|
||||
@@ -114,6 +118,28 @@ func Tokenize(code []byte) []Token {
|
||||
return tokens
|
||||
}
|
||||
|
||||
// Removes slashes from input code.
|
||||
// This is used for the "code" keyword for correct strings in resulting code.
|
||||
func stripSlashes(code []byte) []byte {
|
||||
newcode := make([]byte, len(code))
|
||||
j, mask := 0, false
|
||||
|
||||
for i := 0; i < len(code); i++ {
|
||||
c := code[i]
|
||||
|
||||
if c == '\\' && !mask {
|
||||
mask = true
|
||||
continue
|
||||
}
|
||||
|
||||
newcode[j] = code[i]
|
||||
mask = false
|
||||
j++
|
||||
}
|
||||
|
||||
return newcode
|
||||
}
|
||||
|
||||
// Removes all comments from input byte array.
|
||||
// Comments are single line comments, starting with // (two slashes),
|
||||
// multi line comments with /* ... */ (slash star, star slash).
|
||||
|
||||
@@ -94,6 +94,16 @@ func TestTokenizerPreprocessor(t *testing.T) {
|
||||
compareTokens(t, &got, &want)
|
||||
}
|
||||
|
||||
func TestTokenizerMask(t *testing.T) {
|
||||
got := getTokens(t, "test/tokenizer_mask.asl")
|
||||
//var y = code("var z = \"Hello \\"World\\"\";");
|
||||
want := []string{"var", "x", "=", "\"Hello \\\"World\\\"\"", ";",
|
||||
"var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}
|
||||
|
||||
compareLength(t, &got, &want)
|
||||
compareTokens(t, &got, &want)
|
||||
}
|
||||
|
||||
func compareLength(t *testing.T, got *[]tokenizer.Token, want *[]string) {
|
||||
if len(*got) != len(*want) {
|
||||
t.Error("Length of tokens got and expected tokens not equal, was:")
|
||||
@@ -130,5 +140,5 @@ func getTokens(t *testing.T, file string) []tokenizer.Token {
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
return tokenizer.Tokenize(code)
|
||||
return tokenizer.Tokenize(code, false)
|
||||
}
|
||||
|
||||
1
test/parser_expression_array.asl
Normal file
1
test/parser_expression_array.asl
Normal file
@@ -0,0 +1 @@
|
||||
var x = [1, 2, 3]-[2, 3];
|
||||
2
test/tokenizer_mask.asl
Normal file
2
test/tokenizer_mask.asl
Normal file
@@ -0,0 +1,2 @@
|
||||
var x = "Hello \"World\"";
|
||||
var y = code("var z = \"Hello \\"World\\"\";");
|
||||
Reference in New Issue
Block a user