dragonheim/gagent
dragonheim/gagent
1
0
Fork 0
mirror of https://github.com/dragonheim/gagent.git synced 2025-04-26 23:18:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: Adjusting Picol format / syntax to match modern standards.

Browse source
This commit is contained in:
James Wells 2021-05-21 18:46:26 -07:00
parent 7d6fbfef24
commit 083bd608ef
Signed by: jwells
GPG key ID: 73196D10B8E65666
4 changed files with 39 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/picol/commands.go
View file

@ -7,7 +7,7 @@ import (
)
func ArityErr(i *Interp, name string, argv []string) error {
return fmt.Errorf("Wrong number of args for %s %s", name, argv)
return fmt.Errorf("wrong number of args for %s %s", name, argv)
}
func CommandMath(i *Interp, argv []string, pd interface{}) (string, error) {
@ -104,9 +104,9 @@ func CommandWhile(i *Interp, argv []string, pd interface{}) (string, error) {
if r, _ := strconv.Atoi(result); r != 0 {
result, err := i.Eval(argv[2])
switch err {
case PICOL_CONTINUE, nil:
case errContinue, nil:
//pass
case PICOL_BREAK:
case errBreak:
return result, nil
default:
return result, err
@ -123,9 +123,9 @@ func CommandRetCodes(i *Interp, argv []string, pd interface{}) (string, error) {
}
switch argv[0] {
case "break":
return "", PICOL_BREAK
return "", errBreak
case "continue":
return "", PICOL_CONTINUE
return "", errContinue
}
return "", nil
}
@ -152,12 +152,12 @@ func CommandCallProc(i *Interp, argv []string, pd interface{}) (string, error) {
}
if arity != len(argv)-1 {
return "", fmt.Errorf("Proc '%s' called with wrong arg num", argv[0])
return "", fmt.Errorf("proc '%s' called with wrong arg num", argv[0])
}
body := x[1]
result, err := i.Eval(body)
if err == PICOL_RETURN {
if err == errReturn {
err = nil
}
return result, err
@ -178,7 +178,7 @@ func CommandReturn(i *Interp, argv []string, pd interface{}) (string, error) {
if len(argv) == 2 {
r = argv[1]
}
return r, PICOL_RETURN
return r, errReturn
}
func CommandError(i *Interp, argv []string, pd interface{}) (string, error) {
@ -190,7 +190,7 @@ func CommandError(i *Interp, argv []string, pd interface{}) (string, error) {
func CommandPuts(i *Interp, argv []string, pd interface{}) (string, error) {
if len(argv) != 2 {
return "", fmt.Errorf("Wrong number of args for %s %s", argv[0], argv)
return "", fmt.Errorf("wrong number of args for %s %s", argv[0], argv)
}
fmt.Println(argv[1])
return "", nil

2
src/picol/parser.go
View file

@ -246,5 +246,5 @@ func (p *Parser) GetToken() string {
return p.parseString()
}
}
return p.token() /* unreached */
/* return p.token() /* unreached */
}

10
src/picol/picol.go
View file

@ -7,9 +7,9 @@ import (
)
var (
PICOL_RETURN = errors.New("RETURN")
PICOL_BREAK = errors.New("BREAK")
PICOL_CONTINUE = errors.New("CONTINUE")
errReturn = errors.New("RETURN")
errBreak = errors.New("BREAK")
errContinue = errors.New("CONTINUE")
)
type Var string
@ -91,7 +91,7 @@ func (i *Interp) Eval(t string) (string, error) {
case PT_VAR:
v, ok := i.Var(t)
if !ok {
return "", fmt.Errorf("No such variable '%s'", t)
return "", fmt.Errorf("no such variable '%s'", t)
}
t = string(v)
case PT_CMD:
@ -114,7 +114,7 @@ func (i *Interp) Eval(t string) (string, error) {
if len(argv) != 0 {
c := i.Command(argv[0])
if c == nil {
return "", fmt.Errorf("No such command '%s'", argv[0])
return "", fmt.Errorf("no such command '%s'", argv[0])
}
result, err = c.fn(i, argv, c.privdata)
if err != nil {