wdte: funcmod functions (#204)

* res/grammar: Change funcmods.

* scanner: Remove funcmod keywords.

* wdte: Implenent new funcmod system.

* std: Reimplement `memo` and `rev` as funcmod functions.

* std: Attempt to reimplement method.

* scanner: Fix FuncMods test.

* multiple: Fix a bunch of linter warnings.

* multiple: Remove the `nolint`s.

Author: DeedleFake

ast/internal/pgen/table.go

@@ -23,7 +23,7 @@ type Term struct {
 	p Node
 }
 
-func (t Term) Parent() Node { // nolint
+func (t Term) Parent() Node {
 	return t.p
 }
 
@@ -32,7 +32,7 @@ func (t Term) Tok() scanner.Token {
 	return t.tok
 }
 
-func (t Term) Children() []Node { // nolint
+func (t Term) Children() []Node {
 	return nil
 }
 
@@ -49,7 +49,7 @@ func (nt NTerm) Name() string {
 	return string(nt.nt)
 }
 
-func (nt NTerm) Parent() Node { // nolint
+func (nt NTerm) Parent() Node {
 	return nt.p
 }
 
@@ -63,7 +63,7 @@ func (nt *NTerm) AddChild(n Node) {
 	nt.c = append(nt.c, n)
 }
 
-func (nt NTerm) Children() []Node { // nolint
+func (nt NTerm) Children() []Node {
 	return nt.c
 }
 
@@ -72,10 +72,10 @@ type Epsilon struct {
 	p Node
 }
 
-func (e Epsilon) Parent() Node { // nolint
+func (e Epsilon) Parent() Node {
 	return e.p
 }
 
-func (e Epsilon) Children() []Node { // nolint
+func (e Epsilon) Children() []Node {
 	return nil
 }

ast/node.go

@@ -175,7 +175,7 @@ func (g Grammar) followWithout(nt NTerm, ignore []NTerm) TokenSet {
 						continue
 					}
 
-					for i := i + 1; i < len(rule); i++ { // nolint
+					for i := i + 1; i < len(rule); i++ {
 						ts.AddAll(g.First(rule[i]), rule)
 						if !g.Nullable(rule[i]) {
 							break

cmd/pgen/grammar.go

@@ -37,7 +37,7 @@ func main() {
 
 	out := &formatter{w: os.Stdout}
 	if *output != "" {
-		file, err := os.Create(*output) // nolint
+		file, err := os.Create(*output)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error creating %q: %v", *output, err)
 			os.Exit(1)

cmd/pgen/pgen.go

@@ -18,10 +18,6 @@ func printRet(ret wdte.Func) {
 	case error, fmt.Stringer:
 		fmt.Printf(": %v\n", ret)
 		return
-
-	case wdte.GoFunc:
-		fmt.Println(": complex value (GoFunc)")
-		return
 	}
 
 	switch k := reflect.Indirect(reflect.ValueOf(ret)).Kind(); k {

cmd/wdte/stdin.go

@@ -40,7 +40,7 @@ func Sum(frame wdte.Frame, args ...wdte.Func) wdte.Func {
 	return sum
 }
 
-func ExampleREADME() {
+func Example() {
 	m, err := wdte.Parse(strings.NewReader(src), wdte.ImportFunc(im), nil)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error parsing script: %v\n", err)

readme_test.go

@@ -14,7 +14,7 @@ func ExamplePartial() {
 	stack, partial = repl.Partial(strings.NewReader("import 'io'"), stack, nil)
 	fmt.Println(partial)
 
-	stack, partial = repl.Partial(strings.NewReader(";"), stack, nil)
+	_, partial = repl.Partial(strings.NewReader(";"), stack, nil)
 	fmt.Println(partial)
 	// Output: true
 	// true

repl/examples_test.go

@@ -1,9 +1,6 @@
     <script> -> <cexprs> Ω
-  <funcmods> -> <funcmod> <funcmods>
+  <funcmods> -> ( <expr> ; ) <funcmods>
               | ε
-   <funcmod> -> memo
-              | rev
-              | method
   <argdecls> -> <argdecl> <argdecls>
               | ε
    <argdecl> -> id

res/grammar.ebnf

@@ -104,9 +104,13 @@ o => print "double\n" 'single\\';`,
 		},
 		{
 			name: "FuncMods",
-			in:   `memo test => ();`,
+			in:   `let (memo) test => ();`,
 			out: []scanner.Token{
-				{Type: scanner.Keyword, Val: "memo"},
+				{Type: scanner.Keyword, Val: "let"},
+				{Type: scanner.Keyword, Val: "("},
+				{Type: scanner.ID, Val: "memo"},
+				{Type: scanner.Keyword, Val: ";"},
+				{Type: scanner.Keyword, Val: ")"},
 				{Type: scanner.ID, Val: "test"},
 				{Type: scanner.Keyword, Val: "=>"},
 				{Type: scanner.Keyword, Val: "("},

scanner/scanner_test.go

@@ -15,7 +15,7 @@ type Token struct {
 type TokenType uint
 
 const (
-	Invalid TokenType = iota // nolint
+	Invalid TokenType = iota
 	Number
 	String
 	ID