From 3368a8c3f5bb410ce662eacba8b09a375c37307f Mon Sep 17 00:00:00 2001
From: Matthew Cowan <mpc2145@hotmail.com>
Date: Wed, 12 Dec 2012 20:48:53 -0500
Subject: Assign went back to expr * expr

---
 ast.ml     | 2 +-
 parser.mly | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ast.ml b/ast.ml
index fd758a23b1a88ed2824859c4eae084649fa322f1..aad69298c88d43134452e066bcee49f8b934c0cf 100644
--- a/ast.ml
+++ b/ast.ml
@@ -18,7 +18,7 @@ type expr = (* Expressions *)
     | BoolLiteral of bool (* true *)
     | DurConst of string (*mn whole, half, ... *)
     (*| ElemOp of string * expr (*a[5]*)*)
-    | Assign of string * expr (* x = y *)
+    | Assign of expr * expr (* x = y *)
     (*| TypeAssign of string * expr  (* Note a = .... *)*)
     | NoteExpr of string * int * expr (*mn x = (A#, 5>octave>-5, 4 + 1 ) *)
     | ChordExpr of expr list * expr (* chord =  *)
diff --git a/parser.mly b/parser.mly
index 74e4064f3d16c5a2dedf0873217c26cad67efc4d..fd4eb531ef2b56b2f5c576c7866d891349da62fd 100644
--- a/parser.mly
+++ b/parser.mly
@@ -163,7 +163,7 @@ expr:
 	| LEFTPAREN LBRAC generic_list RBRAC COMMA duration_expr RIGHTPAREN   { ChordExpr($3, $6) }
 	| LBRAC generic_list RBRAC { ListExpr($2) }
 	/* | generic_list COMMA ID TIMES INTLITERAL { BinOp(Id($1), IDTimes, IntLiteral($3))}   a, b, c*5, b  */
-    | ID ASSIGN expr 		{ Assign($1, $3) }									/* x = y 		*/
+    | expr ASSIGN expr 		{ Assign($1, $3) }									/* x = y 		*/
     | expr PLUSEQ expr { Assign($1, BinOp($1, Add, $3)) }				/* x += y		*/
 	| expr MINUSEQ expr { Assign($1, BinOp($1, Sub, $3)) }				/* x -= y		*/
 	| expr TIMESEQ expr { Assign($1, BinOp($1, Mult, $3)) }				/* x *= y		*/
-- 
1.8.0.msysgit.0

