Update unity-trunk to match unity3.5

bin/booi.exe.config

@@ -3,7 +3,8 @@
 <NetFx40_LegacySecurityPolicy enabled="true" />
 </runtime>
 <startup>
-<supportedRuntime version="v2.0.50727"/>
-<supportedRuntime version="v1.1.4322"/>
+<supportedRuntime version="v4.0.30319" />
+<supportedRuntime version="v2.0.50727" />
+<supportedRuntime version="v1.1.4322" />
 </startup>
 </configuration>

bin/booish.exe.config

@@ -3,7 +3,8 @@
 <NetFx40_LegacySecurityPolicy enabled="true" />
 </runtime>
 <startup>
-<supportedRuntime version="v2.0.50727"/>
-<supportedRuntime version="v1.1.4322"/>
+<supportedRuntime version="v4.0.30319" />
+<supportedRuntime version="v2.0.50727" />
+<supportedRuntime version="v1.1.4322" />
 </startup>
 </configuration>

default.build

@@ -2,7 +2,7 @@
 <project name="boo" default="all">
 
 	<property name="boo.major.minor.release.version" value="0.9.5" />
-	<property name="boo.build.number" value="4" />
+	<property name="boo.build.number" value="5" />
 	<property name="boo.version" value="${boo.major.minor.release.version}.${boo.build.number}" dynamic="True" />
 	<property name="boo.assembly.version" value="2.${boo.major.minor.release.version}" />
 

src/Boo.Lang.Compiler/Ast/Block.cs

@@ -47,12 +47,12 @@ public Block(params Statement[] statements)
 
 		public void Clear()
 		{
-			if (null != _statements) _statements = null;
+			_statements = null;
 		}
 
 		public bool IsEmpty
 		{
-			get { return (null == _statements || Statements.IsEmpty); }
+			get { return (_statements == null || Statements.IsEmpty); }
 		}
 
 		[Obsolete("HasStatements is Obsolete, use IsEmpty instead")]
@@ -82,7 +82,6 @@ public Statement LastStatement
 		{
 			get { return IsEmpty ? null : Statements.Last; }
 		}
-
 
 		public override Block ToBlock()
 		{
@@ -91,36 +90,41 @@ public override Block ToBlock()
 
 		public void Add(Statement stmt)
 		{
-			Block block = stmt as Block;
-			if (null != block)
+			var block = stmt as Block;
+			if (block != null)
 				Add(block);
 			else
-				this.Statements.Add(stmt);
+				Statements.Add(stmt);
 		}
 
 		public void Add(Block block)
 		{
 			if (block.HasAnnotations)
 			{
-				this.Statements.Add(block);
+				Statements.Add(block);
 				return;
 			}
-			this.Statements.Extend(block.Statements);
+			Statements.Extend(block.Statements);
 		}
 
 		public void Add(Expression expression)
 		{
-			this.Statements.Add(new ExpressionStatement(expression));
+			Statements.Add(StatementFor(expression));
 		}
-		
+
 		public void Insert(int index, Expression expression)
 		{
-			this.Statements.Insert(index, new ExpressionStatement(expression));
+			Statements.Insert(index, StatementFor(expression));
 		}
-		
+
 		public void Insert(int index, Statement stmt)
 		{
-			this.Statements.Insert(index, stmt);
+			Statements.Insert(index, stmt);
+		}
+
+		private static Statement StatementFor(Expression expression)
+		{
+			return Statement.Lift(expression);
 		}
 
 		public Statement Simplify()

src/Boo.Lang.Compiler/Ast/Statement.cs

@@ -54,7 +54,7 @@ public static Statement Lift(Statement node)
 
 		public static Statement Lift(Expression node)
 		{
-			return new ExpressionStatement(node);
+			return new ExpressionStatement(node) { IsSynthetic =  node.IsSynthetic };
 		}
 
 		public Statement()

src/Boo.Lang.Compiler/CompilerErrorFactory.cs

@@ -519,11 +519,6 @@ public static CompilerError CantCreateInstanceOfEnum(Node node, IType typeName)
 			return Instantiate("BCE0087", node, typeName);
 		}
 
-		public static CompilerError ReservedPrefix(Node node, string prefix)
-		{
-			return Instantiate("BCE0088", node, prefix);
-		}
-
 		public static CompilerError MemberNameConflict(Node node, IType declaringType, string memberName)
 		{
 			return Instantiate("BCE0089", node, declaringType, memberName);

src/Boo.Lang.Compiler/Steps/CheckMemberNames.cs

@@ -35,9 +35,9 @@
 
 namespace Boo.Lang.Compiler.Steps
 {
-	public class CheckMemberNames : AbstractVisitorCompilerStep
+	public sealed class CheckMemberNames : AbstractVisitorCompilerStep
 	{
-		protected Dictionary<string, List<TypeMember>> _members = new Dictionary<string, List<TypeMember>>(StringComparer.Ordinal);
+		private Dictionary<string, List<TypeMember>> _members = new Dictionary<string, List<TypeMember>>(StringComparer.Ordinal);
 
 		override public void Dispose()
 		{
@@ -74,15 +74,13 @@ override public void LeaveEnumDefinition(EnumDefinition node)
 		{
 			_members.Clear();
 			foreach (TypeMember member in node.Members)
-			{
 				if (_members.ContainsKey(member.Name))
 					MemberNameConflict(member);
 				else
 					_members[member.Name] = new List<TypeMember>() { member };
-			}
 		}
 
-		protected void CheckMember(List<TypeMember> list, TypeMember member)
+		private void CheckMember(List<TypeMember> list, TypeMember member)
 		{
 			switch (member.NodeType)
 			{
@@ -111,15 +109,13 @@ protected void CheckMember(List<TypeMember> list, TypeMember member)
 		}
 
 
-		protected void CheckNonOverloadableMember(List<TypeMember> existing, TypeMember member)
+		private void CheckNonOverloadableMember(List<TypeMember> existing, TypeMember member)
 		{
 			if (existing.Count > 0)
-			{
 				MemberNameConflict(member);
-			}
 		}
 
-		protected void CheckOverloadableMember(List<TypeMember> existing, TypeMember member)
+		private void CheckOverloadableMember(List<TypeMember> existing, TypeMember member)
 		{
 			var expectedNodeType = member.NodeType;
 			foreach (TypeMember existingMember in existing)
@@ -167,40 +163,24 @@ bool IsGenericityTheSame(TypeMember lhs, TypeMember rhs)
 		bool AreDifferentInterfaceMembers(IExplicitMember lhs, IExplicitMember rhs)
 		{
 			if (lhs.ExplicitInfo == null && rhs.ExplicitInfo == null)
-			{
 				return false;
-			}
-
-			if (
-				lhs.ExplicitInfo != null &&
-				rhs.ExplicitInfo != null &&
-				lhs.ExplicitInfo.InterfaceType.Entity == rhs.ExplicitInfo.InterfaceType.Entity
-				)
-			{
-				return false;
-			}
-
-			return true;
+			return lhs.ExplicitInfo == null || rhs.ExplicitInfo == null || lhs.ExplicitInfo.InterfaceType.Entity != rhs.ExplicitInfo.InterfaceType.Entity;
 		}
 
 		bool AreDifferentConversionOperators(TypeMember existing, TypeMember actual)
 		{
 			if ((existing.Name == "op_Implicit" || existing.Name == "op_Explicit")
 				&& existing.Name == actual.Name
-				&& existing.NodeType == NodeType.Method
-				&& existing.IsStatic && actual.IsStatic)
+				&& existing.NodeType == NodeType.Method && existing.IsStatic && actual.IsStatic)
 			{
 				IMethod one = existing.Entity as IMethod;
 				IMethod two = actual.Entity as IMethod;
-				if (one != null && two != null && one.ReturnType != two.ReturnType)
-				{
-					return true;
-				}
+				return one != null && two != null && one.ReturnType != two.ReturnType;
 			}
 			return false;
  		}
 
-		protected void MemberNameConflict(TypeMember member)
+		private void MemberNameConflict(TypeMember member)
 		{
 			MemberConflict(member, member.Name);
 		}
@@ -220,7 +200,7 @@ List<TypeMember> GetMemberList(string name)
 			return list;
 		}
 
-		protected void CheckLikelyTypoInTypeMemberName(TypeMember member)
+		private void CheckLikelyTypoInTypeMemberName(TypeMember member)
 		{
 			foreach (string name in GetLikelyTypoNames(member))
 			{
@@ -237,7 +217,7 @@ protected void CheckLikelyTypoInTypeMemberName(TypeMember member)
 			}
 		}
 
-		protected virtual IEnumerable<string> GetLikelyTypoNames(TypeMember member)
+		private IEnumerable<string> GetLikelyTypoNames(TypeMember member)
 		{
 			char first = member.Name[0];
 			if (first == 'c' || first == 'C')