v0.2.1

Author: Champii

.github/templates/README.md

@@ -82,15 +82,9 @@ mkdir -P factorial/src && cd factorial
 
 Add some files like this:
 
-- Copy all the stdlib files from [std/src/\*.rk](https://github.com/Champii/Rock/blob/master/std/src) into `factorial/src/`
-
 - Create a `factorial/src/main.rk` file:
 
 ```haskell
-mod lib
-
-use lib::prelude::(*)
-
 fact a =
     if a <= 1
     then 1
@@ -121,10 +115,6 @@ Note that you currently must be at the project root to run the compiler. (i.e. i
 
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 id a = a
 
 main =
@@ -148,10 +138,6 @@ Test
 ### Custom infix operator
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 infix |> 1
 |> x f = f x
 
@@ -171,10 +157,6 @@ Prints `6`
 This `trait ToString` is redondant with the `trait Show` implemented in the lib, and serves as a demonstration only
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 trait ToString a
   toString :: a -> String
 
@@ -204,10 +186,6 @@ Prints
 ### Struct instance and Show implementation
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 struct Player
   level :: Int64
   name :: String

.github/version

@@ -1 +1 @@
-v0.2.0
+v0.2.1

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rock"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["champii <contact@champii>"]
 edition = "2018"
 

Cargo.toml

@@ -1,4 +1,4 @@
-# Rock v0.2.0
+# Rock v0.2.1
 
 [![Rust](https://github.com/Champii/Rock/actions/workflows/rust.yml/badge.svg?branch=master)](https://github.com/Champii/Rock/actions/workflows/rust.yml)
 
@@ -45,10 +45,10 @@ You will need `clang` somewhere in your $PATH
 
 Linux x86_64 only
 
-[Rock v0.2.0](https://github.com/Champii/Rock/releases/download/v0.2.0/rock) (Tested on arch, btw)
+[Rock v0.2.1](https://github.com/Champii/Rock/releases/download/v0.2.1/rock) (Tested on arch, btw)
 
 ``` sh
-wget https://github.com/Champii/Rock/releases/download/v0.2.0/rock
+wget https://github.com/Champii/Rock/releases/download/v0.2.1/rock
 chmod +x rock
 ./rock -V
 ```
@@ -82,15 +82,9 @@ mkdir -P factorial/src && cd factorial
 
 Add some files like this:
 
-- Copy all the stdlib files from [std/src/\*.rk](https://github.com/Champii/Rock/blob/master/std/src) into `factorial/src/`
-
 - Create a `factorial/src/main.rk` file:
 
 ```haskell
-mod lib
-
-use lib::prelude::(*)
-
 fact a =
     if a <= 1
     then 1
@@ -121,10 +115,6 @@ Note that you currently must be at the project root to run the compiler. (i.e. i
 
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 id a = a
 
 main =
@@ -148,10 +138,6 @@ Test
 ### Custom infix operator
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 infix |> 1
 |> x f = f x
 
@@ -171,10 +157,6 @@ Prints `6`
 This `trait ToString` is redondant with the `trait Show` implemented in the lib, and serves as a demonstration only
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 trait ToString a
   toString :: a -> String
 
@@ -204,10 +186,6 @@ Prints
 ### Struct instance and Show implementation
 
 ``` haskell
-mod lib
-
-use lib::prelude::(*)
-
 struct Player
   level :: Int64
   name :: String
@@ -250,7 +228,7 @@ rock --repl
 ```
 
 ``` sh
-Rock: v0.2.0
+Rock: v0.2.1
 ----
 
 Type ':?' for help

README.md

@@ -141,6 +141,12 @@ fn main() {
                 .takes_value(false)
                 .help("Show the InferContext state before solve (DEPRECATED)"),
         )
+        .arg(
+            Arg::with_name("nostd")
+                .long("nostd")
+                .takes_value(false)
+                .help("Does not include stdlib"),
+        )
         .arg(
             Arg::with_name("output-folder")
                 .short("o")
@@ -163,6 +169,7 @@ fn main() {
         repl: matches.is_present("repl"),
         no_optimize: matches.is_present("no-optimize"),
         build_folder: PathBuf::from(matches.value_of("output-folder").unwrap()),
+        std: !matches.is_present("nostd"),
         ..Default::default()
     };
 

src/bin/main.rs

@@ -1,11 +1,13 @@
 use std::fmt::Debug;
 
-use crate::ast::tree::*;
-use crate::ast::visit::*;
-use crate::helpers::*;
-use crate::ty::*;
 use paste::paste;
 
+use crate::{
+    ast::{tree::*, visit::*},
+    helpers::*,
+    ty::*,
+};
+
 pub struct AstPrintContext {
     indent: usize,
 }
@@ -83,7 +85,6 @@ macro_rules! impl_visitor_trait {
 
 impl_visitor_trait!(
     Root
-    // Mod
     TopLevel
     StructDecl
     Use
@@ -92,7 +93,6 @@ impl_visitor_trait!(
     Impl
     FunctionDecl
     Identifier
-    // ArgumentDecl
     Body
     Statement
     For

src/lib/ast/ast_print.rs

@@ -4,33 +4,20 @@ pub struct ReturnInserter<'a> {
     pub body: &'a Body,
 }
 
+// TODO: Implement `Visitor` trait for `ReturnInserter`
 impl<'a> ReturnInserter<'a> {
     pub fn run(&mut self) -> Body {
         let mut body = self.body.clone();
 
         self.visit_body(&mut body);
 
-        body.clone()
+        body
     }
 
     fn visit_body(&mut self, body: &mut Body) {
-        // let mut is_assign = None;
-
         if let Some(stmt) = body.stmts.iter_mut().last() {
-            // if let StatementKind::Assign(ref mut a) = *stmt.kind.clone() {
-            //     is_assign = Some(a.clone());
-            // }
-
             self.visit_statement(stmt);
         }
-
-        // if let Some(a) = is_assign {
-        //     body.stmts.push(Statement {
-        //         kind: Box::new(StatementKind::Expression(Box::new(Expression {
-        //             kind: ExpressionKind::Return(Box::new(a.name.as_expression())),
-        //         }))),
-        //     });
-        // }
     }
 
     fn visit_statement(&mut self, stmt: &mut Statement) {

src/lib/ast/return_placement.rs

@@ -379,16 +379,6 @@ pub enum AssignLeftSide {
     Dot(Expression),
 }
 
-impl AssignLeftSide {
-    pub fn as_expression(&self) -> Expression {
-        match self {
-            AssignLeftSide::Identifier(i) => i.clone(),
-            AssignLeftSide::Indice(i) => i.clone(),
-            AssignLeftSide::Dot(d) => d.clone(),
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct Assign {
     pub name: AssignLeftSide,
@@ -516,7 +506,8 @@ pub enum Expression {
 #[derive(Debug, Clone)]
 pub enum UnaryExpr {
     PrimaryExpr(PrimaryExpr),
-    UnaryExpr(Operator, Box<UnaryExpr>),
+    #[allow(dead_code)]
+    UnaryExpr(Operator, Box<UnaryExpr>), // Parser for that is not implemented yet
 }
 
 impl UnaryExpr {
@@ -603,14 +594,6 @@ impl PrimaryExpr {
         }
     }
 
-    pub fn new_empty(op: Operand) -> PrimaryExpr {
-        PrimaryExpr {
-            op,
-            node_id: u64::MAX,
-            secondaries: None,
-        }
-    }
-
     pub fn new(node_id: NodeId, op: Operand, secondaries: Vec<SecondaryExpr>) -> PrimaryExpr {
         PrimaryExpr {
             op,
@@ -699,6 +682,8 @@ impl SecondaryExpr {
         matches!(self, SecondaryExpr::Dot(_))
     }
 
+    // might be useful
+    #[allow(dead_code)]
     pub fn is_arguments(&self) -> bool {
         matches!(self, SecondaryExpr::Arguments(_))
     }

src/lib/ast/tree.rs

@@ -40,7 +40,6 @@ generate_visitor_trait!(
     StructDecl
     Identifier
     IdentifierPath
-    // ArgumentDecl
     Body
     Statement
     For
@@ -138,10 +137,6 @@ pub fn walk_identifier<'a, V: Visitor<'a>>(visitor: &mut V, identifier: &'a Iden
     visitor.visit_name(&identifier.name);
 }
 
-/* pub fn walk_argument_decl<'a, V: Visitor<'a>>(visitor: &mut V, argument: &'a ArgumentDecl) {
-    visitor.visit_name(&argument.name);
-} */
-
 pub fn walk_body<'a, V: Visitor<'a>>(visitor: &mut V, body: &'a Body) {
     walk_list!(visitor, visit_statement, &body.stmts);
 }

src/lib/ast/visit.rs

@@ -94,7 +94,6 @@ impl AstLoweringContext {
 
     pub fn lower_struct_decl(&mut self, s: &StructDecl) -> hir::StructDecl {
         let hir_t = hir::StructDecl {
-            // hir_id: self.hir_map.next_hir_id(s.name.node_id),
             name: self.lower_identifier(&s.name),
             defs: s
                 .defs
@@ -327,7 +326,6 @@ impl AstLoweringContext {
 
     pub fn lower_struct_ctor(&mut self, s: &StructCtor) -> hir::Expression {
         hir::Expression::new_struct_ctor(hir::StructCtor {
-            // hir_id: self.hir_map.next_hir_id(s.node_id),
             name: self.lower_identifier(&s.name),
             defs: s
                 .defs

src/lib/ast_lowering/ast_lowering_context.rs

@@ -53,10 +53,6 @@ impl HirMap {
     pub fn duplicate_hir_mapping(&mut self, hir_id: HirId) -> Option<HirId> {
         let node_id = self.get_node_id(&hir_id)?;
 
-        /* let mut fake_ident = Identity::new_placeholder();
-
-        fake_ident.node_id = node_id; */
-
         let new_id = self.next_hir_id(node_id);
 
         self.add_hir_mapping(new_id.clone(), node_id);