Fix anonymous initializers when used without a 'new' keyword in json mode

danelkhen · danelkhen · commit 9e72dd4e3e65 · 2015-04-29T17:37:17.000+02:00
diff --git a/Compiler/skc5/Compiler/CsToJs/ResolveResultConverter.cs b/Compiler/skc5/Compiler/CsToJs/ResolveResultConverter.cs
@@ -569,7 +569,40 @@ internal JsExpression InitializersToJson(IList<ResolveResult> initializerStateme
                         var mrr = (MemberResolveResult)op.Operands[0];
                         var name = SkJs.GetEntityJsName(mrr.Member);
                         var value = VisitExpression(op.Operands[1]);
-                        json.Add(name, value);
+                        var pair = Js.JsonNameValue(name, value);
+                        if (mrr.TargetResult is MemberResolveResult)   //happens when using object initializers to set inner properties, e.g. new Parent { Child = { Name="ggg" } }
+                        {
+                            var targetMrr = (MemberResolveResult)mrr.TargetResult;
+                            var name2 = SkJs.GetEntityJsName(targetMrr.Member);
+                            var innerJson = Js.Json();
+                            innerJson.Add(pair);
+                            pair = Js.JsonNameValue(name2, innerJson);
+                        }
+                        json.Add(pair);
+                    }
+                    else if (st is InvocationResolveResult)
+                    {
+                        var irr = (InvocationResolveResult)st;
+                        var targetMrr = irr.TargetResult as MemberResolveResult;
+                        if (targetMrr == null)
+                            throw new CompilerException(st.GetFirstNode(), "Expected MemberResolveResult");
+                        var name = SkJs.GetEntityJsName(targetMrr.Member);
+                        if (irr.Arguments.Count != 1)
+                            throw new CompilerException(st.GetFirstNode(), "Expected one argument, not " + name + " " + irr.Arguments.Count);
+                        var value = VisitExpression(irr.Arguments[0]);
+                        var jsonMember = json.NamesValues.NotNull().FirstOrDefault(t => t.Name.Name == name);
+                        if (jsonMember == null)
+                        {
+                            json.Add(name, Js.NewJsonArray(value));
+                        }
+                        else
+                        {
+                            var array = jsonMember.Value as JsJsonArrayExpression;
+                            if (array == null)
+                                throw new CompilerException(st.GetFirstNode(), "json member value array not found " + name);
+                            array.Items.Add(value);
+                        }
+
                     }
                     else
                     {
@@ -797,55 +830,55 @@ internal JsNode Visit(AstNode node)
             return AstNodeConverter.Visit(node);
         }
 
-		public JsNode VisitAwaitResolveResult(AwaitResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitAwaitResolveResult(AwaitResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitAmbiguousTypeResolveResult(AmbiguousTypeResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitAmbiguousTypeResolveResult(AmbiguousTypeResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitUnknownMethodResolveResult(UnknownMethodResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitUnknownMethodResolveResult(UnknownMethodResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitSizeOfResolveResult(SizeOfResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitSizeOfResolveResult(SizeOfResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitErrorResolveResult(ErrorResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitErrorResolveResult(ErrorResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitForEachResolveResult(ForEachResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitForEachResolveResult(ForEachResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitNamespaceResolveResult(NamespaceResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitNamespaceResolveResult(NamespaceResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitUnknownMemberResolveResult(UnknownMemberResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitUnknownMemberResolveResult(UnknownMemberResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		public JsNode VisitUnknownIdentifierResolveResult(UnknownIdentifierResolveResult res)
-		{
-			throw new NotImplementedException();
-		}
+        public JsNode VisitUnknownIdentifierResolveResult(UnknownIdentifierResolveResult res)
+        {
+            throw new NotImplementedException();
+        }
 
-		#endregion
+        #endregion
 
 
-	}
+    }
 
 
 }
diff --git a/Compiler/skc5/JavaScript/Ast/Js.cs b/Compiler/skc5/JavaScript/Ast/Js.cs
@@ -42,10 +42,15 @@ public static JsJsonObjectExpression Json()
             return new JsJsonObjectExpression();
         }
         public static JsJsonObjectExpression Add(this JsJsonObjectExpression exp, string name, JsExpression value)
+        {
+            exp.Add(JsonNameValue(name, value));
+            return exp;
+        }
+        public static JsJsonObjectExpression Add(this JsJsonObjectExpression exp, JsJsonNameValue nameValue)
         {
             if (exp.NamesValues == null)
                 exp.NamesValues = new List<JsJsonNameValue>();
-            exp.NamesValues.Add(JsonNameValue(name, value));
+            exp.NamesValues.Add(nameValue);
             return exp;
         }
         public static JsJsonNameValue JsonNameValue(string name, JsExpression value)
diff --git a/Compiler/skc5/Properties/AssemblyInfo.cs b/Compiler/skc5/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("5.4.7")]
+[assembly: AssemblyFileVersion("5.4.8")]
diff --git a/Compiler/skc5/skc5.csproj b/Compiler/skc5/skc5.csproj
@@ -46,15 +46,15 @@
       <HintPath>..\..\external\corex\src\corex\bin\corex.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.NRefactory">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\Debug\ICSharpCode.NRefactory.dll</HintPath>
+      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.dll</HintPath>
       <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.NRefactory.Cecil">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\Debug\ICSharpCode.NRefactory.Cecil.dll</HintPath>
+      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.Cecil.dll</HintPath>
       <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.NRefactory.CSharp">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\Debug\ICSharpCode.NRefactory.CSharp.dll</HintPath>
+      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.CSharp.dll</HintPath>
       <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil">
diff --git a/external/NRefactory b/external/NRefactory
@@ -1 +1 @@
-Subproject commit 4486625dd2962f6fc45a43fa28aeba658adfe8bf
+Subproject commit e3f36308e04b209a5f46a490909ebf80b934d23e

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,15 @@ public static JsJsonObjectExpression Json()`
`42`	`42`	`return new JsJsonObjectExpression();`
`43`	`43`	`}`
`44`	`44`	`public static JsJsonObjectExpression Add(this JsJsonObjectExpression exp, string name, JsExpression value)`
	`45`	`+ {`
	`46`	`+ exp.Add(JsonNameValue(name, value));`
	`47`	`+ return exp;`
	`48`	`+ }`
	`49`	`+ public static JsJsonObjectExpression Add(this JsJsonObjectExpression exp, JsJsonNameValue nameValue)`
`45`	`50`	`{`
`46`	`51`	`if (exp.NamesValues == null)`
`47`	`52`	`exp.NamesValues = new List<JsJsonNameValue>();`
`48`		`- exp.NamesValues.Add(JsonNameValue(name, value));`
	`53`	`+ exp.NamesValues.Add(nameValue);`
`49`	`54`	`return exp;`
`50`	`55`	`}`
`51`	`56`	`public static JsJsonNameValue JsonNameValue(string name, JsExpression value)`