Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
95795620
J
jadx
项目概览
2301_76393173
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
95795620
编写于
3月 11, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix indent for 'break' in 'case' block, refactor tests
上级
890c0a99
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
100 addition
and
40 deletion
+100
-40
jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
+13
-22
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
+8
-4
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
+1
-10
jadx-core/src/test/java/jadx/api/TestUtils.java
jadx-core/src/test/java/jadx/api/TestUtils.java
+25
-0
jadx-core/src/test/java/jadx/tests/internal/TestSwitch.java
jadx-core/src/test/java/jadx/tests/internal/TestSwitch.java
+49
-0
jadx-core/src/test/java/jadx/tests/internal/TestSynchronized.java
...e/src/test/java/jadx/tests/internal/TestSynchronized.java
+1
-1
jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java
...st/java/jadx/tests/internal/TestVariablesDefinitions.java
+1
-1
jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java
...t/java/jadx/tests/internal/inner/TestAnonymousClass3.java
+2
-2
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
浏览文件 @
95795620
...
...
@@ -50,30 +50,20 @@ public class CodeWriter {
public
CodeWriter
startLine
()
{
addLine
();
addIndent
();
add
Line
Indent
();
return
this
;
}
public
CodeWriter
startLine
(
char
c
)
{
addLine
();
addIndent
();
add
Line
Indent
();
add
(
c
);
return
this
;
}
public
CodeWriter
startLine
(
String
str
)
{
addLine
();
addIndent
();
add
(
str
);
return
this
;
}
public
CodeWriter
startLine
(
int
ind
,
String
str
)
{
addLine
();
addIndent
();
for
(
int
i
=
0
;
i
<
ind
;
i
++)
{
addIndent
();
}
addLineIndent
();
add
(
str
);
return
this
;
}
...
...
@@ -118,12 +108,17 @@ public class CodeWriter {
offset
=
0
;
}
p
ublic
CodeWriter
add
Indent
()
{
p
rivate
CodeWriter
addLine
Indent
()
{
buf
.
append
(
indentStr
);
offset
+=
indentStr
.
length
();
return
this
;
}
public
CodeWriter
addIndent
()
{
add
(
INDENT
);
return
this
;
}
private
void
updateIndent
()
{
int
curIndent
=
indent
;
if
(
curIndent
<
INDENT_CACHE
.
length
)
{
...
...
@@ -137,14 +132,6 @@ public class CodeWriter {
}
}
public
int
getLine
()
{
return
line
;
}
public
int
getIndent
()
{
return
indent
;
}
public
void
incIndent
()
{
incIndent
(
1
);
}
...
...
@@ -167,6 +154,10 @@ public class CodeWriter {
updateIndent
();
}
public
int
getLine
()
{
return
line
;
}
private
static
class
DefinitionWrapper
{
private
final
LineAttrNode
node
;
...
...
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
浏览文件 @
95795620
...
...
@@ -203,6 +203,7 @@ public class RegionGen extends InsnGen {
code
.
startLine
(
"switch ("
);
addArg
(
code
,
arg
);
code
.
add
(
") {"
);
code
.
incIndent
();
int
size
=
sw
.
getKeys
().
size
();
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
...
...
@@ -223,18 +224,21 @@ public class RegionGen extends InsnGen {
code
.
startLine
(
"default:"
);
makeCaseBlock
(
sw
.
getDefaultCase
(),
code
);
}
code
.
decIndent
();
code
.
startLine
(
'}'
);
return
code
;
}
private
void
makeCaseBlock
(
IContainer
c
,
CodeWriter
code
)
throws
CodegenException
{
boolean
addBreak
=
true
;
if
(
RegionUtils
.
notEmpty
(
c
))
{
makeRegionIndent
(
code
,
c
);
if
(
RegionUtils
.
hasExitEdge
(
c
))
{
code
.
startLine
(
1
,
"break;"
)
;
if
(
!
RegionUtils
.
hasExitEdge
(
c
))
{
addBreak
=
false
;
}
}
else
{
code
.
startLine
(
1
,
"break;"
);
}
if
(
addBreak
)
{
code
.
startLine
().
addIndent
().
add
(
"break;"
);
}
}
...
...
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
浏览文件 @
95795620
package
jadx.api
;
import
jadx.core.Jadx
;
import
jadx.core.codegen.CodeWriter
;
import
jadx.core.dex.attributes.AttributeFlag
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.dex.nodes.MethodNode
;
...
...
@@ -25,7 +24,7 @@ import static junit.framework.Assert.assertFalse;
import
static
junit
.
framework
.
Assert
.
assertNotNull
;
import
static
junit
.
framework
.
Assert
.
fail
;
public
abstract
class
InternalJadxTest
{
public
abstract
class
InternalJadxTest
extends
TestUtils
{
protected
boolean
outputCFG
=
false
;
protected
boolean
deleteTmpJar
=
true
;
...
...
@@ -151,14 +150,6 @@ public abstract class InternalJadxTest {
}
}
protected
String
makeIndent
(
int
indent
)
{
StringBuilder
sb
=
new
StringBuilder
(
indent
*
CodeWriter
.
INDENT
.
length
());
for
(
int
i
=
0
;
i
<
indent
;
i
++)
{
sb
.
append
(
CodeWriter
.
INDENT
);
}
return
sb
.
toString
();
}
// Use only for debug purpose
@Deprecated
protected
void
setOutputCFG
()
{
...
...
jadx-core/src/test/java/jadx/api/TestUtils.java
0 → 100644
浏览文件 @
95795620
package
jadx.api
;
import
jadx.core.codegen.CodeWriter
;
public
class
TestUtils
{
public
static
String
indent
(
int
indent
)
{
StringBuilder
sb
=
new
StringBuilder
(
indent
*
CodeWriter
.
INDENT
.
length
());
for
(
int
i
=
0
;
i
<
indent
;
i
++)
{
sb
.
append
(
CodeWriter
.
INDENT
);
}
return
sb
.
toString
();
}
public
static
int
count
(
String
string
,
String
substring
)
{
int
count
=
0
;
int
idx
=
0
;
while
((
idx
=
string
.
indexOf
(
substring
,
idx
))
!=
-
1
)
{
idx
++;
count
++;
}
return
count
;
}
}
jadx-core/src/test/java/jadx/tests/internal/TestSwitch.java
0 → 100644
浏览文件 @
95795620
package
jadx.tests.internal
;
import
jadx.api.InternalJadxTest
;
import
jadx.core.dex.nodes.ClassNode
;
import
org.junit.Test
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestSwitch
extends
InternalJadxTest
{
public
static
class
TestCls
{
public
String
escape
(
String
str
)
{
int
len
=
str
.
length
();
StringBuilder
sb
=
new
StringBuilder
(
len
);
for
(
int
i
=
0
;
i
<
len
;
i
++)
{
char
c
=
str
.
charAt
(
i
);
switch
(
c
)
{
case
'.'
:
case
'/'
:
sb
.
append
(
'_'
);
break
;
case
']'
:
sb
.
append
(
'A'
);
break
;
case
'?'
:
break
;
default
:
sb
.
append
(
c
);
break
;
}
}
return
sb
.
toString
();
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
System
.
out
.
println
(
code
);
assertThat
(
code
,
containsString
(
"case '/':"
));
assertThat
(
code
,
containsString
(
indent
(
5
)
+
"break;"
));
}
}
jadx-core/src/test/java/jadx/tests/internal/TestSynchronized.java
浏览文件 @
95795620
...
...
@@ -38,6 +38,6 @@ public class TestSynchronized extends InternalJadxTest {
assertThat
(
code
,
containsString
(
"return this.f"
));
assertThat
(
code
,
containsString
(
"synchronized (this.o) {"
));
assertThat
(
code
,
not
(
containsString
(
makeI
ndent
(
3
)
+
";"
)));
assertThat
(
code
,
not
(
containsString
(
i
ndent
(
3
)
+
";"
)));
}
}
jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java
浏览文件 @
95795620
...
...
@@ -43,7 +43,7 @@ public class TestVariablesDefinitions extends InternalJadxTest {
System
.
out
.
println
(
code
);
// 'iterator' variable must be declared inside 'try' block
assertThat
(
code
,
containsString
(
makeI
ndent
(
3
)
+
"Iterator<IDexTreeVisitor> iterator = "
));
assertThat
(
code
,
containsString
(
i
ndent
(
3
)
+
"Iterator<IDexTreeVisitor> iterator = "
));
assertThat
(
code
,
not
(
containsString
(
"iterator;"
)));
}
}
jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java
浏览文件 @
95795620
...
...
@@ -44,8 +44,8 @@ public class TestAnonymousClass3 extends InternalJadxTest {
String
code
=
cls
.
getCode
().
toString
();
System
.
out
.
println
(
code
);
assertThat
(
code
,
containsString
(
makeI
ndent
(
4
)
+
"public void run() {"
));
assertThat
(
code
,
containsString
(
makeI
ndent
(
3
)
+
"}.start();"
));
assertThat
(
code
,
containsString
(
i
ndent
(
4
)
+
"public void run() {"
));
assertThat
(
code
,
containsString
(
i
ndent
(
3
)
+
"}.start();"
));
// assertThat(code, not(containsString("synthetic")));
// assertThat(code, not(containsString("AnonymousClass_")));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录