kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Rename sub-scope/SubScope to module.

Browse Source
This commit is contained in:
Stephen Chung
2020-05-05 10:39:12 +08:00
parent 64036f69ca
commit 143861747d
10 changed files with 162 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/token.rs
View File

@@ -153,7 +153,7 @@ pub enum Token {
RightShift,
SemiColon,
Colon,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
DoubleColon,
Comma,
Period,
@@ -199,11 +199,11 @@ pub enum Token {
XOrAssign,
ModuloAssign,
PowerOfAssign,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
Import,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
Export,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
As,
LexError(Box<LexError>),
EOF,
@@ -238,7 +238,7 @@ impl Token {
Divide => "/",
SemiColon => ";",
Colon => ":",
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
DoubleColon => "::",
Comma => ",",
Period => ".",
@@ -288,11 +288,11 @@ impl Token {
ModuloAssign => "%=",
PowerOf => "~",
PowerOfAssign => "~=",
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
Import => "import",
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
Export => "export",
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
As => "as",
EOF => "{EOF}",
_ => panic!("operator should be match in outer scope"),
@@ -763,11 +763,11 @@ impl<'a> TokenIterator<'a> {
"for" => Token::For,
"in" => Token::In,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
"import" => Token::Import,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
"export" => Token::Export,
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
"as" => Token::As,
#[cfg(not(feature = "no_function"))]
@@ -924,7 +924,7 @@ impl<'a> TokenIterator<'a> {
}
('=', _) => return Some((Token::Equals, pos)),
#[cfg(not(feature = "no_import"))]
#[cfg(not(feature = "no_module"))]
(':', ':') => {
self.eat_next();
return Some((Token::DoubleColon, pos));