Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Annlix
ShellCheck
提交
43c26061
S
ShellCheck
项目概览
Annlix
/
ShellCheck
与 Fork 源项目一致
Fork自
镜像 / koalaman / ShellCheck
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
ShellCheck
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
43c26061
编写于
6月 26, 2016
作者:
V
Vidar Holen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve parsing for ambiguous $((foo) ) and ((foo) ).
上级
07fd5724
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
22 deletion
+26
-22
ShellCheck/Parser.hs
ShellCheck/Parser.hs
+26
-22
未找到文件。
ShellCheck/Parser.hs
浏览文件 @
43c26061
...
...
@@ -1078,13 +1078,18 @@ subParse pos parser input = do
setPosition
lastPosition
return
result
inSeparateContext
parser
=
do
-- Parse something, but forget all parseProblems
inSeparateContext
=
parseForgettingContext
True
-- Parse something, but forget all parseProblems on failure
forgetOnFailure
=
parseForgettingContext
False
parseForgettingContext
alsoOnSuccess
parser
=
do
context
<-
Ms
.
get
success
context
<|>
failure
context
where
success
c
=
do
res
<-
try
parser
Ms
.
put
c
when
alsoOnSuccess
$
Ms
.
put
c
return
res
failure
c
=
do
Ms
.
put
c
...
...
@@ -1321,7 +1326,12 @@ readDoubleQuotedDollar = readDollarExpression <|> readDollarLonely
prop_readDollarExpression1
=
isOk
readDollarExpression
"$(((1) && 3))"
prop_readDollarExpression2
=
isWarning
readDollarExpression
"$(((1)) && 3)"
readDollarExpression
=
readTripleParenthesis
"$"
readDollarArithmetic
readDollarExpansion
<|>
readDollarArithmetic
<|>
readDollarBracket
<|>
readDollarBraceCommandExpansion
<|>
readDollarBraced
<|>
readDollarExpansion
<|>
readDollarVariable
prop_readDollarExpression3
=
isWarning
readDollarExpression
"$((
\"
$@
\"
&); foo;)"
readDollarExpression
::
Monad
m
=>
SCParser
m
Token
readDollarExpression
=
arithmetic
<|>
readDollarExpansion
<|>
readDollarBracket
<|>
readDollarBraceCommandExpansion
<|>
readDollarBraced
<|>
readDollarVariable
where
arithmetic
=
readAmbiguous
"$(("
readDollarArithmetic
readDollarExpansion
(
\
pos
->
parseNoteAt
pos
WarningC
1102
"Shells disambiguate $(( differently or not at all. If the first $( should start command substitution, add a space after it."
)
prop_readDollarSingleQuote
=
isOk
readDollarSingleQuote
"$'foo
\\\'
lol'"
readDollarSingleQuote
=
called
"$'..' expression"
$
do
...
...
@@ -1367,25 +1377,20 @@ readArithmeticExpression = called "((..)) command" $ do
string
"))"
return
(
T_Arithmetic
id
c
)
-- Check if maybe ((( was intended as ( (( rather than (( (
readTripleParenthesis
prefix
expected
alternative
=
do
pos
<-
try
.
lookAhead
$
do
string
prefix
p
<-
getPosition
string
"((("
-- should optimally be "((" but it's noisy and rarely helpful
return
p
-- If the next characters match prefix, try two different parsers and warn if the alternate parser had to be used
readAmbiguous
::
Monad
m
=>
String
->
SCParser
m
p
->
SCParser
m
p
->
(
SourcePos
->
SCParser
m
()
)
->
SCParser
m
p
readAmbiguous
prefix
expected
alternative
warner
=
do
pos
<-
getPosition
try
.
lookAhead
$
string
prefix
-- If the expected parser fails, try the alt.
-- If the alt fails, run the expected one again for the errors.
try
expected
<|>
tryAlt
pos
<|>
expected
try
(
forgetOnFailure
expected
)
<|>
try
(
withAlt
pos
)
<|>
expected
where
tryAlt
pos
=
do
t
<-
try
alternative
parseNoteAt
pos
WarningC
1102
$
"Shells differ in parsing ambiguous "
++
prefix
++
"(((. Use spaces: "
++
prefix
++
"( (( ."
withAlt
pos
=
do
t
<-
forgetOnFailure
alternative
warner
pos
return
t
prop_readDollarBraceCommandExpansion1
=
isOk
readDollarBraceCommandExpansion
"${ ls; }"
prop_readDollarBraceCommandExpansion2
=
isOk
readDollarBraceCommandExpansion
"${
\n
ls
\n
}"
readDollarBraceCommandExpansion
=
called
"ksh ${ ..; } command expansion"
$
do
...
...
@@ -2194,8 +2199,9 @@ readCompoundCommand = do
id
<-
getNextId
cmd
<-
choice
[
readBraceGroup
,
readTripleParenthesis
""
readArithmeticExpression
readSubshell
,
readArithmeticExpression
,
readAmbiguous
"(("
readArithmeticExpression
readSubshell
(
\
pos
->
parseNoteAt
pos
WarningC
1105
"Shells disambiguate (( differently or not at all. If the first ( should start a subshell, add a space after it."
),
--readArithmeticExpression,
readSubshell
,
readCondition
,
readWhileClause
,
...
...
@@ -2269,9 +2275,7 @@ readEvalSuffix = many1 (readIoRedirect <|> readCmdWord <|> evalFallback)
-- Get whatever a parser would parse as a string
readStringForParser
parser
=
do
state
<-
Ms
.
get
pos
<-
lookAhead
(
parser
>>
getPosition
)
Ms
.
put
state
pos
<-
inSeparateContext
$
lookAhead
(
parser
>>
getPosition
)
readUntil
pos
where
readUntil
endPos
=
anyChar
`
reluctantlyTill
`
(
getPosition
>>=
guard
.
(
==
endPos
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录