added shell tab complete
This commit is contained in:
parent
44beab651c
commit
d5edb2bad2
4 changed files with 125 additions and 4 deletions
|
|
@ -75,3 +75,18 @@ func GetFunction(arg string, table FuncTable) *Function {
|
||||||
|
|
||||||
return target
|
return target
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* lists all functions in table
|
||||||
|
*/
|
||||||
|
func ListFuncs(ft FuncTable) []string {
|
||||||
|
keys := make([]string, len(*ft))
|
||||||
|
i := 0
|
||||||
|
|
||||||
|
for k := range *ft {
|
||||||
|
keys[i] = k
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
|
||||||
|
return keys
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,18 @@ func SetVar(variable string, value *Token, vt VarTable) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* lists all vars in tables
|
||||||
|
*/
|
||||||
|
func ListVars(vt VarTable) []string {
|
||||||
|
keys := make([]string, len(*vt))
|
||||||
|
i := 0
|
||||||
|
for k := range *vt {
|
||||||
|
keys[i] = k
|
||||||
|
}
|
||||||
|
|
||||||
|
return keys
|
||||||
|
}
|
||||||
|
|
||||||
// Library represents variables defined in inner scope
|
// Library represents variables defined in inner scope
|
||||||
// It is assumed library is ordered from innermost scope to outermost scope
|
// It is assumed library is ordered from innermost scope to outermost scope
|
||||||
func GetVarFromTables(arg string, library []VarTable) *Token {
|
func GetVarFromTables(arg string, library []VarTable) *Token {
|
||||||
|
|
|
||||||
12
cmd/shs.go
12
cmd/shs.go
|
|
@ -20,10 +20,12 @@ package main
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"strconv"
|
"strconv"
|
||||||
"github.com/peterh/liner"
|
"github.com/peterh/liner"
|
||||||
"gitlab.com/whom/shs/ast"
|
"gitlab.com/whom/shs/ast"
|
||||||
"gitlab.com/whom/shs/log"
|
"gitlab.com/whom/shs/log"
|
||||||
|
"gitlab.com/whom/shs/util"
|
||||||
"gitlab.com/whom/shs/config"
|
"gitlab.com/whom/shs/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -105,6 +107,10 @@ func main() {
|
||||||
defer line.Close()
|
defer line.Close()
|
||||||
|
|
||||||
line.SetCtrlCAborts(true)
|
line.SetCtrlCAborts(true)
|
||||||
|
line.SetCompleter(func(line string) (c []string) {
|
||||||
|
strtoks := strings.Split(line, " ")
|
||||||
|
return util.ShellCompleter(strtoks[len(strtoks) - 1], vars, funcs)
|
||||||
|
})
|
||||||
|
|
||||||
var histFile *os.File
|
var histFile *os.File
|
||||||
var err error
|
var err error
|
||||||
|
|
@ -134,12 +140,10 @@ func main() {
|
||||||
text, err := line.Prompt(prompt)
|
text, err := line.Prompt(prompt)
|
||||||
if err != nil && err != liner.ErrPromptAborted{
|
if err != nil && err != liner.ErrPromptAborted{
|
||||||
log.Log(log.ERR, "couldnt read user input: " + err.Error(), "repl")
|
log.Log(log.ERR, "couldnt read user input: " + err.Error(), "repl")
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if !no_hist {
|
line.AppendHistory(text)
|
||||||
line.WriteHistory(histFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
userInput := ast.Lex(text)
|
userInput := ast.Lex(text)
|
||||||
if userInput == nil {
|
if userInput == nil {
|
||||||
// errors handled in Lex
|
// errors handled in Lex
|
||||||
|
|
|
||||||
90
util/shell_complete.go
Normal file
90
util/shell_complete.go
Normal file
|
|
@ -0,0 +1,90 @@
|
||||||
|
/* SHS: Syntactically Homogeneous Shell
|
||||||
|
* Copyright (C) 2019 Aidan Hahn
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"strings"
|
||||||
|
"gitlab.com/whom/shs/log"
|
||||||
|
"gitlab.com/whom/shs/ast"
|
||||||
|
)
|
||||||
|
|
||||||
|
// wrap this in a lambda that passes in the vt and ft
|
||||||
|
// I suppose it could be more optimal. Fix if it bothers you
|
||||||
|
func ShellCompleter(line string, vt ast.VarTable, ft ast.FuncTable) []string {
|
||||||
|
dir, path, tok := getPathBase(line)
|
||||||
|
compSource := []string{}
|
||||||
|
|
||||||
|
if !path {
|
||||||
|
dir = "."
|
||||||
|
} else {
|
||||||
|
line = tok
|
||||||
|
}
|
||||||
|
|
||||||
|
fobjs, err := ioutil.ReadDir(dir)
|
||||||
|
if err != nil {
|
||||||
|
log.Log(log.DEBUG,
|
||||||
|
"couldnt read dir " + dir + ": " + err.Error(),
|
||||||
|
"complete")
|
||||||
|
if path {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for _, f := range fobjs {
|
||||||
|
compSource = append(compSource, f.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !path {
|
||||||
|
compSource = append(compSource, ast.ListVars(vt)...)
|
||||||
|
compSource = append(compSource, ast.ListFuncs(ft)...)
|
||||||
|
}
|
||||||
|
|
||||||
|
completions := []string{}
|
||||||
|
for _, i := range compSource {
|
||||||
|
if strings.HasPrefix(i, line) {
|
||||||
|
completions = append(completions, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return completions
|
||||||
|
}
|
||||||
|
|
||||||
|
// returns everything up to the last '/'
|
||||||
|
// as well as whether or not a / was found
|
||||||
|
// and finally the token after the last /
|
||||||
|
func getPathBase(in string) (string, bool, string) {
|
||||||
|
if in == "" {
|
||||||
|
return "", false, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
isPath := false
|
||||||
|
|
||||||
|
i := len(in) - 1
|
||||||
|
for i > 0 {
|
||||||
|
if in[i] == '/' {
|
||||||
|
isPath = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
i -= 1
|
||||||
|
}
|
||||||
|
|
||||||
|
return in[:i], isPath, in[i+1:]
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue