code review 4639096: exp/template: allow complex numbers, add 'with', 'defin...

src/pkg/exp/template/lex_test.go

 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package template
 
 import (
         "reflect"
         "testing"
 )
@@ skipping 17 matching lines @@
 )
 
 var lexTests = []lexTest{
         {"empty", "", []item{tEOF}},
         {"spaces", " \t\n", []item{{itemText, " \t\n"}, tEOF}},
         {"text", `now is the time`, []item{{itemText, "now is the time"}, tEOF}},
         {"empty action", `{{}}`, []item{tLeft, tRight, tEOF}},
         {"for", `{{for }}`, []item{tLeft, tFor, tRight, tEOF}},
         {"quote", `{{"abc \n\t\" "}}`, []item{tLeft, tQuote, tRight, tEOF}},
         {"raw quote", "{{" + raw + "}}", []item{tLeft, tRawQuote, tRight, tEOF}},
-        {"numbers", "{{1 02 0x14 -7.2i 1e3 +1.2e-4}}", []item{
+        {"numbers", "{{1 02 0x14 -7.2i 1e3 +1.2e-4 4.2i 1+2i}}", []item{
                 tLeft,
                 {itemNumber, "1"},
                 {itemNumber, "02"},
                 {itemNumber, "0x14"},
                 {itemNumber, "-7.2i"},
                 {itemNumber, "1e3"},
                 {itemNumber, "+1.2e-4"},
+                {itemNumber, "4.2i"},
+                {itemComplex, "1+2i"},
                 tRight,
                 tEOF,
         }},
         {"bools", "{{true false}}", []item{
                 tLeft,
                 {itemBool, "true"},
                 {itemBool, "false"},
                 tRight,
                 tEOF,
         }},
         {"dot", "{{.}}", []item{
                 tLeft,
                 {itemDot, "."},
                 tRight,
                 tEOF,
         }},
         {"dots", "{{.x . .2 .x.y}}", []item{
                 tLeft,
                 {itemField, ".x"},
                 {itemDot, "."},
                 {itemNumber, ".2"},
                 {itemField, ".x.y"},
                 tRight,
                 tEOF,
         }},
-        {"keywords", "{{range if else end}}", []item{
+        {"keywords", "{{range if else end with}}", []item{
                 tLeft,
                 {itemRange, "range"},
                 {itemIf, "if"},
                 {itemElse, "else"},
                 {itemEnd, "end"},
+                {itemWith, "with"},
                 tRight,
                 tEOF,
         }},
         {"pipeline", `intro {{echo hi 1.2 |noargs|args 1 "hi"}} outro`, []item{
                 {itemText, "intro "},
                 tLeft,
                 {itemIdentifier, "echo"},
                 {itemIdentifier, "hi"},
                 {itemNumber, "1.2"},
                 tPipe,
@@ skipping 45 matching lines @@
 }
 
 func TestLex(t *testing.T) {
         for _, test := range lexTests {
                 items := collect(&test)
                 if !reflect.DeepEqual(items, test.items) {
                         t.Errorf("%s: got\n\t%v\nexpected\n\t%v", test.name, items, test.items)
                 }
         }
 }