WIP make tests pass

Author: paulsmith

src/text/template/exec.go

@@ -405,7 +405,7 @@ func (s *state) walkTemplate(dot reflect.Value, t *parse.TemplateNode) {
 	s.at(t)
 	scope := s.scope[t.Name]
 	if t.Parent {
-		scope += 1
+		scope++
 	}
 	s.scope[t.Name] = scope
 	tmpl := s.tmpl.LookupWithScope(t.Name, scope)
@@ -423,7 +423,11 @@ func (s *state) walkTemplate(dot reflect.Value, t *parse.TemplateNode) {
 	// No dynamic scoping: template invocations inherit no variables.
 	newState.vars = []variable{{"$", dot}}
 	newState.walk(dot, tmpl.Root)
-	newState.scope[t.Name] = scope - 1 // TODO: unclear if this makes sense here
+	scope--
+	if scope < 0 { // TODO logical bug
+		scope = 0
+	}
+	newState.scope[t.Name] = scope // TODO: unclear if this makes sense here
 }
 
 // Eval functions evaluate pipelines, commands, and their elements and extract

src/text/template/multi_test.go

@@ -71,12 +71,12 @@ func TestMultiParse(t *testing.T) {
 			continue
 		}
 		for i, name := range test.names {
-			tmpl, ok := template.tmpl[name]
+			tmpl, ok := template.tmpl[name] // TODO making this pass tests for now, turn into an accessor method
 			if !ok {
 				t.Errorf("%s: can't find template %q", test.name, name)
 				continue
 			}
-			result := tmpl.Root.String()
+			result := tmpl[0].Root.String() // TODO
 			if result != test.results[i] {
 				t.Errorf("%s=(%q): got\n\t%v\nexpected\n\t%v", test.name, test.input, result, test.results[i])
 			}
@@ -234,10 +234,10 @@ func TestClone(t *testing.T) {
 	}
 	// Verify that the clone is self-consistent.
 	for k, v := range clone.tmpl {
-		if k == clone.name && v.tmpl[k] != clone {
+		if k == clone.name && v[0].tmpl[k][0] != clone { // TODO making this pass tests for now
 			t.Error("clone does not contain root")
 		}
-		if v != v.tmpl[v.name] {
+		if v[0] != v[0].tmpl[v[0].name][0] { // TODO making this pass tests for now
 			t.Errorf("clone does not contain self for %q", k)
 		}
 	}

src/text/template/template.go

@@ -5,7 +5,6 @@
 package template
 
 import (
-	"fmt"
 	"reflect"
 	"sync"
 	"text/template/parse"
@@ -210,7 +209,7 @@ func (t *Template) lookup(name string, scope int) *Template {
 	if scope >= len(t.tmpl[name]) {
 		return nil
 	}
-	fmt.Printf("\x1b[1;35mname: %q\tscope: %d\tlen: %d\x1b[0m\n", name, scope, len(t.tmpl[name]))
+	//fmt.Printf("\x1b[1;35mname: %q\tscope: %d\tlen: %d\x1b[0m\n", name, scope, len(t.tmpl[name]))
 	return t.tmpl[name][scope] // TODO: invariant check: at least one
 }