parsing new use and namespace syntax

Author: kiahjh

cool_app/lib/math.lv

@@ -1,5 +1,3 @@
-use foo/bar/baz#(lorem as lorem)
-
 -- Adds two integers
 add :: fun (~x: Int, to y: Int) -> Int: x + y
 

cool_app/main.lv

@@ -1,4 +1,4 @@
 use lib/math
 use num#(get_three, get_four)
 
-main :: fun () -> Int: math#add(2, to: get_three())
+main :: fun () -> Int: math#add(math#pi, to: get_three())

discussion.md

@@ -7,3 +7,7 @@ pub fn error(text: &str) {
 pub fn success(text: &str) {
     println!("{}", text.green());
 }
+
+pub fn info(text: &str) {
+    println!("{text}");
+}

for_the_website.md

@@ -304,7 +304,7 @@ impl Checker {
                     type_hint,
                 )
             }
-            ExpressionKind::Ident(name) => {
+            ExpressionKind::Ident { name, .. } => {
                 if let Some((var_id, var_type)) = self.lookup_variable(name, self.cur_scope) {
                     Self::typed_expression(
                         CheckedExpressionData::Ident {
@@ -395,7 +395,9 @@ impl Checker {
                     type_hint,
                 )
             }
-            ExpressionKind::FunctionCall { name, arguments } => {
+            ExpressionKind::FunctionCall {
+                name, arguments, ..
+            } => {
                 let mut args = vec![];
 
                 for arg in arguments {

next_up.md

@@ -35,7 +35,6 @@ impl<'src> Lexer<'src> {
         match cur_char {
             '/' => self.make_single_char_token(cur_index, Slash),
             '.' => self.make_single_char_token(cur_index, Dot),
-            ' ' => self.make_single_char_token(cur_index, NamespaceAccess),
             '+' => self.make_single_char_token(cur_index, Plus),
             '-' => {
                 self.next();
@@ -61,6 +60,7 @@ impl<'src> Lexer<'src> {
                     Token::new(Minus, cur_index, 1)
                 }
             }
+            '#' => self.make_single_char_token(cur_index, Hash),
             '*' => self.make_single_char_token(cur_index, Asterisk),
             '&' => self.make_single_char_token(cur_index, BitAnd),
             '|' => self.make_single_char_token(cur_index, BitOr),
@@ -124,6 +124,7 @@ impl<'src> Lexer<'src> {
                 let ident = self.read_ident(cur_index);
                 match ident {
                     "fun" => Token::new(Fun, cur_index, 3),
+                    "use" => Token::new(Use, cur_index, 3),
                     "take" => Token::new(Take, cur_index, 4),
                     "mut" => Token::new(Mut, cur_index, 3),
                     "read" => Token::new(Read, cur_index, 4),

src/blossom/printer.rs

@@ -5,6 +5,8 @@ use std::fmt::Display;
 pub enum TokenKind {
     // keywords:
     Fun,    // fun
+    Use,    // use
+    As,     // as
     Take,   // take
     Mut,    // mut
     Read,   // read
@@ -18,18 +20,18 @@ pub enum TokenKind {
     False,  // false
 
     // syntax
-    LParen,          // (
-    RParen,          // )
-    LBrace,          // {
-    RBrace,          // }
-    Colon,           // :
-    Comma,           // ,
-    Tilde,           // ~
-    SingleEqual,     // =
-    RArrow,          // ->
-    Slash,           // /
-    Dot,             // .
-    NamespaceAccess, // #
+    LParen,      // (
+    RParen,      // )
+    LBrace,      // {
+    RBrace,      // }
+    Colon,       // :
+    Comma,       // ,
+    Tilde,       // ~
+    SingleEqual, // =
+    RArrow,      // ->
+    Slash,       // /
+    Dot,         // .
+    Hash,        // #
 
     // operators:
     ExclamationMark,    // !
@@ -58,6 +60,8 @@ impl Display for TokenKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let str = match self {
             Self::Fun => "fun",
+            Self::Use => "use",
+            Self::As => "as",
             Self::Take => "take",
             Self::Mut => "mut",
             Self::Read => "read",
@@ -80,7 +84,7 @@ impl Display for TokenKind {
             Self::SingleEqual => "=",
             Self::Slash => "/",
             Self::Dot => ".",
-            Self::NamespaceAccess => "#",
+            Self::Hash => "#",
             Self::ExclamationMark => "!",
             Self::Plus => "+",
             Self::Minus => "-",

src/checker/mod.rs

@@ -18,7 +18,10 @@ impl Expression {
 pub enum ExpressionKind {
     BoolLiteral(bool),
     IntLiteral(isize),
-    Ident(String),
+    Ident {
+        name: String,
+        namespace: Option<String>,
+    },
     Block(Vec<Expression>),
     Prefix {
         operator: PrefixOperator,
@@ -42,6 +45,7 @@ pub enum ExpressionKind {
     },
     FunctionCall {
         name: String,
+        namespace: Option<String>,
         arguments: Vec<FunctionArgument>,
     },
     Use {
@@ -70,7 +74,7 @@ impl ExpressionKind {
             Infix { left, right, .. } => left.kind.is_const() && right.kind.is_const(),
             VariableDecl { value, mutable, .. } => !mutable && value.kind.is_const(),
             FunctionCall { .. } => false,
-            BoolLiteral(_) | IntLiteral(_) | Ident(_) | Function { .. } | Use { .. } => true,
+            BoolLiteral(_) | IntLiteral(_) | Ident { .. } | Function { .. } | Use { .. } => true,
         }
     }
 }