Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Annlix
ShellCheck
提交
86999ded
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,体验更适合开发者的 AI 搜索 >>
提交
86999ded
编写于
4月 30, 2016
作者:
V
Vidar Holen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve 'let' parsing, trigger unused var for ((a=1))
上级
7551a241
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
10 deletion
+39
-10
ShellCheck/AST.hs
ShellCheck/AST.hs
+3
-0
ShellCheck/Analytics.hs
ShellCheck/Analytics.hs
+4
-1
ShellCheck/AnalyzerLib.hs
ShellCheck/AnalyzerLib.hs
+11
-6
ShellCheck/Parser.hs
ShellCheck/Parser.hs
+21
-3
未找到文件。
ShellCheck/AST.hs
浏览文件 @
86999ded
...
...
@@ -34,6 +34,7 @@ data CaseType = CaseBreak | CaseFallThrough | CaseContinue deriving (Show, Eq)
data
Token
=
TA_Binary
Id
String
Token
Token
|
TA_Assignment
Id
String
Token
Token
|
TA_Expansion
Id
[
Token
]
|
TA_Index
Id
Token
|
TA_Sequence
Id
[
Token
]
...
...
@@ -250,6 +251,7 @@ analyze f g i =
delve
(
TC_Noary
id
typ
token
)
=
d1
token
$
TC_Noary
id
typ
delve
(
TA_Binary
id
op
t1
t2
)
=
d2
t1
t2
$
TA_Binary
id
op
delve
(
TA_Assignment
id
op
t1
t2
)
=
d2
t1
t2
$
TA_Assignment
id
op
delve
(
TA_Unary
id
op
t1
)
=
d1
t1
$
TA_Unary
id
op
delve
(
TA_Sequence
id
l
)
=
dl
l
$
TA_Sequence
id
delve
(
TA_Trinary
id
t1
t2
t3
)
=
do
...
...
@@ -344,6 +346,7 @@ getId t = case t of
TC_Unary
id
_
_
_
->
id
TC_Noary
id
_
_
->
id
TA_Binary
id
_
_
_
->
id
TA_Assignment
id
_
_
_
->
id
TA_Unary
id
_
_
->
id
TA_Sequence
id
_
->
id
TA_Trinary
id
_
_
_
->
id
...
...
ShellCheck/Analytics.hs
浏览文件 @
86999ded
...
...
@@ -2054,6 +2054,9 @@ prop_checkUnused26= verifyNotTree checkUnusedAssignments "declare -F foo"
prop_checkUnused27
=
verifyTree
checkUnusedAssignments
"var=3; [ var -eq 3 ]"
prop_checkUnused28
=
verifyNotTree
checkUnusedAssignments
"var=3; [[ var -eq 3 ]]"
prop_checkUnused29
=
verifyNotTree
checkUnusedAssignments
"var=(a b); declare -p var"
prop_checkUnused30
=
verifyTree
checkUnusedAssignments
"let a=1"
prop_checkUnused31
=
verifyTree
checkUnusedAssignments
"let 'a=1'"
prop_checkUnused32
=
verifyTree
checkUnusedAssignments
"let a=b=c; echo $a"
checkUnusedAssignments
params
t
=
execWriter
(
mapM_
warnFor
unused
)
where
flow
=
variableFlow
params
...
...
@@ -2742,7 +2745,7 @@ checkLoopVariableReassignment params token =
T_ForIn
_
s
_
_
->
return
s
T_ForArithmetic
_
(
TA_Sequence
_
[
TA_
Binary
_
"="
[
TA_
Assignment
_
"="
(
TA_Expansion
_
[
T_Literal
_
var
])
_
])
_
_
_
->
return
var
_
->
fail
"not loop"
...
...
ShellCheck/AnalyzerLib.hs
浏览文件 @
86999ded
...
...
@@ -40,8 +40,6 @@ import qualified Data.Map as Map
import
Test.QuickCheck.All
(
forAllProperties
)
import
Test.QuickCheck.Test
(
quickCheckWithResult
,
stdArgs
,
maxSuccess
)
import
Debug.Trace
type
Analysis
=
ReaderT
Parameters
(
Writer
[
TokenComment
])
()
...
...
@@ -272,7 +270,7 @@ getVariableFlow shell parents t =
assignFirst
_
=
False
setRead
t
=
let
read
=
getReferencedVariables
t
let
read
=
getReferencedVariables
parents
t
in
mapM_
(
\
v
->
modify
(
Reference
v
:
))
read
setWritten
t
=
...
...
@@ -331,7 +329,7 @@ getModifiedVariables t =
TA_Unary
_
"|++"
var
->
maybeToList
$
do
name
<-
getLiteralString
var
return
(
t
,
t
,
name
,
DataString
$
SourceFrom
[
t
])
TA_
Binary
_
op
lhs
rhs
->
maybeToList
$
do
TA_
Assignment
_
op
lhs
rhs
->
maybeToList
$
do
guard
$
op
`
elem
`
[
"="
,
"*="
,
"/="
,
"%="
,
"+="
,
"-="
,
"<<="
,
">>="
,
"&="
,
"^="
,
"|="
]
name
<-
getLiteralString
lhs
return
(
t
,
t
,
name
,
DataString
$
SourceFrom
[
rhs
])
...
...
@@ -476,12 +474,15 @@ getIndexReferences s = fromMaybe [] $ do
where
re
=
mkRegex
"(
\\
[.*
\\
])"
getReferencedVariables
t
=
getReferencedVariables
parents
t
=
case
t
of
T_DollarBraced
id
l
->
let
str
=
bracedString
t
in
(
t
,
t
,
getBracedReference
str
)
:
map
(
\
x
->
(
l
,
l
,
x
))
(
getIndexReferences
str
)
TA_Expansion
id
_
->
getIfReference
t
t
TA_Expansion
id
_
->
if
isArithmeticAssignment
t
then
[]
else
getIfReference
t
t
T_Assignment
id
mode
str
_
word
->
[(
t
,
t
,
str
)
|
mode
==
Append
]
++
specialReferences
str
t
word
...
...
@@ -518,6 +519,10 @@ getReferencedVariables t =
isDereferencing
=
(`
elem
`
[
"-eq"
,
"-ne"
,
"-lt"
,
"-le"
,
"-gt"
,
"-ge"
])
isArithmeticAssignment
t
=
case
getPath
parents
t
of
this
:
TA_Assignment
_
"="
_
_
:
_
->
True
_
->
False
dataTypeFrom
defaultType
v
=
(
case
v
of
T_Array
{}
->
DataArray
;
_
->
defaultType
)
$
SourceFrom
[
v
]
...
...
ShellCheck/Parser.hs
浏览文件 @
86999ded
...
...
@@ -708,7 +708,9 @@ readArithmeticContents =
l
<-
readAssignment
`
sepBy
`
(
char
','
>>
spacing
)
return
$
TA_Sequence
id
l
readAssignment
=
readTrinary
`
splitBy
`
[
"="
,
"*="
,
"/="
,
"%="
,
"+="
,
"-="
,
"<<="
,
">>="
,
"&="
,
"^="
,
"|="
]
readAssignment
=
chainr1
readTrinary
readAssignmentOp
readAssignmentOp
=
readComboOp
[
"="
,
"*="
,
"/="
,
"%="
,
"+="
,
"-="
,
"<<="
,
">>="
,
"&="
,
"^="
,
"|="
]
TA_Assignment
readTrinary
=
do
x
<-
readLogicalOr
do
...
...
@@ -2214,13 +2216,29 @@ readTimeSuffix = do
lookAhead
$
char
'-'
readCmdWord
-- Fixme: this is a hack that doesn't handle let '++c' or let a\>b
-- Fixme: this is a hack that doesn't handle let c='4'"5" or let a\>b
readLetSuffix
::
Monad
m
=>
SCParser
m
[
Token
]
readLetSuffix
=
many1
(
readIoRedirect
<|>
try
readLetExpression
<|>
readCmdWord
)
where
readLetExpression
::
Monad
m
=>
SCParser
m
Token
readLetExpression
=
do
startPos
<-
getPosition
expression
<-
readStringForParser
readCmdWord
subParse
startPos
readArithmeticContents
expression
let
(
unQuoted
,
newPos
)
=
kludgeAwayQuotes
expression
startPos
subParse
newPos
readArithmeticContents
unQuoted
kludgeAwayQuotes
::
String
->
SourcePos
->
(
String
,
SourcePos
)
kludgeAwayQuotes
s
p
=
case
s
of
first
:
rest
@
(
_
:
_
)
->
let
(
last
:
backwards
)
=
reverse
rest
middle
=
reverse
backwards
in
if
first
`
elem
`
"'
\"
"
&&
first
==
last
then
(
middle
,
updatePosChar
p
first
)
else
(
s
,
p
)
x
->
(
s
,
p
)
-- bash allows a=(b), ksh allows $a=(b). dash allows neither. Let's warn.
readEvalSuffix
=
many1
(
readIoRedirect
<|>
readCmdWord
<|>
evalFallback
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录