mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
Replace GOCC parser-generator with PGPG (#2015)
* Porting * Update some tests that depend on AST-print output * iterating on GOCC -> PGPG * iterating * iterating * iterating * iterating * iterating * Modify expout files that need only AST-print-syntax updates * iterating * iterating * iterating * iterating * iterating * iterating * iterating * iterating * iterating * iterating * iterating * sync test cases from mlr-6.17.0, except AST-prints ... * sync test cases from mlr-6.17.0, except AST-prints ... * Fix lashed emit for $* and @* * Fix --1 and ++1 chained unary ops * Emit with function callsite * test cases * dot operator * M_PI and M_E * Iterating on lashed emit cases * error-wording differences * rm some should-fail files * Fix issue with leading semicolon * trailing comma in func params; most AST-print deltas * error-wording delta * fix unset all * AST-print deltas * go mod tidy: forced `go 1.25` to `go 1.25.0` * Depend on PGPG v1.0.0 * Fix Windows CI failure * Remove cmd/experiments/dsl_parser * GOCC -> PGPG * neaten * Fix regex issue found in doc gen
This commit is contained in:
John Kerl
GitHub
parent
40f3a72de2
commit
af1adf80ad
732 changed files with 924001 additions and 1122928 deletions
|
|
@ -7,11 +7,11 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/johnkerl/miller/v6/pkg/dsl"
|
||||
"github.com/johnkerl/miller/v6/pkg/lib"
|
||||
"github.com/johnkerl/miller/v6/pkg/output"
|
||||
"github.com/johnkerl/miller/v6/pkg/runtime"
|
||||
"github.com/johnkerl/miller/v6/pkg/types"
|
||||
"github.com/johnkerl/pgpg/go/lib/pkg/asts"
|
||||
)
|
||||
|
||||
// Example ASTs:
|
||||
|
|
@ -158,8 +158,8 @@ type PrintStatementNode struct {
|
|||
outputHandlerManager output.OutputHandlerManager // for file/pipe targets
|
||||
}
|
||||
|
||||
func (root *RootNode) BuildPrintStatementNode(astNode *dsl.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != dsl.NodeTypePrintStatement)
|
||||
func (root *RootNode) BuildPrintStatementNode(astNode *asts.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != asts.NodeType(NodeTypePrintStatement))
|
||||
return root.buildPrintxStatementNode(
|
||||
astNode,
|
||||
os.Stdout,
|
||||
|
|
@ -167,8 +167,8 @@ func (root *RootNode) BuildPrintStatementNode(astNode *dsl.ASTNode) (IExecutable
|
|||
)
|
||||
}
|
||||
|
||||
func (root *RootNode) BuildPrintnStatementNode(astNode *dsl.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != dsl.NodeTypePrintnStatement)
|
||||
func (root *RootNode) BuildPrintnStatementNode(astNode *asts.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != asts.NodeType(NodeTypePrintnStatement))
|
||||
return root.buildPrintxStatementNode(
|
||||
astNode,
|
||||
os.Stdout,
|
||||
|
|
@ -176,8 +176,8 @@ func (root *RootNode) BuildPrintnStatementNode(astNode *dsl.ASTNode) (IExecutabl
|
|||
)
|
||||
}
|
||||
|
||||
func (root *RootNode) BuildEprintStatementNode(astNode *dsl.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != dsl.NodeTypeEprintStatement)
|
||||
func (root *RootNode) BuildEprintStatementNode(astNode *asts.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != asts.NodeType(NodeTypeEprintStatement))
|
||||
return root.buildPrintxStatementNode(
|
||||
astNode,
|
||||
os.Stderr,
|
||||
|
|
@ -185,8 +185,8 @@ func (root *RootNode) BuildEprintStatementNode(astNode *dsl.ASTNode) (IExecutabl
|
|||
)
|
||||
}
|
||||
|
||||
func (root *RootNode) BuildEprintnStatementNode(astNode *dsl.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != dsl.NodeTypeEprintnStatement)
|
||||
func (root *RootNode) BuildEprintnStatementNode(astNode *asts.ASTNode) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(astNode.Type != asts.NodeType(NodeTypeEprintnStatement))
|
||||
return root.buildPrintxStatementNode(
|
||||
astNode,
|
||||
os.Stderr,
|
||||
|
|
@ -197,25 +197,56 @@ func (root *RootNode) BuildEprintnStatementNode(astNode *dsl.ASTNode) (IExecutab
|
|||
// Common code for building print/eprint/printn/eprintn nodes
|
||||
|
||||
func (root *RootNode) buildPrintxStatementNode(
|
||||
astNode *dsl.ASTNode,
|
||||
astNode *asts.ASTNode,
|
||||
defaultOutputStream *os.File,
|
||||
terminator string,
|
||||
) (IExecutable, error) {
|
||||
lib.InternalCodingErrorIf(len(astNode.Children) != 2)
|
||||
expressionsNode := astNode.Children[0]
|
||||
redirectorNode := astNode.Children[1]
|
||||
// Normalize PGPG AST to 2-child layout (expressions, redirector).
|
||||
// PGPG produces: 0 children (print), 1 child (print s or print > file), 2+ children (print s,t or print > file, s).
|
||||
// With "print Redirector comma FcnArgs", children are [Redirector, FcnArgs].
|
||||
// With "print FcnArgs" (with_adopted_grandchildren), children are the Rvalues directly.
|
||||
var expressionsNode, redirectorNode *asts.ASTNode
|
||||
isRedirector := func(n *asts.ASTNode) bool {
|
||||
return n.Type == asts.NodeType(NodeTypeRedirectWrite) ||
|
||||
n.Type == asts.NodeType(NodeTypeRedirectAppend) ||
|
||||
n.Type == asts.NodeType(NodeTypeRedirectPipe)
|
||||
}
|
||||
switch len(astNode.Children) {
|
||||
case 0:
|
||||
expressionsNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeNoOp), nil)
|
||||
redirectorNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeNoOp), nil)
|
||||
case 1:
|
||||
if isRedirector(astNode.Children[0]) {
|
||||
expressionsNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeNoOp), nil)
|
||||
redirectorNode = astNode.Children[0]
|
||||
} else {
|
||||
expressionsNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeFcnArgs), astNode.Children)
|
||||
redirectorNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeNoOp), nil)
|
||||
}
|
||||
default:
|
||||
if isRedirector(astNode.Children[0]) {
|
||||
// print Redirector comma FcnArgs -> [Redirector, FcnArgs]
|
||||
expressionsNode = astNode.Children[1]
|
||||
redirectorNode = astNode.Children[0]
|
||||
} else {
|
||||
// print FcnArgs with_adopted_grandchildren -> [Rvalue, Rvalue, ...]
|
||||
expressionsNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeFcnArgs), astNode.Children)
|
||||
redirectorNode = asts.NewASTNode(nil, asts.NodeType(NodeTypeNoOp), nil)
|
||||
}
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Things to be printed, e.g. $a and $b in 'print > "foo.dat", $a, $b'.
|
||||
|
||||
var expressionEvaluables []IEvaluable = nil
|
||||
|
||||
if expressionsNode.Type == dsl.NodeTypeNoOp {
|
||||
if expressionsNode.Type == asts.NodeType(NodeTypeNoOp) {
|
||||
// Just 'print' without 'print $something'
|
||||
expressionEvaluables = make([]IEvaluable, 1)
|
||||
expressionEvaluable := root.BuildStringLiteralNode("")
|
||||
expressionEvaluables[0] = expressionEvaluable
|
||||
} else if expressionsNode.Type == dsl.NodeTypeFunctionCallsite {
|
||||
} else if expressionsNode.Type == asts.NodeType(NodeTypeFunctionCallsite) ||
|
||||
expressionsNode.Type == asts.NodeType(NodeTypeFcnArgs) {
|
||||
expressionEvaluables = make([]IEvaluable, len(expressionsNode.Children))
|
||||
for i, childNode := range expressionsNode.Children {
|
||||
expressionEvaluable, err := root.BuildEvaluableNode(childNode)
|
||||
|
|
@ -239,7 +270,7 @@ func (root *RootNode) buildPrintxStatementNode(
|
|||
outputHandlerManager: nil,
|
||||
}
|
||||
|
||||
if redirectorNode.Type == dsl.NodeTypeNoOp {
|
||||
if redirectorNode.Type == asts.NodeType(NodeTypeNoOp) {
|
||||
// No > >> or | was provided.
|
||||
if defaultOutputStream == os.Stdout {
|
||||
retval.printToRedirectFunc = retval.printToStdout
|
||||
|
|
@ -255,23 +286,28 @@ func (root *RootNode) buildPrintxStatementNode(
|
|||
redirectorTargetNode := redirectorNode.Children[0]
|
||||
var err error
|
||||
|
||||
if redirectorTargetNode.Type == dsl.NodeTypeRedirectTargetStdout {
|
||||
if redirectorTargetNode.Type == asts.NodeType(NodeTypeRedirectTargetStdout) {
|
||||
retval.printToRedirectFunc = retval.printToStdout
|
||||
} else if redirectorTargetNode.Type == dsl.NodeTypeRedirectTargetStderr {
|
||||
} else if redirectorTargetNode.Type == asts.NodeType(NodeTypeRedirectTargetStderr) {
|
||||
retval.printToRedirectFunc = retval.printToStderr
|
||||
} else {
|
||||
retval.printToRedirectFunc = retval.printToFileOrPipe
|
||||
|
||||
retval.redirectorTargetEvaluable, err = root.BuildEvaluableNode(redirectorTargetNode)
|
||||
// RedirectTargetRvalue wraps Rvalue; unwrap to build the expression
|
||||
targetNode := redirectorTargetNode
|
||||
if redirectorTargetNode.Type == asts.NodeType(NodeTypeRedirectTargetRvalue) &&
|
||||
redirectorTargetNode.Children != nil && len(redirectorTargetNode.Children) > 0 {
|
||||
targetNode = redirectorTargetNode.Children[0]
|
||||
}
|
||||
retval.redirectorTargetEvaluable, err = root.BuildEvaluableNode(targetNode)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if redirectorNode.Type == dsl.NodeTypeRedirectWrite {
|
||||
if redirectorNode.Type == asts.NodeType(NodeTypeRedirectWrite) {
|
||||
retval.outputHandlerManager = output.NewFileWritetHandlerManager(root.recordWriterOptions)
|
||||
} else if redirectorNode.Type == dsl.NodeTypeRedirectAppend {
|
||||
} else if redirectorNode.Type == asts.NodeType(NodeTypeRedirectAppend) {
|
||||
retval.outputHandlerManager = output.NewFileAppendHandlerManager(root.recordWriterOptions)
|
||||
} else if redirectorNode.Type == dsl.NodeTypeRedirectPipe {
|
||||
} else if redirectorNode.Type == asts.NodeType(NodeTypeRedirectPipe) {
|
||||
retval.outputHandlerManager = output.NewPipeWriteHandlerManager(root.recordWriterOptions)
|
||||
} else {
|
||||
return nil, fmt.Errorf("unhandled redirector node type %s", string(redirectorNode.Type))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue