Change ExprKind::Function and ExprKind::Lambda to Ident. Part of #8

Author: namibj

src/ast.rs

@@ -9,7 +9,7 @@ pub struct Expr {
 }
 
 #[derive(Clone, Debug, PartialEq)]
-pub struct Ident(String);
+pub struct Ident(pub String);
 
 impl From<Ident> for String {
     fn from(ident: Ident) -> Self {
@@ -37,9 +37,9 @@ pub enum ExprKind {
     Unop(String, Box<Expr>),
     Access(Box<Expr>, Ident),
     Ident(Ident),
-    Function(Option<String>, Vec<String>, Box<Expr>),
+    Function(Option<Ident>, Vec<Ident>, Box<Expr>),
     Class(String, Box<Expr>, Option<Box<Expr>>),
-    Lambda(Vec<String>, Box<Expr>),
+    Lambda(Vec<Ident>, Box<Expr>),
     Match(Box<Expr>, Vec<(Box<Expr>, Box<Expr>)>, Option<Box<Expr>>),
     If(Box<Expr>, Box<Expr>, Option<Box<Expr>>),
     ConstInt(i64),

src/codegen.rs

@@ -654,9 +654,9 @@ impl Context {
 
     pub fn compile_function(
         &mut self,
-        params: &[String],
+        params: &[Ident],
         e: &Box<Expr>,
-        vname: Option<String>,
+        vname: Option<Ident>,
     ) -> u32 {
         let mut ctx = Context {
             g: self.g.clone(),
@@ -681,15 +681,15 @@ impl Context {
             ctx.stack += 1;
             let r = ctx.new_reg();
             ctx.write(Instruction::Pop(r));
-            ctx.locals.insert(p.to_owned(), r as _);
+            ctx.locals.insert(String::from(p.to_owned()), r as _);
         }
 
         let gid = ctx.g.borrow().table.len();
         if vname.is_some() {
-            ctx.g
-                .borrow_mut()
-                .globals
-                .insert(Global::Var(vname.as_ref().unwrap().to_owned()), gid as i32);
+            ctx.g.borrow_mut().globals.insert(
+                Global::Var(String::from(vname.as_ref().unwrap().to_owned())),
+                gid as i32,
+            );
         }
         ctx.g.borrow_mut().table.push(Global::Func(gid as i32, -1));
         let r = ctx.compile(e, true);
@@ -704,7 +704,9 @@ impl Context {
             ctx.pos.clone(),
             gid as i32,
             params.len() as i32,
-            vname.unwrap_or(String::from("<anonymous>")),
+            vname
+                .map(String::from)
+                .unwrap_or(String::from("<anonymous>")),
         ));
 
         if ctx.nenv > 0 {

src/parser.rs

@@ -176,9 +176,9 @@ fn parse_function_param<'b>(i: Span) -> Result<String, MsgWithPos> {
 
 fn parse_function<'b>(i: Span) -> EResult {
     let fn_arg_sep = tag(",");
-    let fn_arg = expect_identifier;
+    let fn_arg = map(expect_identifier, Ident);
     let tup = tuple((
-        opt(expect_identifier),
+        opt(map(expect_identifier, Ident)),
         tag("("),
         separated_list(fn_arg_sep, fn_arg),
         tag(")"),
@@ -447,7 +447,7 @@ fn advance_token(/*&mut self*/) -> Result<Token, MsgWithPos> {
 
 fn parse_lambda<'b>(i: Span) -> EResult {
     let fn_arg_sep = tag(",");
-    let fn_arg = expect_identifier;
+    let fn_arg = map(expect_identifier, Ident);
     let tup = tuple((
         tag("|"),
         separated_list(fn_arg_sep, fn_arg),