Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tpl demo: natural-lang #2154

Merged
merged 3 commits into from
Mar 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions demo/gop-parser/natural-lang/nlang.gop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import "os"

cl := tpl`
expr = subject verb object
subject = "I" | "You" | "He" | "She" | "It" | "Dog" | "Cat"
object = "me" | "you" | "him" | "her" | "it" | "fish" | "apple" | "banana" | "dog" | "cat"
verb = "attack" | "love" | "eat" | "hate"
`!

print "> "
for line <- os.Stdin {
e, err := cl.parseExpr(line, nil)
if err != nil {
print "${err}\n> "
} else {
print e, "\n > "
}
}
52 changes: 30 additions & 22 deletions tpl/matcher/match.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import (
"github.com/goplus/gop/tpl/types"
)

var (
errMultiMismatch = errors.New("multiple mismatch")

// ErrVarAssigned error
ErrVarAssigned = errors.New("variable is already assigned")
)

// -----------------------------------------------------------------------------

// Error represents a matching error.
Expand Down Expand Up @@ -114,30 +121,25 @@ type gChoice struct {
}

func (p *gChoice) Match(src []*types.Token, ctx *Context) (n int, result any, err error) {
var nMax int
var nMax = -1
var errMax error
// var multiErr = true
var multiErr = true

for _, g := range p.options {
if n, result, err = g.Match(src, ctx); err == nil {
return
}
if n >= nMax {
nMax, errMax = n, err
/*
if n == nMax {
multiErr = true
} else {
nMax, errMax, multiErr = n, err, false
}
*/
if n == nMax {
multiErr = true
} else {
nMax, errMax, multiErr = n, err, false
}
}
}
/*
if multiErr {
errMax = ctx.NewError(src[nMax].End(), "TODO: error msg") // TODO(xsw)
}
*/
if multiErr {
errMax = errMultiMismatch
}
return nMax, nil, errMax
}

Expand Down Expand Up @@ -263,11 +265,6 @@ func List(a, b Matcher) Matcher {

// -----------------------------------------------------------------------------

var (
// ErrVarAssigned error
ErrVarAssigned = errors.New("variable is already assigned")
)

type Var struct {
Elem Matcher
Name string
Expand All @@ -277,9 +274,20 @@ type Var struct {
func (p *Var) Match(src []*types.Token, ctx *Context) (n int, result any, err error) {
g := p.Elem
if g == nil {
return 0, nil, ctx.NewErrorf(p.Pos, "variable `%s` not found", p.Name)
return 0, nil, ctx.NewErrorf(p.Pos, "variable `%s` not assigned", p.Name)
}
n, result, err = g.Match(src, ctx)
if err == errMultiMismatch {
var posErr token.Pos
var tokErr any
if len(src) > 0 {
posErr, tokErr = src[0].Pos, src[0]
} else {
posErr, tokErr = ctx.FileEnd, "EOF"
}
err = ctx.NewErrorf(posErr, "expect `%s`, but got `%s`", p.Name, tokErr)
}
return g.Match(src, ctx)
return
}

// Assign assigns a value to this variable.
Expand Down
10 changes: 6 additions & 4 deletions tpl/tpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,17 @@ func isPlain(result []any) bool {

// -----------------------------------------------------------------------------

func Dump(result any) {
Fdump(os.Stdout, result, "", " ")
func Dump(result any, omitSemi ...bool) {
Fdump(os.Stdout, result, "", " ", omitSemi != nil && omitSemi[0])
}

func Fdump(w io.Writer, result any, prefix, indent string) {
func Fdump(w io.Writer, result any, prefix, indent string, omitSemi bool) {
switch result := result.(type) {
case *Token:
if result.Tok != token.SEMICOLON {
fmt.Fprint(w, prefix, result, "\n")
} else if !omitSemi {
fmt.Fprint(w, prefix, ";\n")
}
case []any:
if isPlain(result) {
Expand All @@ -189,7 +191,7 @@ func Fdump(w io.Writer, result any, prefix, indent string) {
} else {
fmt.Print(prefix, "[\n")
for _, v := range result {
Fdump(w, v, prefix+indent, indent)
Fdump(w, v, prefix+indent, indent, omitSemi)
}
fmt.Print(prefix, "]\n")
}
Expand Down