Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
go
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
go
Commits
348e31f8
Commit
348e31f8
authored
Sep 27, 2012
by
Josh Holland
Committed by
Rob Pike
Sep 27, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
text/template: fix typo of errorf as error in comment.
R=r, minux.ma CC=gobot, golang-dev
https://golang.org/cl/6506120
parent
063b0744
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
src/pkg/text/template/parse/lex.go
src/pkg/text/template/parse/lex.go
+17
-17
No files found.
src/pkg/text/template/parse/lex.go
View file @
348e31f8
...
...
@@ -38,7 +38,7 @@ type itemType int
const
(
itemError
itemType
=
iota
// error occurred; value is text of error
itemBool
// boolean constant
itemChar
// printable ASCII character; grab bag for comma etc
.
itemChar
// printable ASCII character; grab bag for comma etc
itemCharConstant
// character constant
itemComplex
// complex constant (1+2i); imaginary is just a number
itemColonEquals
// colon-equals (':=') introducing a declaration
...
...
@@ -55,10 +55,10 @@ const (
itemSpace
// run of spaces separating arguments
itemString
// quoted string (includes quotes)
itemText
// plain text
itemVariable
// variable starting with '$', such as '$' or '$1' or '$hello'
.
itemVariable
// variable starting with '$', such as '$' or '$1' or '$hello'
// Keywords appear after all the rest.
itemKeyword
// used only to delimit the keywords
itemDot
// the cursor, spelled '.'
.
itemDot
// the cursor, spelled '.'
itemDefine
// define keyword
itemElse
// else keyword
itemEnd
// end keyword
...
...
@@ -88,16 +88,16 @@ type stateFn func(*lexer) stateFn
// lexer holds the state of the scanner.
type
lexer
struct
{
name
string
// the name of the input; used only for error reports
.
input
string
// the string being scanned
.
leftDelim
string
// start of action
.
rightDelim
string
// end of action
.
state
stateFn
// the next lexing function to enter
.
pos
int
// current position in the input
.
start
int
// start position of this item
.
width
int
// width of last rune read from input
.
name
string
// the name of the input; used only for error reports
input
string
// the string being scanned
leftDelim
string
// start of action
rightDelim
string
// end of action
state
stateFn
// the next lexing function to enter
pos
int
// current position in the input
start
int
// start position of this item
width
int
// width of last rune read from input
lastPos
int
// position of most recent item returned by nextItem
items
chan
item
// channel of scanned items
.
items
chan
item
// channel of scanned items
parenDepth
int
// nesting depth of ( ) exprs
}
...
...
@@ -158,7 +158,7 @@ func (l *lexer) lineNumber() int {
return
1
+
strings
.
Count
(
l
.
input
[
:
l
.
lastPos
],
"
\n
"
)
}
// error returns an error token and terminates the scan by passing
// error
f
returns an error token and terminates the scan by passing
// back a nil pointer that will be the next state, terminating l.nextItem.
func
(
l
*
lexer
)
errorf
(
format
string
,
args
...
interface
{})
stateFn
{
l
.
items
<-
item
{
itemError
,
l
.
start
,
fmt
.
Sprintf
(
format
,
args
...
)}
...
...
@@ -428,7 +428,7 @@ func (l *lexer) atTerminator() bool {
}
// lexChar scans a character constant. The initial quote is already
// scanned.
Syntax checking is done by the parser.
// scanned. Syntax checking is done by the parser.
func
lexChar
(
l
*
lexer
)
stateFn
{
Loop
:
for
{
...
...
@@ -448,7 +448,7 @@ Loop:
return
lexInsideAction
}
// lexNumber scans a number: decimal, octal, hex, float, or imaginary.
This
// lexNumber scans a number: decimal, octal, hex, float, or imaginary. This
// isn't a perfect number scanner - for instance it accepts "." and "0x0.2"
// and "089" - but when it's wrong the input is invalid and the parser (via
// strconv) will notice.
...
...
@@ -457,7 +457,7 @@ func lexNumber(l *lexer) stateFn {
return
l
.
errorf
(
"bad number syntax: %q"
,
l
.
input
[
l
.
start
:
l
.
pos
])
}
if
sign
:=
l
.
peek
();
sign
==
'+'
||
sign
==
'-'
{
// Complex: 1+2i.
No spaces, must end in 'i'.
// Complex: 1+2i. No spaces, must end in 'i'.
if
!
l
.
scanNumber
()
||
l
.
input
[
l
.
pos
-
1
]
!=
'i'
{
return
l
.
errorf
(
"bad number syntax: %q"
,
l
.
input
[
l
.
start
:
l
.
pos
])
}
...
...
@@ -534,7 +534,7 @@ func isSpace(r rune) bool {
return
r
==
' '
||
r
==
'\t'
}
// isEndOfLine reports whether r is an end-of-line character
// isEndOfLine reports whether r is an end-of-line character
.
func
isEndOfLine
(
r
rune
)
bool
{
return
r
==
'\r'
||
r
==
'\n'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment