mod decl

parser/src/ast.rs

@@ -68,6 +68,7 @@ pub struct TopLevel(pub TopLevelKind, pub Vec<Attribute>);
 pub enum TopLevelKind {
     ModAttribute,
     Import(Path),
+    Mod(String),
     StructDecl {
         visibility: Visibility,
         name: String,

parser/src/grammar.pest

@@ -37,7 +37,7 @@ class_decl = {
 
 // ================= TOP LEVEL =================
 
-top_level = { (attributes ~ (import | function_decl | struct_decl | class_decl)) | mod_attribute }
+top_level = { (attributes ~ (import | function_decl | struct_decl | class_decl | mod_package)) | mod_attribute }
 
 attribute = {
     "#" ~ "[" ~ meta ~ "]"
@@ -59,6 +59,8 @@ attributes = { attribute* }
 
 import = { "use" ~ "<" ~ static_path ~ ">" ~ semicolon }
 
+mod_package = { "mod" ~ identifier ~ semicolon }
+
 field_list = { field ~ ("," ~ field)* ~ ","? }
 field      = { export? ~ type_expr ~ identifier }
 

parser/src/lib.rs

@@ -259,6 +259,8 @@ impl From<pest::iterators::Pair<'_, Rule>> for TopLevelKind {
                 methods: inner.into_iter().map(FunctionDecl::from).collect(),
             },
 
+            Rule::mod_package => TopLevelKind::Mod(inner.next().unwrap().as_str().to_string()),
+
             _ => unimplemented!("{rule:#?}"),
         }
     }

src/codegen.rs

@@ -308,9 +308,8 @@ impl ToRust for TopLevelKind {
     fn to_rust(&self, cg: &mut RustCodegen) {
         match self {
             Self::ModAttribute => {}
-            Self::Import(path) => {
+            Self::Import(path) => cg.addln(&format!("use {};", path.get_rust())),
-                cg.addln(&format!("use {};", path.get_rust()));
+            Self::Mod(id) => cg.addln(&format!("mod {};", id)),
-            }
             Self::FunctionDecl(decl) => decl.to_rust(cg),
             Self::StructDecl {
                 visibility,

test/src/main.mist

@@ -1,14 +1,5 @@
-class MyClass {
+mod my_class;
-    String message;
+use <my_class::MyClass>;
-
-    public constructor(str* name) {
-        self.message = format!("Hello {}!", name);
-    }
-
-    public void greet(self*) {
-        println!("{}", self.message);
-    }
-}
 
 void main() {
     var my_class = new MyClass("World");