Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Phodal
scie
提交
9fda0e8b
S
scie
项目概览
Phodal
/
scie
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
scie
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
9fda0e8b
编写于
9月 07, 2020
作者:
P
Phodal Huang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: fix lint issues
上级
42f2e38c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
17 deletion
+17
-17
scie-grammar/src/grammar/grammar.rs
scie-grammar/src/grammar/grammar.rs
+2
-3
scie-grammar/src/grammar/stack_element.rs
scie-grammar/src/grammar/stack_element.rs
+1
-3
scie-grammar/src/rule/mod.rs
scie-grammar/src/rule/mod.rs
+2
-4
scie-grammar/src/rule/reg_exp_source.rs
scie-grammar/src/rule/reg_exp_source.rs
+1
-1
scie-scanner/src/scanner/scanner.rs
scie-scanner/src/scanner/scanner.rs
+11
-6
未找到文件。
scie-grammar/src/grammar/grammar.rs
浏览文件 @
9fda0e8b
...
...
@@ -545,7 +545,8 @@ impl Grammar {
)
{
let
match_result
=
self
.match_rule
(
line_text
,
is_first_line
,
line_pos
,
stack
,
anchor_position
);
if
let
Some
(
_
result
)
=
match_result
{}
else
{
if
let
Some
(
_
result
)
=
match_result
{
}
else
{
// None
};
// todo: get injections logic
...
...
@@ -762,7 +763,6 @@ hellomake: $(OBJ)
debug_output
(
&
grammar
,
String
::
from
(
"program.json"
));
}
#[test]
fn
should_resolve_make_file_error_issues2
()
{
let
code
=
"hellomake: $(OBJ)
...
...
@@ -800,5 +800,4 @@ hellomake: $(OBJ)
}
grammar
}
}
scie-grammar/src/grammar/stack_element.rs
浏览文件 @
9fda0e8b
...
...
@@ -111,7 +111,5 @@ impl StackElement {
return
self
;
}
pub
fn
reset
(
&
mut
self
)
{
}
pub
fn
reset
(
&
mut
self
)
{}
}
scie-grammar/src/rule/mod.rs
浏览文件 @
9fda0e8b
...
...
@@ -46,7 +46,5 @@ pub trait IRuleFactoryHelper: IGrammarRegistry + IRuleRegistry {}
#[cfg(test)]
mod
tests
{
#[test]
fn
should_build_json_code
()
{
}
}
\ No newline at end of file
fn
should_build_json_code
()
{}
}
scie-grammar/src/rule/reg_exp_source.rs
浏览文件 @
9fda0e8b
...
...
@@ -76,7 +76,7 @@ impl RegExpSourceList {
let
compiled_rule
=
CompiledRule
::
new
(
reg_exps
,
rules
);
self
._cached
=
Some
(
compiled_rule
.clone
());
};
return
self
._cached
.clone
()
.unwrap
()
return
self
._cached
.clone
()
.unwrap
()
;
}
else
{
println!
(
"// todo: cached {:?}"
,
self
._items
);
}
...
...
scie-scanner/src/scanner/scanner.rs
浏览文件 @
9fda0e8b
...
...
@@ -120,7 +120,7 @@ where
#[cfg(test)]
mod
tests
{
use
crate
::
scanner
::
scanner
::{
str_vec_to_string
,
IOnigMatch
,
Scanner
};
use
crate
::
scanner
::
scanner
::{
str_vec_to_string
,
Scanner
};
#[test]
fn
should_handle_simple_regex
()
{
...
...
@@ -320,7 +320,7 @@ mod tests {
"^(ifdef|ifndef)
\\
s*([^
\\
s]+)(?=
\\
s)"
,
"^(ifeq|ifneq)(?=
\\
s)]"
,
];
let
rules
=
vec!
[
2
,
7
,
28
,
45
,
48
,
51
,
61
,
64
,
66
,
69
,
77
];
let
_
rules
=
vec!
[
2
,
7
,
28
,
45
,
48
,
51
,
61
,
64
,
66
,
69
,
77
];
let
debug_regex
=
str_vec_to_string
(
origin
);
let
mut
scanner
=
Scanner
::
new
(
debug_regex
);
let
result
=
scanner
.find_next_match_sync
(
String
::
from
(
"%.o: %.c $(DEPS)"
),
0
);
...
...
@@ -330,7 +330,7 @@ mod tests {
#[test]
fn
should_match_makefile_special_char
()
{
let
origin
=
vec!
[
"(?=
\\
s|$)"
,
"(
\\
$?
\\
$)[@%<?^+*]"
,
"
\\
$?
\\
$
\\
("
,
"%"
];
let
rules
=
vec!
[
-
1
,
12
,
14
,
33
];
let
_
rules
=
vec!
[
-
1
,
12
,
14
,
33
];
let
debug_regex
=
str_vec_to_string
(
origin
);
let
mut
scanner
=
Scanner
::
new
(
debug_regex
);
let
result
=
scanner
.find_next_match_sync
(
String
::
from
(
"%.o"
),
0
);
...
...
@@ -343,11 +343,16 @@ mod tests {
#[test]
fn
should_match_for_scope_target
()
{
let
origin
=
vec!
[
"^(?!
\\
t)"
,
"
\\
G"
,
"^
\\
t"
];
let
rules
=
vec!
[
-
1
,
36
,
39
];
let
_
rules
=
vec!
[
-
1
,
36
,
39
];
let
debug_regex
=
str_vec_to_string
(
origin
);
let
mut
scanner
=
Scanner
::
new
(
debug_regex
);
let
result
=
scanner
.find_next_match_sync
(
String
::
from
(
"%.o: %.c $(DEPS)
"
),
4
);
let
result
=
scanner
.find_next_match_sync
(
String
::
from
(
"%.o: %.c $(DEPS)
"
,
),
4
,
);
let
onig_match
=
result
.unwrap
();
assert_eq!
(
1
,
onig_match
.index
);
assert_eq!
(
4
,
onig_match
.capture_indices
[
0
]
.start
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录