From aa1d8b530ed5b936a9375a253e0520cbd038bcfb Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 9 Apr 2017 02:21:17 +0200 Subject: [PATCH] add surrounding _ to list too. For more information, please read the previous commit --- model/types/hk_app.anubis | 6 +++--- model/types/hk_app_name.anubis | 2 +- model/types/hk_database.anubis | 6 +++--- model/types/hk_datetime_field_attr.anubis | 2 +- model/types/hk_help_text.anubis | 2 +- model/types/hk_icon.anubis | 2 +- model/types/hk_int_choice.anubis | 2 +- model/types/hk_int_choices.anubis | 6 +++--- model/types/hk_model.anubis | 6 +++--- model/types/hk_model_attr.anubis | 2 +- model/types/hk_model_column.anubis | 6 +++--- model/types/hk_model_field.anubis | 2 +- model/types/hk_table.anubis | 2 +- model/types/hk_text_choice.anubis | 2 +- model/types/hk_text_choices.anubis | 6 +++--- model/types/hk_text_field_attr.anubis | 2 +- view/types/hk_display.anubis | 10 +++++----- view/types/hk_edit_view.anubis | 8 ++++---- view/types/hk_edit_view_table.anubis | 6 +++--- view/types/hk_edit_view_table_cell.anubis | 2 +- view/types/hk_edit_view_table_line.anubis | 6 +++--- view/types/hk_fk_view.anubis | 2 +- view/types/hk_form.anubis | 2 +- view/types/hk_form_tab.anubis | 2 +- view/types/hk_form_table.anubis | 2 +- view/types/hk_form_table_cell.anubis | 4 ++-- view/types/hk_form_table_line.anubis | 2 +- view/types/hk_list_view.anubis | 4 ++-- 28 files changed, 53 insertions(+), 53 deletions(-) diff --git a/model/types/hk_app.anubis b/model/types/hk_app.anubis index 98f2af7..1663aad 100644 --- a/model/types/hk_app.anubis +++ b/model/types/hk_app.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -71,8 +71,8 @@ public define Maybe(HK_App) if find_message(_hk_app_message, "help") is {failure then failure, success(_help__msg) then if (Maybe(HK_Help_Text))from_Message(_help__msg) is {failure then failure, success(_help_) then // [type = List(HK_Table)] hk_app.hk_tables - with mb_hk_tables = map_escape(( Message msg ) |-> (Maybe(HK_Table)) from_Message(msg), find_messages(_hk_app_message, "hk_tables")), - if mb_hk_tables is {failure then failure, success(hk_tables) then + with mb__hk_tables_ = map_escape(( Message msg ) |-> (Maybe(HK_Table)) from_Message(msg), find_messages(_hk_app_message, "hk_tables")), + if mb__hk_tables_ is {failure then failure, success(_hk_tables_) then success(hk_app(_app_name_, _icon_, _help_, _hk_tables_)) }}}}}} diff --git a/model/types/hk_app_name.anubis b/model/types/hk_app_name.anubis index f096d82..31ed274 100644 --- a/model/types/hk_app_name.anubis +++ b/model/types/hk_app_name.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_database.anubis b/model/types/hk_database.anubis index 5974b42..80b7f5c 100644 --- a/model/types/hk_database.anubis +++ b/model/types/hk_database.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -57,8 +57,8 @@ public define Maybe(HK_Database) // [type = String] hk_database.name if find_string(_hk_database_message, "name") is {failure then failure, success(_name_) then // [type = List(HK_App)] hk_database.apps - with mb_apps = map_escape(( Message msg ) |-> (Maybe(HK_App)) from_Message(msg), find_messages(_hk_database_message, "apps")), - if mb_apps is {failure then failure, success(apps) then + with mb__apps_ = map_escape(( Message msg ) |-> (Maybe(HK_App)) from_Message(msg), find_messages(_hk_database_message, "apps")), + if mb__apps_ is {failure then failure, success(_apps_) then success(hk_database(_name_, _apps_)) }} diff --git a/model/types/hk_datetime_field_attr.anubis b/model/types/hk_datetime_field_attr.anubis index 53996b6..8063843 100644 --- a/model/types/hk_datetime_field_attr.anubis +++ b/model/types/hk_datetime_field_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_help_text.anubis b/model/types/hk_help_text.anubis index 78d9744..c439860 100644 --- a/model/types/hk_help_text.anubis +++ b/model/types/hk_help_text.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_icon.anubis b/model/types/hk_icon.anubis index 885156b..9b75856 100644 --- a/model/types/hk_icon.anubis +++ b/model/types/hk_icon.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_int_choice.anubis b/model/types/hk_int_choice.anubis index 8e24896..9772a63 100644 --- a/model/types/hk_int_choice.anubis +++ b/model/types/hk_int_choice.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_int_choices.anubis b/model/types/hk_int_choices.anubis index 2f588f4..c2e50f8 100644 --- a/model/types/hk_int_choices.anubis +++ b/model/types/hk_int_choices.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -60,8 +60,8 @@ public define Maybe(HK_Int_Choices) else //Alternative int_choices if __type_alt__ = "int_choices" then //Alternative int_choices // [type = List(HK_Int_Choice)] int_choices.hk_int_choice - with mb_hk_int_choice = map_escape(( Message msg ) |-> (Maybe(HK_Int_Choice)) from_Message(msg), find_messages(_hk_int_choices_message, "hk_int_choice")), - if mb_hk_int_choice is {failure then failure, success(hk_int_choice) then + with mb__hk_int_choice_ = map_escape(( Message msg ) |-> (Maybe(HK_Int_Choice)) from_Message(msg), find_messages(_hk_int_choices_message, "hk_int_choice")), + if mb__hk_int_choice_ is {failure then failure, success(_hk_int_choice_) then success(int_choices(_hk_int_choice_)) } diff --git a/model/types/hk_model.anubis b/model/types/hk_model.anubis index 8ea3a81..3ac6828 100644 --- a/model/types/hk_model.anubis +++ b/model/types/hk_model.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -55,8 +55,8 @@ public define Maybe(HK_Model) //Alternative hk_model if __type_alt__ = "hk_model" then //Alternative hk_model // [type = List(HK_Model_Column)] hk_model.columns - with mb_columns = map_escape(( Message msg ) |-> (Maybe(HK_Model_Column)) from_Message(msg), find_messages(_hk_model_message, "columns")), - if mb_columns is {failure then failure, success(columns) then + with mb__columns_ = map_escape(( Message msg ) |-> (Maybe(HK_Model_Column)) from_Message(msg), find_messages(_hk_model_message, "columns")), + if mb__columns_ is {failure then failure, success(_columns_) then // [type = String] hk_model.show_string if find_string(_hk_model_message, "show_string") is {failure then failure, success(_show_string_) then diff --git a/model/types/hk_model_attr.anubis b/model/types/hk_model_attr.anubis index eeca29e..70b6ac7 100644 --- a/model/types/hk_model_attr.anubis +++ b/model/types/hk_model_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_model_column.anubis b/model/types/hk_model_column.anubis index 882977d..3f9b1b2 100644 --- a/model/types/hk_model_column.anubis +++ b/model/types/hk_model_column.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -68,8 +68,8 @@ public define Maybe(HK_Model_Column) if find_message(_hk_model_column_message, "type") is {failure then failure, success(_type__msg) then if (Maybe(HK_Model_Field))from_Message(_type__msg) is {failure then failure, success(_type_) then // [type = List(HK_Model_Attr)] hk_column.attributes - with mb_attributes = map_escape(( Message msg ) |-> (Maybe(HK_Model_Attr)) from_Message(msg), find_messages(_hk_model_column_message, "attributes")), - if mb_attributes is {failure then failure, success(attributes) then + with mb__attributes_ = map_escape(( Message msg ) |-> (Maybe(HK_Model_Attr)) from_Message(msg), find_messages(_hk_model_column_message, "attributes")), + if mb__attributes_ is {failure then failure, success(_attributes_) then // [type = HK_Help_Text] hk_column.help if find_message(_hk_model_column_message, "help") is {failure then failure, success(_help__msg) then if (Maybe(HK_Help_Text))from_Message(_help__msg) is {failure then failure, success(_help_) then diff --git a/model/types/hk_model_field.anubis b/model/types/hk_model_field.anubis index 50ca6c9..c3890d7 100644 --- a/model/types/hk_model_field.anubis +++ b/model/types/hk_model_field.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_table.anubis b/model/types/hk_table.anubis index 948cd5d..c9e4aea 100644 --- a/model/types/hk_table.anubis +++ b/model/types/hk_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_text_choice.anubis b/model/types/hk_text_choice.anubis index f76d97e..b7a7c7e 100644 --- a/model/types/hk_text_choice.anubis +++ b/model/types/hk_text_choice.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/model/types/hk_text_choices.anubis b/model/types/hk_text_choices.anubis index bb8cbcf..878c39a 100644 --- a/model/types/hk_text_choices.anubis +++ b/model/types/hk_text_choices.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -60,8 +60,8 @@ public define Maybe(HK_Text_Choices) else //Alternative text_choices if __type_alt__ = "text_choices" then //Alternative text_choices // [type = List(HK_Text_Choice)] text_choices.hk_text_choice - with mb_hk_text_choice = map_escape(( Message msg ) |-> (Maybe(HK_Text_Choice)) from_Message(msg), find_messages(_hk_text_choices_message, "hk_text_choice")), - if mb_hk_text_choice is {failure then failure, success(hk_text_choice) then + with mb__hk_text_choice_ = map_escape(( Message msg ) |-> (Maybe(HK_Text_Choice)) from_Message(msg), find_messages(_hk_text_choices_message, "hk_text_choice")), + if mb__hk_text_choice_ is {failure then failure, success(_hk_text_choice_) then success(text_choices(_hk_text_choice_)) } diff --git a/model/types/hk_text_field_attr.anubis b/model/types/hk_text_field_attr.anubis index a1bdf37..652e1f6 100644 --- a/model/types/hk_text_field_attr.anubis +++ b/model/types/hk_text_field_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_display.anubis b/view/types/hk_display.anubis index df43e03..520b7bc 100644 --- a/view/types/hk_display.anubis +++ b/view/types/hk_display.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -56,11 +56,11 @@ public define Maybe(HK_Display) //Alternative hk_display if __type_alt__ = "hk_display" then //Alternative hk_display // [type = List(HK_List_View)] hk_display.list_views - with mb_list_views = map_escape(( Message msg ) |-> (Maybe(HK_List_View)) from_Message(msg), find_messages(_hk_display_message, "list_views")), - if mb_list_views is {failure then failure, success(list_views) then + with mb__list_views_ = map_escape(( Message msg ) |-> (Maybe(HK_List_View)) from_Message(msg), find_messages(_hk_display_message, "list_views")), + if mb__list_views_ is {failure then failure, success(_list_views_) then // [type = List(HK_Edit_View)] hk_display.list_edits - with mb_list_edits = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View)) from_Message(msg), find_messages(_hk_display_message, "list_edits")), - if mb_list_edits is {failure then failure, success(list_edits) then + with mb__list_edits_ = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View)) from_Message(msg), find_messages(_hk_display_message, "list_edits")), + if mb__list_edits_ is {failure then failure, success(_list_edits_) then success(hk_display(_list_views_, _list_edits_)) }} diff --git a/view/types/hk_edit_view.anubis b/view/types/hk_edit_view.anubis index cbdb0d5..76bfd07 100644 --- a/view/types/hk_edit_view.anubis +++ b/view/types/hk_edit_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -81,10 +81,10 @@ public define Maybe(HK_Edit_View) // [type = String] edit_view_list_form.view_name if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(_view_name_) then // [type = List(String)] edit_view_list_form.columns - with columns = find_string_list(_hk_edit_view_message, "columns"), + with _columns_ = find_string_list(_hk_edit_view_message, "columns"), // [type = List(HK_FK_View)] edit_view_list_form.fk_view - with mb_fk_view = map_escape(( Message msg ) |-> (Maybe(HK_FK_View)) from_Message(msg), find_messages(_hk_edit_view_message, "fk_view")), - if mb_fk_view is {failure then failure, success(fk_view) then + with mb__fk_view_ = map_escape(( Message msg ) |-> (Maybe(HK_FK_View)) from_Message(msg), find_messages(_hk_edit_view_message, "fk_view")), + if mb__fk_view_ is {failure then failure, success(_fk_view_) then success(edit_view_list_form(_view_name_, _columns_, _fk_view_)) }} diff --git a/view/types/hk_edit_view_table.anubis b/view/types/hk_edit_view_table.anubis index 462461d..f2fa4f5 100644 --- a/view/types/hk_edit_view_table.anubis +++ b/view/types/hk_edit_view_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -52,8 +52,8 @@ public define Maybe(HK_Edit_View_Table) //Alternative table if __type_alt__ = "table" then //Alternative table // [type = List(HK_Edit_View_Table_Line)] table.lines - with mb_lines = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "lines")), - if mb_lines is {failure then failure, success(lines) then + with mb__lines_ = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "lines")), + if mb__lines_ is {failure then failure, success(_lines_) then success(table(_lines_)) } diff --git a/view/types/hk_edit_view_table_cell.anubis b/view/types/hk_edit_view_table_cell.anubis index 0b1dd6a..486bca3 100644 --- a/view/types/hk_edit_view_table_cell.anubis +++ b/view/types/hk_edit_view_table_cell.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_edit_view_table_line.anubis b/view/types/hk_edit_view_table_line.anubis index af79457..f730614 100644 --- a/view/types/hk_edit_view_table_line.anubis +++ b/view/types/hk_edit_view_table_line.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -52,8 +52,8 @@ public define Maybe(HK_Edit_View_Table_Line) //Alternative line if __type_alt__ = "line" then //Alternative line // [type = List(HK_Edit_View_Table_Cell)] line.cells - with mb_cells = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_line_message, "cells")), - if mb_cells is {failure then failure, success(cells) then + with mb__cells_ = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_line_message, "cells")), + if mb__cells_ is {failure then failure, success(_cells_) then success(line(_cells_)) } diff --git a/view/types/hk_fk_view.anubis b/view/types/hk_fk_view.anubis index 39e1b03..f28cd4f 100644 --- a/view/types/hk_fk_view.anubis +++ b/view/types/hk_fk_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_form.anubis b/view/types/hk_form.anubis index 0a4be38..61553c8 100644 --- a/view/types/hk_form.anubis +++ b/view/types/hk_form.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_form_tab.anubis b/view/types/hk_form_tab.anubis index 2ddf87d..fadc185 100644 --- a/view/types/hk_form_tab.anubis +++ b/view/types/hk_form_tab.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_form_table.anubis b/view/types/hk_form_table.anubis index bbed390..c33f610 100644 --- a/view/types/hk_form_table.anubis +++ b/view/types/hk_form_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_form_table_cell.anubis b/view/types/hk_form_table_cell.anubis index 5ccce58..05587bc 100644 --- a/view/types/hk_form_table_cell.anubis +++ b/view/types/hk_form_table_cell.anubis @@ -1,8 +1,8 @@ -/* +/* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_form_table_line.anubis b/view/types/hk_form_table_line.anubis index 757d67e..05c70a4 100644 --- a/view/types/hk_form_table_line.anubis +++ b/view/types/hk_form_table_line.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ diff --git a/view/types/hk_list_view.anubis b/view/types/hk_list_view.anubis index 9e6aaa6..ea22aa9 100644 --- a/view/types/hk_list_view.anubis +++ b/view/types/hk_list_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-09 - * Time: 00:57:36 + * Time: 02:17:12 * */ @@ -68,7 +68,7 @@ public define Maybe(HK_List_View) // [type = String] list_view.view_name if find_string(_hk_list_view_message, "view_name") is {failure then failure, success(_view_name_) then // [type = List(String)] list_view.columns - with columns = find_string_list(_hk_list_view_message, "columns"), + with _columns_ = find_string_list(_hk_list_view_message, "columns"), // [type = WEB_Action_Name] list_view.link_id_action if find_message(_hk_list_view_message, "link_id_action") is {failure then failure, success(_link_id_action__msg) then if (Maybe(WEB_Action_Name))from_Message(_link_id_action__msg) is {failure then failure, success(_link_id_action_) then -- libgit2 0.21.4