greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Start adding import keyword

Browse Source
This commit is contained in:
greg 2019-09-20 18:19:29 -07:00
parent 06026604cc
commit 603ea89b98
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
schala-lang/language/src/parsing.rs
View File

@ -13,7 +13,7 @@
//! ```text //! ```text
//! program := (statement delimiter)* EOF //! program := (statement delimiter)* EOF
//! delimiter := NEWLINE | ";" //! delimiter := NEWLINE | ";"
//! statement := expression | declaration //! statement := expression | declaration | import
//! block := "{" (statement delimiter)* "}" //! block := "{" (statement delimiter)* "}"
//! declaration := type_declaration | func_declaration | binding_declaration | impl_declaration //! declaration := type_declaration | func_declaration | binding_declaration | impl_declaration
//! ``` //! ```
@ -141,8 +141,10 @@
//! enumerators := enumerator ("," enumerators)* //! enumerators := enumerator ("," enumerators)*
//! enumerator := identifier "<-" expression | identifier "=" expression //TODO add guards, etc. //! enumerator := identifier "<-" expression | identifier "=" expression //TODO add guards, etc.
//! ``` //! ```
//! //! ## Imports
//! ```text
//! import := 'import'
//! ```
mod test; mod test;
use std::rc::Rc; use std::rc::Rc;

3
schala-lang/language/src/tokenizing.rs
View File

@ -55,7 +55,7 @@ pub enum Kw {
Alias, Type, SelfType, SelfIdent, Alias, Type, SelfType, SelfIdent,
Interface, Impl, Interface, Impl,
True, False, True, False,
Module Module, Import
} }
lazy_static! { lazy_static! {
@ -82,6 +82,7 @@ lazy_static! {
"true" => Kw::True, "true" => Kw::True,
"false" => Kw::False, "false" => Kw::False,
"module" => Kw::Module, "module" => Kw::Module,
"import" => Kw::Import,
}; };
} }