Importing

parser/src/ast.rs

@@ -47,7 +47,7 @@ pub enum BinaryOp {
 
 #[derive(Debug, Clone, Serialize)]
 pub enum TopLevel {
-    Import(String),
+    Include(StaticPath),
     StructDecl {
         export: bool,
         name: String,

parser/src/grammar.pest

@@ -12,15 +12,16 @@ string_lit  =  { "\"" ~ inner_str ~ "\"" }
 inner_str   = @{ (!"\"" ~ ANY)* }
 static_path =  { identifier ~ ("::" ~ identifier)* }
 
-export   = { "public" }
+export   =  { "public" }
-mutable  = { "mut" }
+mutable  =  { "mut" }
-var_decl = { type_expr ~ mutable? ~ identifier }
+sharp    = _{ "#" }
+var_decl =  { type_expr ~ mutable? ~ identifier }
 
 // ================= TOP LEVEL =================
 
 top_level = _{ import | function_decl | struct_decl }
 
-import = { "import" ~ string_lit ~ ";" }
+import = { sharp ~ "include" ~ "<" ~ static_path ~ ">" }
 
 field_list = { field ~ ("," ~ field)* ~ ","? }
 field      = { export? ~ type_expr ~ identifier }

parser/src/lib.rs

@@ -123,10 +123,10 @@ impl TryFrom<pest::iterators::Pair<'_, Rule>> for TopLevel {
     type Error = ();
     fn try_from(pair: pest::iterators::Pair<Rule>) -> Result<Self, ()> {
         match pair.as_rule() {
-            Rule::import => {
+            Rule::import => Ok(TopLevel::Include(StaticPath::from(
-                let path = pair.into_inner().next().unwrap().as_str().to_string();
+                pair.into_inner().next().unwrap(),
-                Ok(TopLevel::Import(path))
+            ))),
-            }
+
             Rule::function_decl => {
                 let mut inner = pair.into_inner();
 

src/codegen.rs

@@ -195,9 +195,8 @@ impl ToRust for Block {
 impl ToRust for TopLevel {
     fn to_rust(&self, cg: &mut RustCodegen) {
         match self {
-            TopLevel::Import(path) => {
+            TopLevel::Include(path) => {
-                let path = path.replace('"', "");
+                cg.addln(&format!("use {};", path.get_rust()));
-                cg.addln(&format!("use {};", path));
             }
 
             TopLevel::StructDecl {