Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
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
nexedi
caddy
Commits
eb48885d
Commit
eb48885d
authored
Dec 11, 2015
by
Radim Marek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated comments
parent
afbda595
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
caddy/parse/parsing.go
caddy/parse/parsing.go
+7
-4
No files found.
caddy/parse/parsing.go
View file @
eb48885d
...
...
@@ -176,10 +176,11 @@ func (p *parser) directives() error {
}
// doImport swaps out the import directive and its argument
// (a total of 2 tokens) with the tokens in the file specified.
// When the function returns, the cursor is on the token before
// where the import directive was. In other words, call Next()
// to access the first token that was imported.
// (a total of 2 tokens) with the tokens in the specified file
// or globbing pattern. When the function returns, the cursor
// is on the token before where the import directive was. In
// other words, call Next() to access the first token that was
// imported.
func
(
p
*
parser
)
doImport
()
error
{
if
!
p
.
NextArg
()
{
return
p
.
ArgErr
()
...
...
@@ -218,6 +219,8 @@ func (p *parser) doImport() error {
return
nil
}
// doSingleImport lexes the individual files matching the
// globbing pattern from of the import directive.
func
(
p
*
parser
)
doSingleImport
(
importFile
string
)
error
{
file
,
err
:=
os
.
Open
(
importFile
)
if
err
!=
nil
{
...
...
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