plan to merge

Rabbit-Converter · May 18, 2020 · 017dbb2 · 017dbb2
1 parent 7a1b750
commit 017dbb2
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 66 deletions.
diff --git a/Packages/Elixir b/Packages/Elixir
diff --git a/Packages/Go b/Packages/Go
diff --git a/Packages/Node b/Packages/Node
diff --git a/Packages/Objc b/Packages/Objc
diff --git a/Packages/PHP b/Packages/PHP
diff --git a/Packages/Swift b/Packages/Swift
diff --git a/Packages/ruby b/Packages/ruby
diff --git a/other-lang/csharp/Rabbit.cs b/other-lang/csharp/Rabbit.cs
diff --git a/other-lang/dart/rabbit.dart b/other-lang/dart/rabbit.dart
@@ -195,7 +195,7 @@ class Rabbit {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031#1#2#3"
     },
     {
@@ -306,6 +306,10 @@ class Rabbit {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "#1\u102C#2"
@@ -494,7 +498,7 @@ class Rabbit {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "#1\u103c#2"
     },
     {
@@ -510,7 +514,7 @@ class Rabbit {
         "to": "\u1004\u103a\u1039#1#2#3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039#1#2#3\u1036"
     },
     {

diff --git a/other-lang/elixir/Rabbit.ex b/other-lang/elixir/Rabbit.ex
diff --git a/other-lang/go/rabbit.go b/other-lang/go/rabbit.go
@@ -205,7 +205,7 @@ func Uni2zg(str string) string  {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031$1$2$3"
     },
     {
@@ -316,6 +316,10 @@ func Uni2zg(str string) string  {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "$1\u102C$2"
@@ -505,7 +509,7 @@ func Zg2uni(str string) string  {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "$1\u103c$2"
     },
     {
@@ -521,7 +525,7 @@ func Zg2uni(str string) string  {
         "to": "\u1004\u103a\u1039$1$2$3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039$1$2$3\u1036"
     },
     {

diff --git a/other-lang/java/com/comquas/rabbit/Rabbit.java b/other-lang/java/com/comquas/rabbit/Rabbit.java
diff --git a/other-lang/javascript/rabbit.js b/other-lang/javascript/rabbit.js
@@ -198,7 +198,7 @@ function uni2zg(output) {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031$1$2$3"
     },
     {
@@ -309,6 +309,10 @@ function uni2zg(output) {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "$1\u102C$2"
@@ -497,7 +501,7 @@ function zg2uni(output) {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "$1\u103c$2"
     },
     {
@@ -513,7 +517,7 @@ function zg2uni(output) {
         "to": "\u1004\u103a\u1039$1$2$3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039$1$2$3\u1036"
     },
     {

diff --git a/other-lang/kotlin/Rabbit.kt b/other-lang/kotlin/Rabbit.kt
@@ -49,7 +49,7 @@ object Rabbit {
 "ရ(?=([ိီ]?)[ုူွႊ])" to "႐",
 "ဏ္ဍ" to "႑",
 "ဋ္ဋ" to "႗",
-"([က-အႏဩၮၯႆ႐႑႒႗])([ၠ-ၩၬၭၰ-ၼႅႊ])?([ျ-ှ]*)?ေ" to "ေ$1$2$3",
+"([က-အႏဩၪၮၯႆ႐႑႒႗])([ၠ-ၩၬၭၰ-ၼႅႊ])?([ျ-ှ]*)?ေ" to "ေ$1$2$3",
 "ြှ" to "ြႇ",
 "([က-အႏဩ])([ၠ-ၩၬၭၰ-ၼႅ])?(ြ)" to "$3$1$2",
 "်" to "္",
@@ -77,6 +77,7 @@ object Rabbit {
 "်([ြႊ])" to "$1ၽ",
 "([ဳဴ])(ံ?)႔" to "$1$2႕",
 "ႏၱ" to "ႏၲ",
+"ႏၳ" to "ႏၴ",
 "([က-အ])([ၻၦ])ာ" to "$1ာ$2",
 "ာ([ၻၦ])့" to "ာ$1႔",
 "၇((?=[က-အ]္)|(?=[ာ-ူဲံ-းြွ]))" to "ရ"
@@ -125,11 +126,11 @@ object Rabbit {
 "ႉ" to "ှူ",
 "ႊ" to "ွှ",
 "ျၤ" to "ၤျ",
-"ြ([က-အ])(ၤ|ႋ)" to "$1ြ$2",
+"ြ([က-အ])([ၤႋႍ])" to "$1ြ$2",
 "(ေ)?([က-အ၀-၉])(ြ)?ၤ" to "င်္$1$2$3",
 "(ေ)?([က-အ])(ျ|ြ)?ႋ" to "င်္$1$2$3ိ",
 "(ေ)?([က-အ])(ျ)?ႌ" to "င်္$1$2$3ီ",
-"(ေ)?([က-အ])(ျ)?ႍ" to "င်္$1$2$3ံ",
+"(ေ)?([က-အ])([ျြ])?ႍ" to "င်္$1$2$3ံ",
 "ႎ" to "ိံ",
 "ႏ" to "န",
 "႐" to "ရ",

diff --git a/other-lang/objective-c/Rabbit.m b/other-lang/objective-c/Rabbit.m
diff --git a/other-lang/php/Rabbit.php b/other-lang/php/Rabbit.php
diff --git a/other-lang/python/Rabbit.py b/other-lang/python/Rabbit.py
diff --git a/other-lang/ruby/Rabbit.rb b/other-lang/ruby/Rabbit.rb
diff --git a/other-lang/swift4/Rabbit.swift b/other-lang/swift4/Rabbit.swift
diff --git a/rabbit.js b/rabbit.js
@@ -198,7 +198,7 @@ function uni2zg(output) {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031$1$2$3"
     },
     {
@@ -309,6 +309,10 @@ function uni2zg(output) {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "$1\u102C$2"
@@ -497,7 +501,7 @@ function zg2uni(output) {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "$1\u103c$2"
     },
     {
@@ -513,7 +517,7 @@ function zg2uni(output) {
         "to": "\u1004\u103a\u1039$1$2$3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039$1$2$3\u1036"
     },
     {

diff --git a/source/output/csharp/Rabbit.cs b/source/output/csharp/Rabbit.cs
diff --git a/source/output/dart/rabbit.dart b/source/output/dart/rabbit.dart
@@ -195,7 +195,7 @@ class Rabbit {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031#1#2#3"
     },
     {
@@ -306,6 +306,10 @@ class Rabbit {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "#1\u102C#2"
@@ -494,7 +498,7 @@ class Rabbit {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "#1\u103c#2"
     },
     {
@@ -510,7 +514,7 @@ class Rabbit {
         "to": "\u1004\u103a\u1039#1#2#3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039#1#2#3\u1036"
     },
     {

diff --git a/source/output/elixir/Rabbit.ex b/source/output/elixir/Rabbit.ex
diff --git a/source/output/go/rabbit.go b/source/output/go/rabbit.go
@@ -205,7 +205,7 @@ func Uni2zg(str string) string  {
         "to": "\u1097"
     },
     {
-        "from": "([\u1000-\u1021\u108f\u1029\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
+        "from": "([\u1000-\u1021\u108f\u1029\u106a\u106e\u106f\u1086\u1090\u1091\u1092\u1097])([\u1060-\u1069\u106c\u106d\u1070-\u107c\u1085\u108a])?([\u103b-\u103e]*)?\u1031",
         "to": "\u1031$1$2$3"
     },
     {
@@ -316,6 +316,10 @@ func Uni2zg(str string) string  {
       "from": "\u108F\u1071",
       "to" : "\u108F\u1072"
     },
+    {
+        "from": "\u108F\u1073",
+        "to" : "\u108F\u1074"
+      },
     {
       "from": "([\u1000-\u1021])([\u107B\u1066])\u102C",
       "to": "$1\u102C$2"
@@ -505,7 +509,7 @@ func Zg2uni(str string) string  {
         "to": "\u1064\u103B"
     },
     {
-        "from": "\u103c([\u1000-\u1021])(\u1064|\u108b)",
+        "from": "\u103c([\u1000-\u1021])([\u1064\u108b\u108d])",
         "to": "$1\u103c$2"
     },
     {
@@ -521,7 +525,7 @@ func Zg2uni(str string) string  {
         "to": "\u1004\u103a\u1039$1$2$3\u102e"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])(\u103b)?\u108d",
+        "from": "(\u1031)?([\u1000-\u1021])([\u103b\u103c])?\u108d",
         "to": "\u1004\u103a\u1039$1$2$3\u1036"
     },
     {