Added ForceMethodSuffix

Sebastian Loncar · Sebastian Loncar · commit 867ae5ffef26 · 2014-09-04T03:36:35.000+02:00
diff --git a/Compiler/skc5/Compiler/Sk.cs b/Compiler/skc5/Compiler/Sk.cs
@@ -230,6 +230,11 @@ public static bool IsJsExported(IEntity me)
 
         #endregion
 
+        public static bool ForceMethodSuffix(IMethod pe)
+        {
+            return pe.MD_JsMethodOrJsType(t => t._ForceMethodSuffix, t => t._ForceMethodSuffix).GetValueOrDefault();
+        }
+
         #region JsType
         public static JsMode? GetJsMode(ITypeDefinition ce)
         {
diff --git a/Compiler/skc5/Compiler/SkJs.cs b/Compiler/skc5/Compiler/SkJs.cs
@@ -519,6 +519,9 @@ static string GetOverloadedMethodSuffix(IMethod me)
         }
         static bool NeedsJsOverloadSuffix(IMethod me)
         {
+            if (Sk.ForceMethodSuffix(me))
+                return true;
+
             if (me.IsIndexerAccessor()) //TODO: HACK: bug with metaspec - base_type is null in overridden indexer methods
             {
                 //var x = me.HasFlag(entity_flags.f_override);
diff --git a/Compiler/skc5/JavaScript/JsAttributes.cs b/Compiler/skc5/JavaScript/JsAttributes.cs
@@ -219,6 +219,8 @@ public JsTypeAttribute(JsMode mode, string filename)
 
         public string JsonTypeFieldName { get; set; }
 
+        public bool ForceMethodSuffix { get { return _ForceMethodSuffix.GetValueOrDefault(); } set { _ForceMethodSuffix = value; } } public bool? _ForceMethodSuffix;
+
         private void GoNative()
         {
             if (_NativeOverloads == null)
@@ -582,6 +584,8 @@ public partial class JsMethodAttribute : Attribute
         public string SharpKitVersion { get; set; }
 
         public string InlineCodeExpression { get; set; }
+
+        public bool ForceMethodSuffix { get { return _ForceMethodSuffix.GetValueOrDefault(); } set { _ForceMethodSuffix = value; } } public bool? _ForceMethodSuffix;
     }
     #endregion
 
@@ -651,7 +655,7 @@ public partial class JsEventAttribute : Attribute
 
 
         public bool Export { get { return _Export.GetValueOrDefault(true); } set { _Export = value; } }
-        public bool? _Export;        
+        public bool? _Export;
 
     }
     #endregion
diff --git a/Installer/Installer/zip.cs b/Installer/Installer/zip.cs
@@ -99,11 +99,11 @@ public void ExtractFile(string ArchiveFile, string DestDir, string DestFile = ""
 
         public void ExtractDirectory(string ArchiveDir, string DestDir, Action<string> logger = null)
         {
-            if (ArchiveDir.Last() != '/') ArchiveDir += "/";
+            if (ArchiveDir.Last() != Path.DirectorySeparatorChar) ArchiveDir += Path.DirectorySeparatorChar;
             if (DestDir.Last() != dsc) DestDir += dsc;
             foreach (var entry in GetFiles())
             {
-                if (entry.StartsWith(ArchiveDir) && !entry.EndsWith("/"))
+                if (entry.StartsWith(ArchiveDir) && !entry.EndsWith(Path.DirectorySeparatorChar))
                 {
                     var DestFile = entry.Substring(ArchiveDir.Length);
                     if (logger != null)
diff --git a/SDK b/SDK
@@ -1 +1 @@
-Subproject commit fa561019fcb227d6b2910e2d722e37b366492a8a
+Subproject commit 8a5c8379790f0f43c0e2a630b3408bcba0522f56
diff --git a/scripts/update-sdk-submodule.cmd b/scripts/update-sdk-submodule.cmd
@@ -0,0 +1,12 @@
+@cd /D %~dp0
+@call set-variables
+
+@cd ..
+%git% submodule foreach git pull origin master
+@cd scripts
+
+@echo.
+@echo submodules are now updated.
+@echo please use "-am" option, when commiting.
+@echo Example:
+@echo git commit -am "Updated submodules"

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,9 @@ static string GetOverloadedMethodSuffix(IMethod me)`
`519`	`519`	`}`
`520`	`520`	`static bool NeedsJsOverloadSuffix(IMethod me)`
`521`	`521`	`{`
	`522`	`+ if (Sk.ForceMethodSuffix(me))`
	`523`	`+ return true;`
	`524`	`+`
`522`	`525`	`if (me.IsIndexerAccessor()) //TODO: HACK: bug with metaspec - base_type is null in overridden indexer methods`
`523`	`526`	`{`
`524`	`527`	`//var x = me.HasFlag(entity_flags.f_override);`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ public JsTypeAttribute(JsMode mode, string filename)`
`219`	`219`
`220`	`220`	`public string JsonTypeFieldName { get; set; }`
`221`	`221`
	`222`	`+ public bool ForceMethodSuffix { get { return _ForceMethodSuffix.GetValueOrDefault(); } set { _ForceMethodSuffix = value; } } public bool? _ForceMethodSuffix;`
	`223`	`+`
`222`	`224`	`private void GoNative()`
`223`	`225`	`{`
`224`	`226`	`if (_NativeOverloads == null)`
`@@ -582,6 +584,8 @@ public partial class JsMethodAttribute : Attribute`
`582`	`584`	`public string SharpKitVersion { get; set; }`
`583`	`585`
`584`	`586`	`public string InlineCodeExpression { get; set; }`
	`587`	`+`
	`588`	`+ public bool ForceMethodSuffix { get { return _ForceMethodSuffix.GetValueOrDefault(); } set { _ForceMethodSuffix = value; } } public bool? _ForceMethodSuffix;`
`585`	`589`	`}`
`586`	`590`	`#endregion`
`587`	`591`
`@@ -651,7 +655,7 @@ public partial class JsEventAttribute : Attribute`
`651`	`655`
`652`	`656`
`653`	`657`	`public bool Export { get { return _Export.GetValueOrDefault(true); } set { _Export = value; } }`
`654`		`- public bool? _Export;`
	`658`	`+ public bool? _Export;`
`655`	`659`
`656`	`660`	`}`
`657`	`661`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ public void ExtractFile(string ArchiveFile, string DestDir, string DestFile = ""`
`99`	`99`
`100`	`100`	`public void ExtractDirectory(string ArchiveDir, string DestDir, Action<string> logger = null)`
`101`	`101`	`{`
`102`		`- if (ArchiveDir.Last() != '/') ArchiveDir += "/";`
	`102`	`+ if (ArchiveDir.Last() != Path.DirectorySeparatorChar) ArchiveDir += Path.DirectorySeparatorChar;`
`103`	`103`	`if (DestDir.Last() != dsc) DestDir += dsc;`
`104`	`104`	`foreach (var entry in GetFiles())`
`105`	`105`	`{`
`106`		`- if (entry.StartsWith(ArchiveDir) && !entry.EndsWith("/"))`
	`106`	`+ if (entry.StartsWith(ArchiveDir) && !entry.EndsWith(Path.DirectorySeparatorChar))`
`107`	`107`	`{`
`108`	`108`	`var DestFile = entry.Substring(ArchiveDir.Length);`
`109`	`109`	`if (logger != null)`