Changeset 425 for EcnlProtoTool/trunk/webapp/webmrbc/Ecnl
- Timestamp:
- May 29, 2020, 10:45:52 PM (4 years ago)
- Location:
- EcnlProtoTool/trunk/webapp/webmrbc/Ecnl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
EcnlProtoTool/trunk/webapp/webmrbc/Ecnl/CodeGenerator.cs
r321 r425 40 40 using System.Text; 41 41 using Bridge; 42 using Bridge. Text.RegularExpressions;42 using Bridge.Html5; 43 43 44 44 namespace WebMrbc … … 61 61 result = result.Substring(0, result.Length - 4); 62 62 63 if (!new Reg ex("^[A-Z][A-Za-z0-9_]+$").Test(result)) {63 if (!new RegExp("^[A-Z][A-Za-z0-9_]+$").Test(result)) { 64 64 result = String.Format("Cls{0:X2}{1:X2}", cls.classGroup.classGroupCode, cls.classCode); 65 65 } … … 74 74 string result = fi.identifier; 75 75 76 if (!new Reg ex("^[A-Za-z_][A-Za-z0-9_]+$").Test(result)) {76 if (!new RegExp("^[A-Za-z_][A-Za-z0-9_]+$").Test(result)) { 77 77 result = String.Format("property{0:X2}", pi.propertyCode); 78 78 } 79 79 else { 80 var reg = new Reg ex("[A-Z][a-z]+", "g");80 var reg = new RegExp("[A-Z][a-z]+", "g"); 81 81 string[] m; 82 82 if ((m = reg.Exec(result)) != null) { -
EcnlProtoTool/trunk/webapp/webmrbc/Ecnl/EObjectBlock.cs
r321 r425 40 40 using System.Text; 41 41 using Bridge; 42 using Bridge.Linq;43 42 using Bridge.Html5; 44 43 -
EcnlProtoTool/trunk/webapp/webmrbc/Ecnl/ValueRange.cs
r321 r425 40 40 using System.Collections.Generic; 41 41 using Bridge; 42 using Bridge. Text.RegularExpressions;42 using Bridge.Html5; 43 43 44 44 namespace WebMrbc … … 412 412 int pos = 0; 413 413 while (pos < input.Length) { 414 Reg exms;414 RegExp ms; 415 415 string[] m; 416 if ((m = (ms = new Reg ex(TokenInfo.HexValue)).Exec(input.Substring(pos))) != null) {416 if ((m = (ms = new RegExp(TokenInfo.HexValue)).Exec(input.Substring(pos))) != null) { 417 417 tokens.Push(new TokenInfo(m[0], TokenType.HexValue)); 418 418 pos += m[0].Length; 419 419 } 420 else if ((m = (ms = new Reg ex(TokenInfo.Numeric)).Exec(input.Substring(pos))) != null) {420 else if ((m = (ms = new RegExp(TokenInfo.Numeric)).Exec(input.Substring(pos))) != null) { 421 421 tokens.Push(new TokenInfo(m[0], TokenType.Numeric)); 422 422 pos += m[0].Length; 423 423 } 424 424 else { 425 if ((m = (ms = new Reg ex(TokenInfo.Separetor)).Exec(input.Substring(pos))) == null) {425 if ((m = (ms = new RegExp(TokenInfo.Separetor)).Exec(input.Substring(pos))) == null) { 426 426 tokens.Push(new TokenInfo(input.Substring(pos), TokenType.String)); 427 427 break; … … 747 747 748 748 if (emti.primitive) { 749 string[] lines = valrng.Split(new Reg ex("\r\n"));749 string[] lines = valrng.Split(new RegExp("\r\n")); 750 750 foreach (string line in lines) { 751 if (new Reg ex("^<(.+)>$").Test(line))751 if (new RegExp("^<(.+)>$").Test(line)) 752 752 continue; 753 753 … … 773 773 } 774 774 775 valueRange._Values = (Option[])valueRange._Values.Concat(values);776 valueRange._Ranges = (Range[])valueRange._Ranges.Concat(ranges);775 valueRange._Values = valueRange._Values.Concat(values).ToArray(); 776 valueRange._Ranges = valueRange._Ranges.Concat(ranges).ToArray(); 777 777 if (bitField != null) 778 778 valueRange._BitFields.Push(bitField);
Note:
See TracChangeset
for help on using the changeset viewer.