Skip to content

Commit

Permalink
Implemented pipe operator |; that flips around the command and argument:
Browse files Browse the repository at this point in the history 
argument |; command  <=> command argument
  • Loading branch information
@mattirn
mattirn committed Feb 7, 2020
1 parent b471f94 commit b38c2ab
Show file tree
Hide file tree
Showing 4 changed files with 212 additions and 61 deletions.
5 changes: 5 additions & 0 deletions builtins/src/main/java/org/jline/builtins/ConsoleEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ default Object execute(File script) throws Exception {
*/
Object postProcess(String line, Object result, String output);

/**
* @param object object to print
*/
void trace(Object object);

/**
* Print object.
* @param object object to print
Expand Down
25 changes: 21 additions & 4 deletions builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public List<String> scripts() {
out.add(name.substring(0, name.lastIndexOf(".")));
}
} catch (Exception e) {
systemRegistry.println(e);
trace(e);
}
return out;
}
Expand All @@ -262,7 +262,7 @@ public Object[] expandParameters(String[] args) throws Exception {
}

private String expandName(String name) {
String regexVar = "[a-zA-Z]{1,}[a-zA-Z0-9_-]*";
String regexVar = "[a-zA-Z_]{1,}[a-zA-Z0-9_-]*";
String out = name;
if (name.matches("^\\$" + regexVar)) {
out = name.substring(1);
Expand Down Expand Up @@ -614,7 +614,7 @@ public boolean executeWidget(Object function) {
}
engine.execute("_widgetFunction()");
} catch (Exception e) {
systemRegistry.println(e);
trace(e);
return false;
}
return true;
Expand All @@ -628,7 +628,7 @@ private boolean splitCommandOutput() {
out = (boolean) ((Map<String, Object>) engine.get(VAR_CONSOLE_OPTIONS)).getOrDefault("splitOutput", true);
}
} catch (Exception e) {
systemRegistry.println(new Exception("Bad CONSOLE_OPTION value: " + e.getMessage()));
trace(new Exception("Bad CONSOLE_OPTION value: " + e.getMessage()));
}
return out;
}
Expand Down Expand Up @@ -697,6 +697,23 @@ private Map<String,Object> defaultPrntOptions() {
return out;
}

@SuppressWarnings("unchecked")
@Override
public void trace(Object object) {
boolean on = false;
if (engine.hasVariable(VAR_CONSOLE_OPTIONS)) {
on = (boolean) ((Map<String, Object>) engine.get(VAR_CONSOLE_OPTIONS)).getOrDefault("trace", false);
}
Map<String, Object> options = new HashMap<>();
options.put("exception", "message");
if (!on && object instanceof Exception) {
println(options, object);
} else if (on) {
options.put("exception", "stack");
println(options, object);
}
}

@Override
public void println(Object object) {
Map<String,Object> options = defaultPrntOptions();
Expand Down
240 changes: 183 additions & 57 deletions builtins/src/main/java/org/jline/builtins/SystemRegistryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder;
import org.jline.utils.AttributedStringBuilder;
import org.jline.utils.AttributedStyle;
import org.jline.utils.OSUtils;

/**
Expand Down Expand Up @@ -440,70 +441,188 @@ public void reset() {
}
}

private List<CommandData> compileCommandLine(String commandLine) {
List<CommandData> out = new ArrayList<>();
ParsedLine pl = parser.parse(commandLine, 0, ParseContext.ACCEPT_LINE);
List<String> words = pl.words();
int first = 0;
int last = words.size();
String nextRawLine = commandLine;
List<String> pipes = new ArrayList<>();
do {
String variable = consoleId != null ? Parser.getVariable(words.get(first)) : null;
String command = ConsoleEngine.plainCommand(Parser.getCommand(words.get(first)));
if (consoleId != null && consoleEngine().hasAlias(command)) {
pl = parser.parse(nextRawLine.replaceFirst(command, consoleEngine().getAlias(command)), 0, ParseContext.ACCEPT_LINE);
command = ConsoleEngine.plainCommand(Parser.getCommand(pl.word()));
words = pl.words();
first = 0;
}
last = words.size();
int lastarg = last;
File file = null;
boolean append = false;
for (int i = first + 1; i < last; i++) {
if (words.get(i).equals(">") || words.get(i).equals(">>")) {
pipes.add(words.get(i));
append = words.get(i).equals(">>");
if (i + 1 >= last) {
throw new IllegalArgumentException();
}
file = new File(words.get(i + 1));
last = i + 1;
lastarg = i;
break;
} else if (words.get(i).equals("|;")) {
if (variable != null || file != null || consoleId == null) {
throw new IllegalArgumentException();
}
pipes.add(words.get(i));
last = i;
lastarg = i;
variable = "_temp" + i;
break;
}
}
if (last == words.size()) {
pipes.add("END");
}
String rawLine = last < words.size() || first > 0
? words.subList(first, lastarg).stream().collect(Collectors.joining(" "))
: pl.line();
if (last + 1 < words.size()) {
nextRawLine = words.subList(last + 1, words.size()).stream().collect(Collectors.joining(" "));
}
List<String> arglist = new ArrayList<>();
arglist.addAll(words.subList(first + 1, lastarg));
if (pipes.get(pipes.size() - 1).equals("|;")) {
rawLine = "_temp" + (pipes.size() - 1) + "=" + rawLine;
} else if (pipes.size() > 1 && pipes.get(pipes.size() - 2).equals("|;")) {
rawLine += " $_temp" + (pipes.size() - 2);
arglist.add("$_temp" + (pipes.size() - 2));
}
String[] args = arglist.toArray(new String[0]);
out.add(new CommandData(rawLine, command, args, variable, file, append));
first = last + 1;
} while (first < words.size());
return out;
}

private static class CommandData {
private String rawLine;
private String command;
private String[] args;
private File file;
private boolean append;
private String variable;

public CommandData(String rawLine, String command, String[] args, String variable, File file, boolean append) {
this.rawLine = rawLine;
this.command = command;
this.args = args;
this.variable = variable;
this.file = file;
this.append = append;
}

public File file() {
return file;
}

public boolean append() {
return append;
}

public String variable() {
return variable;
}

public String command() {
return command;
}

public String[] args() {
return args;
}

public String rawLine() {
return rawLine;
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("[");
sb.append("rawLine:").append(rawLine);
sb.append(", ");
sb.append("command:").append(command);
sb.append(", ");
sb.append("args:").append(Arrays.asList(args));
sb.append(", ");
sb.append("variable:").append(variable);
sb.append(", ");
sb.append("file:").append(file);
sb.append(", ");
sb.append("append:").append(append);
sb.append("]");
return sb.toString();
}

}

@Override
public Object execute(String line) throws Exception {
ParsedLine pl = parser.parse(line, 0, ParseContext.ACCEPT_LINE);
if (pl.line().isEmpty() || pl.line().trim().startsWith("#")) {
if (line.isEmpty() || line.trim().startsWith("#")) {
return null;
}
String var = consoleId != null ? Parser.getVariable(line) : null;
String cmd = ConsoleEngine.plainCommand(Parser.getCommand(pl.word()));
if (consoleId != null && consoleEngine().hasAlias(cmd)) {
pl = parser.parse(line.replaceFirst(cmd, consoleEngine().getAlias(cmd)), 0, ParseContext.ACCEPT_LINE);
cmd = ConsoleEngine.plainCommand(Parser.getCommand(pl.word()));
}
File toFile = null;
boolean append = false;
List<String> words = pl.words();
int lastArg = words.size();
for (int i = 1; i < words.size() - 1; i++) {
if (words.get(i).equals(">") || words.get(i).equals(">>")) {
lastArg = i;
append = words.get(i).equals(">>");
toFile = new File(words.get(i + 1));
break;
}
}
String rawLine = lastArg < words.size() ? words.subList(0, lastArg).stream().collect(Collectors.joining(" ")) : pl.line();
String[] argv = words.subList(1, lastArg).toArray(new String[0]);
Object out = null;
exception = null;
boolean statement = false;
try {
if (var != null || toFile != null) {
if (toFile != null) {
outputStream.redirect(toFile, append);
} else if (consoleId != null && !consoleEngine().isExecuting()) {
outputStream.redirect();
List<CommandData> cmds = compileCommandLine(line);
for (CommandData cmd : cmds) {
try {
outputStream.close();
outputStream.reset();
if (cmds.size() > 1) {
trace(cmd);
}
outputStream.open();
}
if (isLocalCommand(cmd)) {
out = localExecute(cmd, argv);
} else {
int id = registryId(cmd);
if (id > -1) {
if (consoleId != null) {
out = commandRegistries[id].invoke(outputStream.getCommandSession(), cmd,
consoleEngine().expandParameters(argv));
} else {
out = commandRegistries[id].execute(outputStream.getCommandSession(), cmd, argv);
exception = null;
statement = false;
if (cmd.variable() != null || cmd.file() != null) {
if (cmd.file() != null) {
outputStream.redirect(cmd.file(), cmd.append());
} else if (consoleId != null && !consoleEngine().isExecuting()) {
outputStream.redirect();
}
} else if (consoleId != null) {
if (outputStream.isByteStream() && !consoleEngine().scripts().contains(cmd)) {
outputStream.close();
outputStream.reset();
statement = true;
outputStream.open();
}
if (isLocalCommand(cmd.command())) {
out = localExecute(cmd.command(), cmd.args());
} else {
int id = registryId(cmd.command());
if (id > -1) {
if (consoleId != null) {
out = commandRegistries[id].invoke(outputStream.getCommandSession(), cmd.command(),
consoleEngine().expandParameters(cmd.args()));
} else {
out = commandRegistries[id].execute(outputStream.getCommandSession(), cmd.command(),
cmd.args());
}
} else if (consoleId != null) {
if (outputStream.isByteStream() && !consoleEngine().scripts().contains(cmd.command())) {
outputStream.close();
outputStream.reset();
statement = true;
}
out = consoleEngine().execute(cmd.command(), cmd.rawLine(), cmd.args());
}
out = consoleEngine().execute(cmd, rawLine, argv);
}
}
} catch (HelpException e) {
println(e);
} finally {
if (consoleId != null && !consoleEngine().isExecuting() && !statement) {
outputStream.flush();
out = consoleEngine().postProcess(pl.line(), out, outputStream.getOutput());
} catch (HelpException e) {
println(e);
} finally {
if (consoleId != null && !consoleEngine().isExecuting() && !statement) {
outputStream.flush();
out = consoleEngine().postProcess(cmd.rawLine(), out, outputStream.getOutput());
}
}
}
return out;
Expand All @@ -519,6 +638,15 @@ public void cleanUp() {
}
}

private void trace(CommandData commandData) {
if (consoleId != null) {
consoleEngine().trace(commandData);
} else {
AttributedStringBuilder asb = new AttributedStringBuilder();
asb.append(commandData.rawLine(), AttributedStyle.DEFAULT.foreground(AttributedStyle.YELLOW)).println(terminal());
}
}

@Override
public void println(Exception exception) {
if (outputStream.isRedirecting()) {
Expand All @@ -527,9 +655,7 @@ public void println(Exception exception) {
}
if (consoleId != null) {
consoleEngine().putVariable("exception", exception);
Map<String, Object> options = new HashMap<>();
options.put("exception", "message");
consoleEngine().println(options, exception);
consoleEngine().trace(exception);
} else {
SystemRegistry.println(false, terminal(), exception);
}
Expand Down
3 changes: 3 additions & 0 deletions demo/src/main/scripts/init.jline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ PATH = [ROOT + 'scripts']
#
_jnanorc = Paths.get(ROOT, 'jnanorc').toFile()
_jnanorc << 'include ' + ROOT + 'nanorc/*.nanorc\n'
CONSOLE_OPTIONS = [:]
CONSOLE_OPTIONS['trace'] = true
CONSOLE_OPTIONS['splitOutput'] = true

0 comments on commit b38c2ab

Please sign in to comment.