Changeset 425 for EcnlProtoTool/trunk/webapp/webmrbc/Ecnl/ValueRange.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/Ecnl/ValueRange.cs (modified) (4 diffs)

EcnlProtoTool/trunk/webapp/webmrbc/Ecnl/ValueRange.cs

@@ -40 +40 @@
 using System.Collections.Generic;
 using Bridge;
-using Bridge.Text.RegularExpressions;
+using Bridge.Html5;
 
 namespace WebMrbc
@@ -412 +412 @@
                         int pos = 0;
                         while (pos < input.Length) {
-                                Regex ms;
+                                RegExp ms;
                                 string[] m;
-                                if ((m = (ms = new Regex(TokenInfo.HexValue)).Exec(input.Substring(pos))) != null) {
+                                if ((m = (ms = new RegExp(TokenInfo.HexValue)).Exec(input.Substring(pos))) != null) {
                                         tokens.Push(new TokenInfo(m[0], TokenType.HexValue));
                                         pos += m[0].Length;
                                 }
-                                else if ((m = (ms = new Regex(TokenInfo.Numeric)).Exec(input.Substring(pos))) != null) {
+                                else if ((m = (ms = new RegExp(TokenInfo.Numeric)).Exec(input.Substring(pos))) != null) {
                                         tokens.Push(new TokenInfo(m[0], TokenType.Numeric));
                                         pos += m[0].Length;
                                 }
                                 else {
-                                        if ((m = (ms = new Regex(TokenInfo.Separetor)).Exec(input.Substring(pos))) == null) {
+                                        if ((m = (ms = new RegExp(TokenInfo.Separetor)).Exec(input.Substring(pos))) == null) {
                                                 tokens.Push(new TokenInfo(input.Substring(pos), TokenType.String));
                                                 break;
@@ -747 +747 @@
 
                         if (emti.primitive) {
-                                string[] lines = valrng.Split(new Regex("\r\n"));
+                                string[] lines = valrng.Split(new RegExp("\r\n"));
                                 foreach (string line in lines) {
-                                        if (new Regex("^<(.+)>$").Test(line))
+                                        if (new RegExp("^<(.+)>$").Test(line))
                                                 continue;
 
@@ -773 +773 @@
                                         }
 
-                                        valueRange._Values = (Option[])valueRange._Values.Concat(values);
-                                        valueRange._Ranges = (Range[])valueRange._Ranges.Concat(ranges);
+                                        valueRange._Values = valueRange._Values.Concat(values).ToArray();
+                                        valueRange._Ranges = valueRange._Ranges.Concat(ranges).ToArray();
                                         if (bitField != null)
                                                 valueRange._BitFields.Push(bitField);