Fix issues #51 & #53

UnityScript2CSharp.Tests/Tests.cs

@@ -223,7 +223,7 @@ namespace UnityScript2CSharp.Tests
         }
 
         [Test]
-        public void Locals_Infered_Type()
+        public void Locals_Inferred_Type()
         {
             var sourceFiles = SingleSourceFor("locals_inferred.js", "function F() { var i = 2; }");
             var expectedConvertedContents = SingleSourceFor("locals_inferred.cs", DefaultGeneratedClass + "locals_inferred : MonoBehaviour { public virtual void F() { int i = 2; } }");
@@ -557,7 +557,7 @@ namespace UnityScript2CSharp.Tests
 
         [TestCase("", TestName = "No Start Method")]
         [TestCase(" System.Console.WriteLine(\"Within Start\");", TestName = "With Start Method")]
-        public void Glocal_Statements_Are_Injected_In_Begin_Of_Start(string startBody)
+        public void Global_Statements_Are_Injected_In_Begin_Of_Start(string startBody)
         {
             var start = startBody.Length != 0 ? $"function Start() {{ {startBody} }}" : "";
             var sourceFiles = new[] { new SourceFile { FileName = "global_statements.js", Contents = $"System.Console.WriteLine(\"Foo\"); {start}" } };
@@ -570,7 +570,7 @@ namespace UnityScript2CSharp.Tests
         [TestCase("var f = function() { return 2; }", "Func<int> f = () => { return 2; } ", TestName = "Explicit Return")]
         [TestCase("var f = function(i) i % 2", "Func<object,object> f = (object i) => { return ((int) i) % 2; } ", TestName = "Inferred Parameter Type")]
         [TestCase("var f = function(i) { return i + 1; }", "Func<object,object> f = (object i) => { return ((int) i) + 1; } ", TestName = "Inferred Parameter 2")]
-        [TestCase("var f = function(i:int) i % 2", "Func<intint> f = (int i) => { return i % 2; } ", TestName = "Explicit Parameter Type")]
+        [TestCase("var f = function(i:int) i % 2", "Func<int,int> f = (int i) => { return i % 2; } ", TestName = "Explicit Parameter Type")]
         [TestCase("var f = function(i) { var x : int = i; return x + 1; }", "Func<object,int> f = (object i) => { int x = (int) i; return x + 1; } ", TestName = "Inferred Parameter Explicit Type")]   // Object means we infer the lambda parameter type incorrecly
         [TestCase("var f = function(i) i % 2; F( f(1) )", "Func<object,object> f = (object i) => { return ((int) i) % 2; } ; this.F((int) f(1))", TestName = "Inferred parameter with specific argument type")]  // Object means we infer the lambda parameter type incorrecly
         public void Lambda_Expressions(string functionDecl, string csFunctionDecl)
@@ -756,6 +756,15 @@ namespace UnityScript2CSharp.Tests
             }
         }
 
+        [Test]
+        public void Test_Members()
+        {
+            var sourceFiles = new[] { new SourceFile { FileName = "string_members.js", Contents = "function F(s:String) { return s.length; }" } };
+            var expectedConvertedContents = new[] { new SourceFile { FileName = "string_members.cs", Contents = DefaultGeneratedClass + $"string_members : MonoBehaviour {{ public virtual int F(string s) {{ return s.Length; }} }}" } };
+
+            AssertConversion(sourceFiles, expectedConvertedContents);
+        }
+
         [Test]
         public void Test_Formatting()
         {
@@ -840,6 +849,7 @@ namespace UnityScript2CSharp.Tests
                 "lock",
                 "nameof",
                 "namespace",
+                "object",
                 "operator",
                 "out",
                 "params",
@@ -849,11 +859,12 @@ namespace UnityScript2CSharp.Tests
                 "sealed",
                 "sizeof",
                 "stackalloc",
+                "string",
                 "struct",
                 "unchecked",
                 "unsafe",
                 "using",
-                "volatile"
+                "volatile",
             };
 
             foreach (var keyword in keywords)

UnityScript2CSharp/Steps/CSharpReservedKeywordIdentifierClashFix.cs

@@ -148,6 +148,7 @@ namespace UnityScript2CSharp.Steps
             "sealed",
             "sizeof",
             "stackalloc",
+            "string",
             "struct",
             "unchecked",
             "unsafe",

UnityScript2CSharp/Steps/PromoteImplicitBooleanConversionsToExplicitComparisons.cs

@@ -159,11 +159,11 @@ namespace UnityScript2CSharp.Steps
         }
     }
 
-    // This visitor's reponsability is to take expressions like:
+    // This visitor's responsability is to take expressions like:
     //
     //          var b = s && s.Length > 10;
     //
-    // and converte them to:
+    // and convert them to:
     //          var b = !string.IsNullOrEmpty(s) ? s.Length > 10 : false;
     //
     // (note that US compiler already does part of this conversion; we only need

UnityScript2CSharp/Steps/ReplaceArrayAndStringMemberReferenceWithCamelCaseVersion.cs

@@ -6,14 +6,17 @@ using Boo.Lang.Compiler.TypeSystem.Reflection;
 
 namespace UnityScript2CSharp.Steps
 {
-    internal class ReplaceArrayMemberReferenceWithCamelCaseVersion : AbstractTransformerCompilerStep
+    internal class ReplaceArrayAndStringMemberReferenceWithCamelCaseVersion : AbstractTransformerCompilerStep
     {
         public override void OnMemberReferenceExpression(MemberReferenceExpression node)
         {
-            if (!IsArray(node) || Char.IsUpper(node.Name[0]))
+            if (Char.IsUpper(node.Name[0]))
                 return;
 
-            if (node.Name == "get_Item" || node.Name == "set_Item")
+            if (!IsArray(node) && !IsUnityScriptStringType(node))
+                return;
+
+            if (node.Name == "get_Item" || node.Name == "set_Item" || node.Name == "get_Chars")
                 return;
 
             var name = new StringBuilder();
@@ -22,12 +25,17 @@ namespace UnityScript2CSharp.Steps
             node.Name = name.ToString();
         }
 
+        static bool IsUnityScriptStringType(MemberReferenceExpression node)
+        {
+            return node.Target.ExpressionType != null && node.Target.ExpressionType.FullName == "String";
+        }
+
         private static bool IsArray(MemberReferenceExpression node)
         {
             if (node.Target.ExpressionType == null)
                 return false;
 
-            if (node.Target.ExpressionType.IsArray || node.Target.ExpressionType.FullName == typeof(System.Array).FullName)
+            if (node.Target.ExpressionType.IsArray || node.Target.ExpressionType.FullName == typeof(Array).FullName)
                 return true;
 
             var expressionType = node.Target.ExpressionType as ExternalType;

UnityScript2CSharp/UnityScript2CSharp.csproj

@@ -142,7 +142,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Steps\RemoveUnnecessaryCastInArrayInstantiation.cs" />
-    <Compile Include="Steps\ReplaceArrayMemberReferenceWithCamelCaseVersion.cs" />
+    <Compile Include="Steps\ReplaceArrayAndStringMemberReferenceWithCamelCaseVersion.cs" />
     <Compile Include="SourceFile.cs" />
     <Compile Include="Steps\ReplaceUnityScriptArrayWithObjectArray.cs" />
     <Compile Include="Steps\SelectiveUnaryExpressionExpansionProcessUnityScriptMethods.cs" />

UnityScript2CSharp/UnityScript2CSharpConverter.cs

@@ -227,7 +227,7 @@ namespace UnityScript2CSharp
             adjustedPipeline.Add(new RenameArrayDeclaration());
             adjustedPipeline.Add(new ReplaceUnityScriptArrayWithObjectArray());
             adjustedPipeline.Add(new InjectTypeOfExpressionsInArgumentsOfSystemType());
-            adjustedPipeline.Add(new ReplaceArrayMemberReferenceWithCamelCaseVersion());
+            adjustedPipeline.Add(new ReplaceArrayAndStringMemberReferenceWithCamelCaseVersion());
 
             adjustedPipeline.Add(new ReplaceGetSetItemMethodsWithOriginalIndexers());
             adjustedPipeline.Add(new PromoteImplicitBooleanConversionsToExplicitComparisons());

UnityScript2CSharp/UnityScript2CSharpConverterVisitor.cs

@@ -1496,11 +1496,11 @@ namespace UnityScript2CSharp
             }
 
             var parameters = new StringBuilder();
-            var last = genericArgs.LastOrDefault();
-            foreach (var type in genericArgs)
+            var lastIndex = genericArgs.Count - 1;
+            for (int i = 0; i < genericArgs.Count; i++)
             {
-                parameters.Append(TypeNameFor(type));
-                if (type != last)
+                parameters.Append(TypeNameFor(genericArgs[i]));
+                if (i != lastIndex)
                     parameters.Append(",");
             }