Changeset 425 for EcnlProtoTool/trunk/webapp/webmrbc/Blocks/Procedures.cs

Timestamp:

May 29, 2020, 10:45:52 PM (4 years ago)

Author:

coas-nagasima

Message:

Visual Studio 2019 と Bridge.NET でビルドできるよう更新。

File:

• EcnlProtoTool/trunk/webapp/webmrbc/Blocks/Procedures.cs (modified) (6 diffs)

EcnlProtoTool/trunk/webapp/webmrbc/Blocks/Procedures.cs

@@ -28 +28 @@
 using Bridge;
 using Bridge.Html5;
-using Bridge.Text.RegularExpressions;
 
 namespace WebMrbc
@@ -504 +503 @@
                 public string validator_(string newVar)
                 {
-                        newVar = newVar.Replace(new Regex("[\\s\\xa0]+", "g"), " ").Replace(new Regex("^ | $", "g"), "");
+                        newVar = newVar.Replace(new RegExp("[\\s\\xa0]+", "g"), " ").Replace(new RegExp("^ | $", "g"), "");
                         return newVar;
                 }
@@ -630 +629 @@
                                         this.quarkConnections_[this.quarkIds_[i]] = connection;
                                         if (mutatorOpen && connection != null &&
-                                                paramIds.IndexOf(this.quarkIds_[i]) == -1) {
+                                                Array.IndexOf(paramIds, this.quarkIds_[i]) == -1) {
                                                 // This connection should no longer be attached to this block.
                                                 connection.disconnect();
@@ -638 +637 @@
                         }
                         // Rebuild the block's arguments.
-                        this.arguments_ = (string[])(new string[0]).Concat(paramNames);
+                        this.arguments_ = (new string[0]).Concat(paramNames).ToArray();
                         this.updateShape_();
                         this.quarkIds_ = paramIds;
@@ -781 +780 @@
                         }
                         if (e.type == Events.CREATE &&
-                                ((Create)e).ids.IndexOf(this.id) != -1) {
+                                Array.IndexOf(((Create)e).ids, this.id) != -1) {
                                 // Look for the case where a procedure call was created (usually through
                                 // paste) and there is no matching definition.  In this case, create
@@ -988 +987 @@
                         var block = (Block)this;
                         do {
-                                if (this.FUNCTION_TYPES.IndexOf(block.type) != -1) {
+                                if (Array.IndexOf(this.FUNCTION_TYPES, block.type) != -1) {
                                         legal = true;
                                         break;