From 9afbd2305fffc553ba850e66882c21b44b9789da Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Sat, 14 Oct 2017 13:54:17 -0700
Subject: [PATCH] Literal non-primitive values

---
 src/schala_lang/eval.rs       |  2 +-
 src/schala_lang/parsing.rs    | 36 +++++++++++++++++++++++------------
 src/schala_lang/type_check.rs |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/schala_lang/eval.rs b/src/schala_lang/eval.rs
index ef25550..776d820 100644
--- a/src/schala_lang/eval.rs
+++ b/src/schala_lang/eval.rs
@@ -111,7 +111,7 @@ impl ReplState {
       BoolLiteral(b) => Ok(Bool(b)),
       PrefixExp(op, expr) => self.eval_prefix_exp(op, expr),
       BinExp(op, lhs, rhs) => self.eval_binexp(op, lhs, rhs),
-      Value(name) => self.eval_value(name),
+      Value(name, _) => self.eval_value(name),
       _ => Err(format!("Unimplemented")),
     }
   }
diff --git a/src/schala_lang/parsing.rs b/src/schala_lang/parsing.rs
index 465a284..6019771 100644
--- a/src/schala_lang/parsing.rs
+++ b/src/schala_lang/parsing.rs
@@ -297,9 +297,8 @@ identifier_expr := named_struct | call_expr | index_expr | IDENTIFIER
 literal := 'true' | 'false' | number_literal | STR_LITERAL
 
 named_struct := IDENTIFIER record_block
-record_block :=  '{' record_entry* | '}' //TODO support anonymus structs, update syntax
-
-record_entry := IDENTIFIER ':' expression ','+
+record_block :=  '{' (record_entry, ',')* | '}' //TODO support anonymus structs, update syntax
+record_entry := IDENTIFIER ':' expression
 
 if_expr := 'if' expression block else_clause
 else_clause := ε | 'else' block
@@ -447,7 +446,7 @@ pub enum ExpressionType {
   BinExp(Operation, Box<Expression>, Box<Expression>),
   PrefixExp(Operation, Box<Expression>),
   TupleLiteral(Vec<Expression>),
-  Value(Rc<String>),
+  Value(Rc<String>, Vec<(Rc<String>, Expression)>),
   Call {
     f: Box<Expression>,
     arguments: Vec<Expression>,
@@ -815,26 +814,37 @@ impl Parser {
     let identifier = self.identifier()?;
     Ok(match self.peek() {
       LCurlyBrace => {
-        self.named_struct()?;
-
+        let fields = self.record_block()?;
+        Expression(Value(identifier, fields), None)
       },
       LParen => {
         let arguments = self.call_expr()?;
         //TODO make this be more general
-        let f = Box::new(Expression(Value(identifier), None));
+        let f = Box::new(Expression(Value(identifier, vec![]), None));
         Expression(Call { f, arguments }, None)
       },
       LSquareBracket => {
         let indexers = self.index_expr()?;
         Expression(Index {
-          indexee: Box::new(Expression(Value(identifier), None)),
+          indexee: Box::new(Expression(Value(identifier, vec![]), None)),
           indexers,
         }, None)
       }
-      _ => Expression(Value(identifier), None)
+      _ => Expression(Value(identifier, vec![]), None)
     })
   });
 
+  parse_method!(record_block(&mut self) -> ParseResult<Vec<(Rc<String>, Expression)>> {
+    Ok(delimited!(self, LCurlyBrace, '{', record_entry, Comma, RCurlyBrace, '}'))
+  });
+
+  parse_method!(record_entry(&mut self) -> ParseResult<(Rc<String>, Expression)> {
+    let field_name = self.identifier()?;
+    expect!(self, Colon, ":");
+    let value = self.expression()?;
+    Ok((field_name, value))
+  });
+
   parse_method!(call_expr(&mut self) -> ParseResult<Vec<Expression>> {
     Ok(delimited!(self, LParen, ')', expression, Comma, RParen, '('))
   });
@@ -1031,7 +1041,7 @@ mod parse_tests {
     ($op:expr) => { Operation(Rc::new($op.to_string())) }
   }
   macro_rules! val {
-    ($var:expr) => { Value(Rc::new($var.to_string())) }
+    ($var:expr) => { Value(Rc::new($var.to_string()), vec![]) }
   }
   macro_rules! exprstatement {
     ($expr_type:expr) => { Statement::ExpressionStatement(Expression($expr_type, None)) };
@@ -1100,6 +1110,8 @@ mod parse_tests {
     parse_test!("a[b,c]", AST(vec![exprstatement!(Index { indexee: Box::new(ex!(val!("a"))), indexers: vec![ex!(val!("b")), ex!(val!("c"))]} )]));     
 
     parse_test!("None", AST(vec![exprstatement!(val!("None"))]));
+    parse_test!("Pandas {  a: x + y }", AST(vec![
+      exprstatement!(Value(rc!(Pandas), vec![(rc!(a), ex!(binexp!("+", val!("x"), val!("y"))))]))]));
   }
 
   #[test]
@@ -1190,8 +1202,8 @@ mod parse_tests {
     }"#,
     AST(vec![exprstatement!(IfExpression(Box::new(ex!(BoolLiteral(true))),
       vec![Declaration(Binding { name: rc!(a), constant: true, expr: ex!(IntLiteral(10)) }),
-           exprstatement!(Value(rc!(b)))],
-      Some(vec![exprstatement!(Value(rc!(c)))])))])
+           exprstatement!(Value(rc!(b), vec![]))],
+      Some(vec![exprstatement!(Value(rc!(c), vec![]))])))])
     );
   }
 
diff --git a/src/schala_lang/type_check.rs b/src/schala_lang/type_check.rs
index efb73a1..caf15e7 100644
--- a/src/schala_lang/type_check.rs
+++ b/src/schala_lang/type_check.rs
@@ -233,7 +233,7 @@ impl TypeContext {
       &FloatLiteral(_) => TConst(Float),
       &StringLiteral(_) => TConst(StringT),
       &BoolLiteral(_) => TConst(Boolean),
-      &Value(ref name) => {
+      &Value(ref name, _) => {
         self.lookup(name)
           .map(|entry| entry.ty)
           .ok_or(format!("Couldn't find {}", name))?