Merge branch 'master' into unity-staging

Author: bamboo

src/UnityScript.Tests/ParserTestFixture.boo

@@ -18,6 +18,9 @@ partial class ParserTestFixture(AbstractCompilerTestFixture):
 		result = CompileTestCase(StringInput("empty", ""))
 		Assert.AreEqual(0, len(result.Errors), result.Errors.ToString(true))
 		Assert.AreEqual(1, len(result.CompileUnit.Modules))
-		Assert.AreEqual("empty", result.CompileUnit.Modules[0].LexicalInfo.FileName)
+		
+		module = result.CompileUnit.Modules[0]
+		Assert.AreEqual("empty", module.Name)
+		Assert.AreEqual("empty", module.LexicalInfo.FileName)
 
 

src/UnityScript/Parser/CodeFactory.boo

@@ -5,6 +5,9 @@ import Boo.Lang.Compiler.Ast
 
 static class CodeFactory:
 
+	def NewModule(fileName as string):
+		return Module(LexicalInfo(fileName, 1, 1), Name: ModuleNameFromFileName(fileName))
+	
 	def NewArrayComprehension(location as LexicalInfo, projection as Expression, variable as Declaration, expression as Expression, filter as Expression):
 		ge = GeneratorExpression(location, Expression: projection, Iterator: expression)
 		ge.Declarations.Add(variable)
@@ -35,3 +38,6 @@ static class CodeFactory:
 	def WithLocation[of T(Node)](node as T, location as LexicalInfo):
 		node.LexicalInfo = location
 		return node
+		
+def ModuleNameFromFileName(fname as string):
+	return System.IO.Path.GetFileNameWithoutExtension(fname)

src/UnityScript/Parser/UnityScriptParser.boo

@@ -253,9 +253,6 @@ partial class UnityScriptParser(antlr.LLkParser):
 			li = ToLexicalInfo(LT(1))
 		ReportError(UnityScriptCompilerErrors.SemicolonExpected(li))		
 
-	static def CreateModuleName(fname as string):
-		return System.IO.Path.GetFileNameWithoutExtension(fname)
-		
 	static def IsConstructorName(name as string, type as TypeDefinition):
 		return type.NodeType != NodeType.Module and name == type.Name
 
@@ -322,8 +319,7 @@ partial class UnityScriptParser(antlr.LLkParser):
 	) as void: //throws RecognitionException, TokenStreamException
 
 		eof as IToken  = null
-		module = Module(LexicalInfo(getFilename(), 1, 1))
-		module.Name = CreateModuleName(getFilename())
+		module = CodeFactory.NewModule(getFilename())
 		cu.Modules.Add(module)
 		globals = module.Globals
 

src/UnityScript/Parser/UnityScriptParserExtensions.boo

@@ -10,7 +10,7 @@ partial class UnityScriptParser:
 	static def ParseReader(reader as TextReader, fileName as string, context as CompilerContext, targetCompileUnit as CompileUnit):
 		lexer = UnityScriptLexerFor(reader, fileName, TabSizeFromContext(context))
 		if lexer is null:
-			targetCompileUnit.Modules.Add(Module(LexicalInfo(fileName, 1, 1)))
+			targetCompileUnit.Modules.Add(CodeFactory.NewModule(fileName))
 			return
 
 		parser = UnityScriptParser(lexer, CompilerContext: context)

src/UnityScript/UnityScript.g

@@ -231,9 +231,6 @@ tokens
 			li = ToLexicalInfo(LT(1))
 		ReportError(UnityScriptCompilerErrors.SemicolonExpected(li))		
 
-	static def CreateModuleName(fname as string):
-		return System.IO.Path.GetFileNameWithoutExtension(fname)
-		
 	static def IsConstructorName(name as string, type as TypeDefinition):
 		return type.NodeType != NodeType.Module and name == type.Name
 
@@ -276,8 +273,7 @@ tokens
 
 start[CompileUnit cu]
 {
-	module = Module(LexicalInfo(getFilename(), 1, 1))
-	module.Name = CreateModuleName(getFilename())
+	module = CodeFactory.NewModule(getFilename())
 	cu.Modules.Add(module)
 	globals = module.Globals
 }: