From 79d329348f5b838a2258bcfb6803ee21753d95f9 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 24 Mar 2020 21:40:31 +0800 Subject: [PATCH] =?UTF-8?q?erlang=E9=85=8D=E7=BD=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_excel/server/cfg_array_example1.erl | 182 ++++++++++----------- config_excel/server/cfg_array_example2.erl | 60 +++---- src/writer_erlang_erl.py | 4 +- 3 files changed, 123 insertions(+), 123 deletions(-) diff --git a/config_excel/server/cfg_array_example1.erl b/config_excel/server/cfg_array_example1.erl index 220aee5..9cebcd3 100644 --- a/config_excel/server/cfg_array_example1.erl +++ b/config_excel/server/cfg_array_example1.erl @@ -10,145 +10,145 @@ get(1001, <<"pos1">>, 88, 1) -> #cfg_array_example1{ 'id' = 1001 - ,'str' = <<"pos1">> - ,'level' = 88 - ,'sub_level' = 1 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"从小城镇">> - }; + , 'str' = <<"pos1">> + , 'level' = 88 + , 'sub_level' = 1 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"从小城镇">> +}; get(1001, <<"pos1">>, 88, 2) -> #cfg_array_example1{ 'id' = 1001 - ,'str' = <<"pos1">> - ,'level' = 88 - ,'sub_level' = 2 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 88 + , 'sub_level' = 2 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1001, <<"pos1">>, 89, 89) -> #cfg_array_example1{ 'id' = 1001 - ,'str' = <<"pos1">> - ,'level' = 89 - ,'sub_level' = 89 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 89 + , 'sub_level' = 89 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1001, <<"pos2">>, 88, 88.9) -> #cfg_array_example1{ 'id' = 1001 - ,'str' = <<"pos2">> - ,'level' = 88 - ,'sub_level' = 88.9 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos2">> + , 'level' = 88 + , 'sub_level' = 88.9 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1001, <<"pos2">>, 89, 89) -> #cfg_array_example1{ 'id' = 1001 - ,'str' = <<"pos2">> - ,'level' = 89 - ,'sub_level' = 89 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos2">> + , 'level' = 89 + , 'sub_level' = 89 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos1">>, 88, 88) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos1">> - ,'level' = 88 - ,'sub_level' = 88 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 901]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 88 + , 'sub_level' = 88 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 901]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos1">>, 89, 89) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos1">> - ,'level' = 89 - ,'sub_level' = 89 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 89 + , 'sub_level' = 89 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos1">>, 90, 90) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos1">> - ,'level' = 90 - ,'sub_level' = 90 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 901]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 90 + , 'sub_level' = 90 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 901]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos2">>, 88, 88) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos2">> - ,'level' = 88 - ,'sub_level' = 88 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 901]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos2">> + , 'level' = 88 + , 'sub_level' = 88 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 901]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos2">>, 89, 89) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos2">> - ,'level' = 89 - ,'sub_level' = 89 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 900]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos2">> + , 'level' = 89 + , 'sub_level' = 89 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 900]] + , 'desc1' = <<"有钱就可以买">> +}; get(1002, <<"pos2">>, 90, 90) -> #cfg_array_example1{ 'id' = 1002 - ,'str' = <<"pos2">> - ,'level' = 90 - ,'sub_level' = 90 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 901]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos2">> + , 'level' = 90 + , 'sub_level' = 90 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 901]] + , 'desc1' = <<"有钱就可以买">> +}; get(1003, <<"pos1">>, 85, 85) -> #cfg_array_example1{ 'id' = 1003 - ,'str' = <<"pos1">> - ,'level' = 85 - ,'sub_level' = 85 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 902]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 85 + , 'sub_level' = 85 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 902]] + , 'desc1' = <<"有钱就可以买">> +}; get(1004, <<"pos1">>, 80, 80) -> #cfg_array_example1{ 'id' = 1004 - ,'str' = <<"pos1">> - ,'level' = 80 - ,'sub_level' = 80 - ,'name' = <<"黑切+蓝盾">> - ,'attr' = [[1, 700], [2, 800], [3, 903]] - ,'desc1' = <<"有钱就可以买">> - }; + , 'str' = <<"pos1">> + , 'level' = 80 + , 'sub_level' = 80 + , 'name' = <<"黑切+蓝盾">> + , 'attr' = [[1, 700], [2, 800], [3, 903]] + , 'desc1' = <<"有钱就可以买">> +}; get(_, _, _, _) -> undefined. diff --git a/config_excel/server/cfg_array_example2.erl b/config_excel/server/cfg_array_example2.erl index 17cf010..cd4fec1 100644 --- a/config_excel/server/cfg_array_example2.erl +++ b/config_excel/server/cfg_array_example2.erl @@ -10,52 +10,52 @@ get(1) -> #cfg_array_example2{ 'id' = 1 - ,'name' = <<"examp1001">> - ,'material' = [#{'res' => 1, 'id' => 10001, 'count' => 1}, #{'res' => 1, 'id' => 10001, 'count' => 1}] - ,'attr' = [[1, 700], [2, 800], [3, 900], #{'add' => [4, 100]}] - ,'award1' = {1, 2, 3} - ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} - }; + , 'name' = <<"examp1001">> + , 'material' = [#{'res' => 1, 'id' => 10001, 'count' => 1}, #{'res' => 1, 'id' => 10001, 'count' => 1}] + , 'attr' = [[1, 700], [2, 800], [3, 900], #{'add' => [4, 100]}] + , 'award1' = {1, 2, 3} + , 'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} +}; get(2) -> #cfg_array_example2{ 'id' = 2 - ,'name' = <<"examp1002">> - ,'material' = #{'res' => 1, 'id' => 10001, 'count' => 1} - ,'attr' = [[1, 700], [2, 800], [3, 901], #{'add' => [5, 100]}] - ,'award1' = {1, 2, 3} - ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} - }; + , 'name' = <<"examp1002">> + , 'material' = #{'res' => 1, 'id' => 10001, 'count' => 1} + , 'attr' = [[1, 700], [2, 800], [3, 901], #{'add' => [5, 100]}] + , 'award1' = {1, 2, 3} + , 'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} +}; get(3) -> #cfg_array_example2{ 'id' = 3 - ,'name' = <<"examp1003">> - ,'material' = [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9] - ,'attr' = [[1, 700], [2, 800], [3, 902], #{'add' => [6, 100]}] - ,'award1' = {1, 2, 3} - ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} - }; + , 'name' = <<"examp1003">> + , 'material' = [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9] + , 'attr' = [[1, 700], [2, 800], [3, 902], #{'add' => [6, 100]}] + , 'award1' = {1, 2, 3} + , 'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} +}; get(4) -> #cfg_array_example2{ 'id' = 4 - ,'name' = <<"examp1004">> - ,'material' = [<<"测试数据">>, <<"测试数据2">>, <<"测试数据3">>] - ,'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] - ,'award1' = {1, 2, 3} - ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} - }; + , 'name' = <<"examp1004">> + , 'material' = [<<"测试数据">>, <<"测试数据2">>, <<"测试数据3">>] + , 'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] + , 'award1' = {1, 2, 3} + , 'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} +}; get(5) -> #cfg_array_example2{ 'id' = 5 - ,'name' = <<"examp1004">> - ,'material' = [<<"test">>] - ,'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] - ,'award1' = {1, 2, 3} - ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} - }; + , 'name' = <<"examp1004">> + , 'material' = [<<"test">>] + , 'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] + , 'award1' = {1, 2, 3} + , 'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} +}; get(_) -> undefined. diff --git a/src/writer_erlang_erl.py b/src/writer_erlang_erl.py index 12280c1..ee05906 100644 --- a/src/writer_erlang_erl.py +++ b/src/writer_erlang_erl.py @@ -112,8 +112,8 @@ class ErlangerlWriter(Writer): value_list.append( oneval ) - value_list_str = " ,".join(value_list) - end_str = "".join( [key, value_list_str, " };\n\n"] ) + value_list_str = " , ".join(value_list) + end_str = "".join( [key, value_list_str, "};\n\n"] ) list_text_list.append( end_str )