code cleanup

Author: bamboo

src/UnityScript.Tests/UnityScriptCompilerTestFixture.boo

@@ -10,9 +10,6 @@ class BaseClass:
 
 	[Boo.Lang.Extensions.Property(ComputedValue)]
 	_value as object
-	
-	abstract def Foo():
-		pass
 
 [TestFixture]
 class UnityScriptCompilerTestFixture:
@@ -22,28 +19,29 @@ class UnityScriptCompilerTestFixture:
 	[SetUp]
 	def SetUpCompiler():
 		compiler = UnityScriptCompiler()
-
+		compiler.Parameters.Pipeline = UnityScriptCompiler.Pipelines.CompileToMemory()
+		compiler.Parameters.ScriptBaseType = BaseClass
+		compiler.Parameters.ScriptMainMethod = "Awake"
+		
 	[Test]
 	def DefaultCompilerParameters():
 		assert compiler.Parameters.Ducky
 		assert CompilerOutputType.Library == compiler.Parameters.OutputType
 
 	[Test]
 	def ScriptBaseTypeAndMainMethod():
-		result = CompileScript("ComputedValue = 42;")
-		type = result.GeneratedAssembly.GetType("Script")
+		type = CompileScriptType("ComputedValue = 42;")
 		assert BaseClass is type.BaseType
 
-		b as BaseClass = type()
-		b.Foo()
+		b as duck = type()
+		b.Awake()
 		assert 42 == b.ComputedValue
 
 	[Test]
 	def ExeEntryPoint():
 		compiler.Parameters.OutputType = CompilerOutputType.ConsoleApplication
-		result = CompileScript("public static function Main(argv: String[]): void {}")
-		generatedAssembly = result.GeneratedAssembly
-		Assert.AreSame(generatedAssembly.GetType("Script").GetMethod("Main"), generatedAssembly.EntryPoint)
+		type = CompileScriptType("public static function Main(argv: String[]): void {}")
+		Assert.AreSame(type.GetMethod("Main"), type.Assembly.EntryPoint)
 
 	[Test]
 	def ModulesAreAnnotatedWithRawArrayIndexing():
@@ -68,11 +66,11 @@ class Bar {}
 		Assert.IsNull(result.GeneratedAssembly.GetType("Foo"))
 		Assert.IsNotNull(result.GeneratedAssembly.GetType("Bar"))
 
-	def CompileScript(script as string, *defines as (string)):
-		compiler.Parameters.Pipeline = UnityScriptCompiler.Pipelines.CompileToMemory()
-		compiler.Parameters.ScriptBaseType = BaseClass
-		compiler.Parameters.ScriptMainMethod = "Foo"
+	def CompileScriptType(script as string):
+		result = CompileScript(script)
+		return result.GeneratedAssembly.GetType("Script")
 
+	def CompileScript(script as string, *defines as (string)):
 		compiler.Parameters.Input.Clear()
 		compiler.Parameters.Input.Add(StringInput("Script", script))
 

src/UnityScript/Steps/ApplySemantics.boo

@@ -49,6 +49,9 @@ class ApplySemantics(AbstractVisitorCompilerStep):
 		SetScriptClass(Context, script)
 
 	def SetUpMainMethod(module as Module, script as TypeDefinition):
+		
+		TransformGlobalVariablesIntoFields(module, script)
+		
 		main = FindExistingMainMethodOn(script)
 		if main is null:
 			main = CreateMainMethod(module)
@@ -57,12 +60,13 @@ class ApplySemantics(AbstractVisitorCompilerStep):
 			Warnings.Add(UnityScriptWarnings.ScriptMainMethodIsImplicitlyDefined(main.LexicalInfo, main.Name))
 
 		main.Body.Statements.Extend(module.Globals.Statements)
-		
-		if UnityScriptParameters.GlobalVariablesBecomeFields:
-			main.Accept(DeclareGlobalVariables(script))
-			
 		module.Globals.Statements.Clear()
 
+	def TransformGlobalVariablesIntoFields(module as Module, script as TypeDefinition):
+		if not UnityScriptParameters.GlobalVariablesBecomeFields:
+			return
+		module.Globals.Accept(DeclareGlobalVariables(script))
+		
 	def FindExistingMainMethodOn(typeDef as TypeDefinition):
 		for member in typeDef.Members:
 			method = member as Method