This changeset performs the following: - Updates `masterzen/winrm` vendor to include change from (https://github.com/masterzen/winrm/pull/73). - Removes `masterzen/xmlpath` dependency, as it is licensed under the LGPL license. - Updates `dylanmei/winrmtest` vendor to include change from (https://github.com/dylanmei/winrmtest/pull/4). - Updates `packer-community/winrmcp` vendor to include the removal of the `masterzen/winrm/winrm` sub-class as a result of the `winrm` CLI tool being removed from the `masterzen/winrm` repository. - Updates nested dependencies as a result of the above vendor changes. - Refactors `parallels/driver_9` to use `goxpath` instead of `xmlpath`, as `xmlpath` is licensed under LGPL. - Adds a basic unit test for the refactor work in `parallels/driver_9` to confirm functionality. This should completely remove any LGPL licensed dependencies inside of the Packer project. ``` $ make test /home/jake/src/go/src/github.com/hashicorp/packer/scripts/gofmtcheck.sh $(find . -not -path "./vendor/*" -name "*.go") ==> Checking that code complies with gofmt requirements... Check passed. ok github.com/hashicorp/packer 0.044s ok github.com/hashicorp/packer/builder/alicloud/ecs 0.055s ok github.com/hashicorp/packer/builder/amazon/chroot 0.040s ok github.com/hashicorp/packer/builder/amazon/common 0.021s ok github.com/hashicorp/packer/builder/amazon/ebs 0.016s ok github.com/hashicorp/packer/builder/amazon/ebssurrogate 0.015s ok github.com/hashicorp/packer/builder/amazon/ebsvolume 0.014s ok github.com/hashicorp/packer/builder/amazon/instance 0.058s ok github.com/hashicorp/packer/builder/azure/arm 2.833s ok github.com/hashicorp/packer/builder/azure/common 0.018s ? github.com/hashicorp/packer/builder/azure/common/constants [no test files] ? github.com/hashicorp/packer/builder/azure/common/lin [no test files] ? github.com/hashicorp/packer/builder/azure/common/logutil [no test files] ok github.com/hashicorp/packer/builder/azure/common/template 0.038s ok github.com/hashicorp/packer/builder/azure/pkcs12 0.120s ok github.com/hashicorp/packer/builder/azure/pkcs12/rc2 0.020s ok github.com/hashicorp/packer/builder/cloudstack 0.038s ok github.com/hashicorp/packer/builder/digitalocean 0.015s ok github.com/hashicorp/packer/builder/docker 0.028s ok github.com/hashicorp/packer/builder/file 0.029s ok github.com/hashicorp/packer/builder/googlecompute 3.162s ok github.com/hashicorp/packer/builder/hyperv/common 0.006s ok github.com/hashicorp/packer/builder/hyperv/iso 0.042s ok github.com/hashicorp/packer/builder/null 0.018s ok github.com/hashicorp/packer/builder/oneandone 0.022s ok github.com/hashicorp/packer/builder/openstack 0.052s ok github.com/hashicorp/packer/builder/parallels/common 2.549s ok github.com/hashicorp/packer/builder/parallels/iso 0.050s ok github.com/hashicorp/packer/builder/parallels/pvm 0.033s ok github.com/hashicorp/packer/builder/profitbricks 0.023s ok github.com/hashicorp/packer/builder/qemu 0.039s ok github.com/hashicorp/packer/builder/triton 0.018s ok github.com/hashicorp/packer/builder/virtualbox/common 5.533s ok github.com/hashicorp/packer/builder/virtualbox/iso 0.044s ok github.com/hashicorp/packer/builder/virtualbox/ovf 0.012s ok github.com/hashicorp/packer/builder/vmware/common 5.325s ok github.com/hashicorp/packer/builder/vmware/iso 0.076s ok github.com/hashicorp/packer/builder/vmware/vmx 0.010s ok github.com/hashicorp/packer/command 0.062s ok github.com/hashicorp/packer/common 0.053s ok github.com/hashicorp/packer/common/json 0.003s [no tests to run] ok github.com/hashicorp/packer/common/powershell 0.015s ? github.com/hashicorp/packer/common/powershell/hyperv [no test files] ? github.com/hashicorp/packer/common/ssh [no test files] ok github.com/hashicorp/packer/common/uuid 0.010s ok github.com/hashicorp/packer/communicator/none 0.008s ok github.com/hashicorp/packer/communicator/ssh 0.068s ok github.com/hashicorp/packer/communicator/winrm 0.046s ok github.com/hashicorp/packer/fix 0.005s ok github.com/hashicorp/packer/helper/builder/testing 0.007s ok github.com/hashicorp/packer/helper/communicator 0.013s ok github.com/hashicorp/packer/helper/config 0.004s ? github.com/hashicorp/packer/helper/enumflag [no test files] ok github.com/hashicorp/packer/helper/flag-kv 0.009s ok github.com/hashicorp/packer/helper/flag-slice 0.006s ok github.com/hashicorp/packer/packer 0.219s ok github.com/hashicorp/packer/packer/plugin 0.233s ok github.com/hashicorp/packer/packer/rpc 0.141s ok github.com/hashicorp/packer/plugin/example 0.008s [no tests to run] ? github.com/hashicorp/packer/post-processor/alicloud-import [no test files] ? github.com/hashicorp/packer/post-processor/amazon-import [no test files] ok github.com/hashicorp/packer/post-processor/artifice 0.003s [no tests to run] ok github.com/hashicorp/packer/post-processor/atlas 0.018s ok github.com/hashicorp/packer/post-processor/checksum 0.015s ok github.com/hashicorp/packer/post-processor/compress 0.047s ok github.com/hashicorp/packer/post-processor/docker-import 0.012s ok github.com/hashicorp/packer/post-processor/docker-push 0.012s ok github.com/hashicorp/packer/post-processor/docker-save 0.008s ok github.com/hashicorp/packer/post-processor/docker-tag 0.008s ok github.com/hashicorp/packer/post-processor/googlecompute-export 0.015s [no tests to run] ? github.com/hashicorp/packer/post-processor/manifest [no test files] ok github.com/hashicorp/packer/post-processor/shell-local 0.028s ok github.com/hashicorp/packer/post-processor/vagrant 0.030s ok github.com/hashicorp/packer/post-processor/vagrant-cloud 0.028s ok github.com/hashicorp/packer/post-processor/vsphere 0.014s ok github.com/hashicorp/packer/provisioner 0.011s ok github.com/hashicorp/packer/provisioner/ansible 0.140s ok github.com/hashicorp/packer/provisioner/ansible-local 0.056s ok github.com/hashicorp/packer/provisioner/chef-client 0.050s ok github.com/hashicorp/packer/provisioner/chef-solo 0.061s ok github.com/hashicorp/packer/provisioner/converge 0.018s ok github.com/hashicorp/packer/provisioner/file 0.015s ok github.com/hashicorp/packer/provisioner/powershell 0.168s ok github.com/hashicorp/packer/provisioner/puppet-masterless 0.008s ok github.com/hashicorp/packer/provisioner/puppet-server 0.031s ok github.com/hashicorp/packer/provisioner/salt-masterless 0.010s ok github.com/hashicorp/packer/provisioner/shell 0.010s ok github.com/hashicorp/packer/provisioner/shell-local 0.037s ok github.com/hashicorp/packer/provisioner/windows-restart 0.180s ok github.com/hashicorp/packer/provisioner/windows-shell 0.159s ? github.com/hashicorp/packer/scripts [no test files] ok github.com/hashicorp/packer/template 0.008s ok github.com/hashicorp/packer/template/interpolate 0.004s ? github.com/hashicorp/packer/version [no test files] ```
195 lines
3.5 KiB
Go
195 lines
3.5 KiB
Go
package parser
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/internal/lexer"
|
|
)
|
|
|
|
type stateType int
|
|
|
|
const (
|
|
defState stateType = iota
|
|
xpathState
|
|
funcState
|
|
paramState
|
|
predState
|
|
parenState
|
|
)
|
|
|
|
type parseStack struct {
|
|
stack []*Node
|
|
stateTypes []stateType
|
|
cur *Node
|
|
}
|
|
|
|
func (p *parseStack) push(t stateType) {
|
|
p.stack = append(p.stack, p.cur)
|
|
p.stateTypes = append(p.stateTypes, t)
|
|
}
|
|
|
|
func (p *parseStack) pop() {
|
|
stackPos := len(p.stack) - 1
|
|
|
|
p.cur = p.stack[stackPos]
|
|
p.stack = p.stack[:stackPos]
|
|
p.stateTypes = p.stateTypes[:stackPos]
|
|
}
|
|
|
|
func (p *parseStack) curState() stateType {
|
|
if len(p.stateTypes) == 0 {
|
|
return defState
|
|
}
|
|
return p.stateTypes[len(p.stateTypes)-1]
|
|
}
|
|
|
|
type lexFn func(*parseStack, lexer.XItem)
|
|
|
|
var parseMap = map[lexer.XItemType]lexFn{
|
|
lexer.XItemAbsLocPath: xiXPath,
|
|
lexer.XItemAbbrAbsLocPath: xiXPath,
|
|
lexer.XItemAbbrRelLocPath: xiXPath,
|
|
lexer.XItemRelLocPath: xiXPath,
|
|
lexer.XItemEndPath: xiEndPath,
|
|
lexer.XItemAxis: xiXPath,
|
|
lexer.XItemAbbrAxis: xiXPath,
|
|
lexer.XItemNCName: xiXPath,
|
|
lexer.XItemQName: xiXPath,
|
|
lexer.XItemNodeType: xiXPath,
|
|
lexer.XItemProcLit: xiXPath,
|
|
lexer.XItemFunction: xiFunc,
|
|
lexer.XItemArgument: xiFuncArg,
|
|
lexer.XItemEndFunction: xiEndFunc,
|
|
lexer.XItemPredicate: xiPred,
|
|
lexer.XItemEndPredicate: xiEndPred,
|
|
lexer.XItemStrLit: xiValue,
|
|
lexer.XItemNumLit: xiValue,
|
|
lexer.XItemOperator: xiOp,
|
|
lexer.XItemVariable: xiValue,
|
|
}
|
|
|
|
var opPrecedence = map[string]int{
|
|
"|": 1,
|
|
"*": 2,
|
|
"div": 2,
|
|
"mod": 2,
|
|
"+": 3,
|
|
"-": 3,
|
|
"=": 4,
|
|
"!=": 4,
|
|
"<": 4,
|
|
"<=": 4,
|
|
">": 4,
|
|
">=": 4,
|
|
"and": 5,
|
|
"or": 6,
|
|
}
|
|
|
|
//Parse creates an AST tree for XPath expressions.
|
|
func Parse(xp string) (*Node, error) {
|
|
var err error
|
|
c := lexer.Lex(xp)
|
|
n := &Node{}
|
|
p := &parseStack{cur: n}
|
|
|
|
for next := range c {
|
|
if next.Typ != lexer.XItemError {
|
|
parseMap[next.Typ](p, next)
|
|
} else if err == nil {
|
|
err = fmt.Errorf(next.Val)
|
|
}
|
|
}
|
|
|
|
return n, err
|
|
}
|
|
|
|
func xiXPath(p *parseStack, i lexer.XItem) {
|
|
if p.curState() == xpathState {
|
|
p.cur.push(i)
|
|
p.cur = p.cur.next
|
|
return
|
|
}
|
|
|
|
if p.cur.Val.Typ == lexer.XItemFunction {
|
|
p.cur.Right = &Node{Val: i, Parent: p.cur}
|
|
p.cur.next = p.cur.Right
|
|
p.push(xpathState)
|
|
p.cur = p.cur.next
|
|
return
|
|
}
|
|
|
|
p.cur.pushNotEmpty(i)
|
|
p.push(xpathState)
|
|
p.cur = p.cur.next
|
|
}
|
|
|
|
func xiEndPath(p *parseStack, i lexer.XItem) {
|
|
p.pop()
|
|
}
|
|
|
|
func xiFunc(p *parseStack, i lexer.XItem) {
|
|
p.cur.push(i)
|
|
p.cur = p.cur.next
|
|
p.push(funcState)
|
|
}
|
|
|
|
func xiFuncArg(p *parseStack, i lexer.XItem) {
|
|
if p.curState() != funcState {
|
|
p.pop()
|
|
}
|
|
|
|
p.cur.push(i)
|
|
p.cur = p.cur.next
|
|
p.push(paramState)
|
|
p.cur.push(lexer.XItem{Typ: Empty, Val: ""})
|
|
p.cur = p.cur.next
|
|
}
|
|
|
|
func xiEndFunc(p *parseStack, i lexer.XItem) {
|
|
if p.curState() == paramState {
|
|
p.pop()
|
|
}
|
|
p.pop()
|
|
}
|
|
|
|
func xiPred(p *parseStack, i lexer.XItem) {
|
|
p.cur.push(i)
|
|
p.cur = p.cur.next
|
|
p.push(predState)
|
|
p.cur.push(lexer.XItem{Typ: Empty, Val: ""})
|
|
p.cur = p.cur.next
|
|
}
|
|
|
|
func xiEndPred(p *parseStack, i lexer.XItem) {
|
|
p.pop()
|
|
}
|
|
|
|
func xiValue(p *parseStack, i lexer.XItem) {
|
|
p.cur.add(i)
|
|
}
|
|
|
|
func xiOp(p *parseStack, i lexer.XItem) {
|
|
if i.Val == "(" {
|
|
p.cur.push(lexer.XItem{Typ: Empty, Val: ""})
|
|
p.push(parenState)
|
|
p.cur = p.cur.next
|
|
return
|
|
}
|
|
|
|
if i.Val == ")" {
|
|
p.pop()
|
|
return
|
|
}
|
|
|
|
if p.cur.Val.Typ == lexer.XItemOperator {
|
|
if opPrecedence[p.cur.Val.Val] <= opPrecedence[i.Val] {
|
|
p.cur.add(i)
|
|
} else {
|
|
p.cur.push(i)
|
|
}
|
|
} else {
|
|
p.cur.add(i)
|
|
}
|
|
p.cur = p.cur.next
|
|
}
|