Update members of parallelAssignmentCode struct

Now contains a CodeSequence of the elements on the left hand side
instead of symbol information.  This will enable us to support other
types of code in the left hand side.

Author: d-torrance

M2/Macaulay2/d/convertr.d

@@ -57,43 +57,6 @@ makeCodeSequence(e:ParseTree,separator:Word):CodeSequence := (
      v := new CodeSequence len CodeSequenceLength(e,separator) do provide dummyCode;
      fillCodeSequence(e,v,length(v),separator);
      v);
-SymbolSequenceLength(e:ParseTree):int := (
-     i := 0;
-     while true do (
-     	  when e
-	  is p:Parentheses do e = p.contents
-     	  is b:Binary do (
-	       i = i+1;
-	       e = b.lhs;
-	       )
-	  else (					    -- should be the first token
-	       i = i+1;
-	       return i;
-	       )
-	  )
-     );
-makeSymbolSequence(e:ParseTree):SymbolSequence := (	    -- but replace local symbols by dummySymbol
-     m := SymbolSequenceLength(e);
-     v := new SymbolSequence len m do provide dummySymbol;
-     while true do (
-     	  when e
-	  is p:Parentheses do e = p.contents
-     	  is b:Binary do (
-	       when b.rhs is t:Token do (
-		    m = m-1;
-		    v.m = t.entry;
-		    )
-	       else nothing;				    -- shouldn't happen
-	       e = b.lhs;
-	       )
-	  is t:Token do (
-	       m = m-1;
-	       v.m = t.entry;
-	       break;
-	       )
-	  else break;					    -- shouldn't happen
-	  );
-     v);
 
 nestingDepth(frameID:int,d:Dictionary):int := (
      if frameID == 0 then return -1;
@@ -138,15 +101,11 @@ convertTokenAssignment(token:Token, rhs:ParseTree):Code := (
 	    nestingDepth(sym.frameID, token.dictionary), sym.frameindex, val, pos))
     );
 
-convertParallelAssignment(par:Parentheses,rhs:ParseTree,d:Dictionary):Code := (
-    syms := makeSymbolSequence(ParseTree(par)); -- silly -- rethink
+convertParallelAssignment(colon:bool, par:Parentheses, rhs:ParseTree):Code := (
+    lhs := makeCodeSequence(par.contents, CommaW);
     vals := convert(rhs);
     pos := combinePositionR(par.left.position, treePosition(rhs));
-    n := length(syms);
-    nd := new array(int) len n do foreach x in syms do provide nestingDepth(x.frameID, d); -- rethink dictionary
-    fr := new array(int) len n do foreach x in syms do provide x.frameindex;
-    foreach x in syms do if x.frameID != 0 then x = dummySymbol;
-    Code(parallelAssignmentCode(nd, fr, syms, vals, pos))
+    Code(parallelAssignmentCode(colon, lhs, vals, pos))
     );
 
 export convertGlobalOperator(oper:Token):Code := Code(globalSymbolClosureCode(oper.entry, oper.position));
@@ -207,7 +166,7 @@ export convert0(e:ParseTree):Code := (
 	    -- e.g. x = ...
 	    is t:Token       do convertTokenAssignment(t, b.rhs)
 	    -- e.g. (x,y,z) = (...)
-	    is p:Parentheses do convertParallelAssignment(p, b.rhs, b.Operator.dictionary)
+	    is p:Parentheses do convertParallelAssignment(false, p, b.rhs)
 	    -- Note: usable, but not used anywhere yet
 	    is u:Unary   do convertUnaryInstallCode(UnaryInstallValueFun,
 		convertGlobalOperator(u.Operator), convert(u.rhs), convert(b.rhs), pos)
@@ -243,7 +202,7 @@ export convert0(e:ParseTree):Code := (
 	    -- e.g. x := ...
 	    is t:Token       do convertTokenAssignment(t, b.rhs)
 	    -- e.g. (x,y,z) := (...)
-	    is p:Parentheses do convertParallelAssignment(p, b.rhs, b.Operator.dictionary)
+	    is p:Parentheses do convertParallelAssignment(true, p, b.rhs)
 	    -- e.g. - Matrix := ...
 	    -- TODO: can #T be implemented here?
 	    is u:Unary   do convertUnaryInstallCode(UnaryInstallMethodFun,

M2/Macaulay2/d/debugging.dd

@@ -37,16 +37,8 @@ export tostring(c:Code):string := (
     is x:localAssignmentCode     do concatenate(array(string)("(local-assign ",  tostring(x.frameindex), " ", tostring(x.nestingDepth), " ", tostring(x.rhs), ")"))
     is x:globalAssignmentCode    do concatenate(array(string)("(global-assign ", x.lhs.word.name,        " ",                                tostring(x.rhs), ")"))
     is x:augmentedAssignmentCode do concatenate(array(string)("(augmented-assign ", x.oper.word.name, " ", tostring(x.lhs), " ", tostring(x.rhs), ")"))
-    is x:parallelAssignmentCode  do (
-	n := length(x.nestingDepth);
-	concatenate(array(string)(
-		"(parallel-assign (", between(" ",
-		    new array(string) len n do
-		    for i from 0 to n-1 do
-		    if x.lhs.i == dummySymbol
-		    then provide concatenate(array(string)("(", tostring(x.frameindex.i), " ", tostring(x.nestingDepth.i), ")"))
-		    else provide join("'", x.lhs.i.word.name)),
-		") ", tostring(x.rhs), ")")))
+    is x:parallelAssignmentCode  do concatenate(array(string)("(parallel-assign ( ", if x.colon then ":=" else "=", " (",
+	    between(" ", new array(string) len length(x.lhs) do foreach s in x.lhs do provide tostring(s)), ") ", tostring(x.rhs), ")"))
     -- TODO: what is an example that yields this?
     is x:evaluatedCode do concatenate(array(string)("(expr ", tostring(hash(x.expr)), ")"))
     --
@@ -115,13 +107,8 @@ export toList(c:Code):Expr := (
     is x:localAssignmentCode     do list(toExpr("local-assign"),   toExpr(x.frameindex),       toExpr(x.nestingDepth),   seq(toExpr(x.rhs)))
     is x:globalAssignmentCode    do list(toExpr("global-assign"),    Expr(SymbolBody(x.lhs)),  toExpr(x.lhs.frameindex), seq(toExpr(x.rhs)))
     is x:augmentedAssignmentCode do list(toExpr("augmented-assign"), Expr(SymbolBody(x.oper)), seq(toExpr(x.lhs), toExpr(x.rhs)))
-    is x:parallelAssignmentCode  do list(toExpr("parallel-assign"), seq(
-	    Expr(new Sequence len length(x.nestingDepth) do
-		for i from 0 to length(x.nestingDepth) - 1 do
-		if x.lhs.i == dummySymbol
-		then provide seq(toExpr(x.frameindex.i),    toExpr(x.nestingDepth.i))
-		else provide seq(Expr(SymbolBody(x.lhs.i)), toExpr(x.lhs.i.frameindex))),
-	    toExpr(x.rhs)))
+    is x:parallelAssignmentCode  do list(toExpr("parallel-assign"), Expr(SymbolBody(if x.colon then ColonEqualS.symbol else EqualS.symbol)),
+	Expr(new Sequence len length(x.lhs) do foreach s in x.lhs do provide toExpr(s)), toExpr(x.rhs))
     -- used along augmentedAssignmentCode
     is x:evaluatedCode do toExpr(tostring(c))
     --

M2/Macaulay2/d/parse.d

@@ -200,9 +200,8 @@ export catchCode := {+ code:Code, position:Position };
 
 export SymbolSequence := array(Symbol);
 export parallelAssignmentCode := {+
-     nestingDepth:array(int), -- spots corresponding to global and thread variables are filled with -1
-     frameindex:array(int),
-     lhs:SymbolSequence, -- spots corresponding to local variables are filled with dummySymbol
+     colon:bool, -- := or =
+     lhs:CodeSequence,
      rhs:Code,
      position:Position};