Skip to content

Commit 3284c59

Browse files
committed
Fix lua version
1 parent 728a6fd commit 3284c59

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

crates/emmylua_parser/src/kind/lua_language_level.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use core::fmt;
22

3-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3+
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
44
pub enum LuaLanguageLevel {
55
Lua51,
6+
LuaJIT,
67
Lua52,
78
Lua53,
89
Lua54,
9-
LuaJIT,
1010
Lua55,
1111
}
1212

crates/emmylua_parser/src/lexer/lexer_config.rs

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@ pub struct LexerConfig {
77

88
impl LexerConfig {
99
pub fn support_goto(&self) -> bool {
10-
matches!(
11-
self.language_level,
12-
LuaLanguageLevel::Lua52
13-
| LuaLanguageLevel::Lua53
14-
| LuaLanguageLevel::Lua54
15-
| LuaLanguageLevel::LuaJIT
16-
)
10+
self.language_level >= LuaLanguageLevel::Lua52
11+
|| self.language_level == LuaLanguageLevel::LuaJIT
1712
}
1813

1914
pub fn support_complex_number(&self) -> bool {
@@ -29,24 +24,16 @@ impl LexerConfig {
2924
}
3025

3126
pub fn support_integer_operation(&self) -> bool {
32-
matches!(
33-
self.language_level,
34-
LuaLanguageLevel::Lua53 | LuaLanguageLevel::Lua54
35-
)
27+
self.language_level >= LuaLanguageLevel::Lua53
3628
}
3729

3830
pub fn support_pow_operator(&self) -> bool {
39-
matches!(
40-
self.language_level,
41-
LuaLanguageLevel::Lua52
42-
| LuaLanguageLevel::Lua53
43-
| LuaLanguageLevel::Lua54
44-
| LuaLanguageLevel::LuaJIT
45-
)
31+
self.language_level >= LuaLanguageLevel::Lua52
32+
|| self.language_level == LuaLanguageLevel::LuaJIT
4633
}
4734

4835
pub fn support_global_decl(&self) -> bool {
49-
matches!(self.language_level, LuaLanguageLevel::Lua55)
36+
self.language_level >= LuaLanguageLevel::Lua55
5037
}
5138
}
5239

crates/emmylua_parser/src/parser/parser_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl<'cache> ParserConfig<'cache> {
3232
}
3333

3434
pub fn support_local_attrib(&self) -> bool {
35-
self.level == LuaLanguageLevel::Lua54
35+
self.level >= LuaLanguageLevel::Lua54
3636
}
3737

3838
pub fn node_cache(&mut self) -> Option<&mut NodeCache> {

0 commit comments

Comments
 (0)