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

fix: [CI SKIP] Continuing cleanup based on the report card.

Browse source
This commit is contained in:
James Wells 2021-06-02 05:44:21 -07:00
parent e47a8ebc10
commit 236aa478b4
Signed by: jwells
GPG key ID: 73196D10B8E65666
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gagent/main.go
View file

@ -20,8 +20,7 @@ import (
cty "github.com/zclconf/go-cty/cty" cty "github.com/zclconf/go-cty/cty"
) )
// G'Agent version number. const versionNum = "0.0.1"
const VERSION = "0.0.1"
var exitCodes = struct { var exitCodes = struct {
m map[string]int m map[string]int
@ -123,7 +122,7 @@ func main() {
* Consume the usage variable and the command line arguments to create a * Consume the usage variable and the command line arguments to create a
* dictionary / map. * dictionary / map.
*/ */
opts, _ := docopt.ParseArgs(usage, nil, VERSION) opts, _ := docopt.ParseArgs(usage, nil, versionNum)
log.Printf("[DEBUG] Arguments are %v\n", opts) log.Printf("[DEBUG] Arguments are %v\n", opts)
if opts["--config"] != nil { if opts["--config"] != nil {

28
src/picol/parser.go
View file

@ -15,34 +15,34 @@ const (
PT_EOF PT_EOF
) )
type Parser struct { type parserStruct struct {
text string text string
p, start, end, ln int p, start, end, ln int
insidequote int insidequote int
Type int Type int
} }
func InitParser(text string) *Parser { func InitParser(text string) *parserStruct {
return &Parser{text, 0, 0, 0, len(text), 0, PT_EOL} return &parserStruct{text, 0, 0, 0, len(text), 0, PT_EOL}
} }
func (p *Parser) next() { func (p *parserStruct) next() {
_, w := utf8.DecodeRuneInString(p.text[p.p:]) _, w := utf8.DecodeRuneInString(p.text[p.p:])
p.p += w p.p += w
p.ln -= w p.ln -= w
} }
func (p *Parser) current() rune { func (p *parserStruct) current() rune {
r, _ := utf8.DecodeRuneInString(p.text[p.p:]) r, _ := utf8.DecodeRuneInString(p.text[p.p:])
return r return r
} }
func (p *Parser) token() (t string) { func (p *parserStruct) token() (t string) {
defer recover() defer recover()
return p.text[p.start:p.end] return p.text[p.start:p.end]
} }
func (p *Parser) parseSep() string { func (p *parserStruct) parseSep() string {
p.start = p.p p.start = p.p
for ; p.p < len(p.text); p.next() { for ; p.p < len(p.text); p.next() {
if !unicode.IsSpace(p.current()) { if !unicode.IsSpace(p.current()) {
@ -54,7 +54,7 @@ func (p *Parser) parseSep() string {
return p.token() return p.token()
} }
func (p *Parser) parseEol() string { func (p *parserStruct) parseEol() string {
p.start = p.p p.start = p.p
for ; p.p < len(p.text); p.next() { for ; p.p < len(p.text); p.next() {
@ -70,7 +70,7 @@ func (p *Parser) parseEol() string {
return p.token() return p.token()
} }
func (p *Parser) parseCommand() string { func (p *parserStruct) parseCommand() string {
level, blevel := 1, 0 level, blevel := 1, 0
p.next() // skip p.next() // skip
p.start = p.p p.start = p.p
@ -103,7 +103,7 @@ Loop:
return p.token() return p.token()
} }
func (p *Parser) parseVar() string { func (p *parserStruct) parseVar() string {
p.next() // skip the $ p.next() // skip the $
p.start = p.p p.start = p.p
@ -132,7 +132,7 @@ func (p *Parser) parseVar() string {
return p.token() return p.token()
} }
func (p *Parser) parseBrace() string { func (p *parserStruct) parseBrace() string {
level := 1 level := 1
p.next() // skip p.next() // skip
p.start = p.p p.start = p.p
@ -160,7 +160,7 @@ Loop:
return p.token() return p.token()
} }
func (p *Parser) parseString() string { func (p *parserStruct) parseString() string {
newword := p.Type == PT_SEP || p.Type == PT_EOL || p.Type == PT_STR newword := p.Type == PT_SEP || p.Type == PT_EOL || p.Type == PT_STR
if c := p.current(); newword && c == '{' { if c := p.current(); newword && c == '{' {
@ -203,14 +203,14 @@ Loop:
return p.token() return p.token()
} }
func (p *Parser) parseComment() string { func (p *parserStruct) parseComment() string {
for p.ln != 0 && p.current() != '\n' { for p.ln != 0 && p.current() != '\n' {
p.next() p.next()
} }
return p.token() return p.token()
} }
func (p *Parser) GetToken() string { func (p *parserStruct) GetToken() string {
for { for {
if p.ln == 0 { if p.ln == 0 {
if p.Type != PT_EOL && p.Type != PT_EOF { if p.Type != PT_EOL && p.Type != PT_EOF {

4
src/picol/picol/main.go
View file

@ -12,10 +12,10 @@ import (
var fname = flag.String("f", "", "file name") var fname = flag.String("f", "", "file name")
// TCL puts function. // CommandPuts is a simple version of the TCL puts function.
func CommandPuts(i *picol.Interp, argv []string, pd interface{}) (string, error) { func CommandPuts(i *picol.Interp, argv []string, pd interface{}) (string, error) {
if len(argv) != 2 { 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]) fmt.Println(argv[1])
return "", nil return "", nil