From 3fee013d29b159f953d8443b6c4eb11a4944342f Mon Sep 17 00:00:00 2001 From: totoro Date: Wed, 12 Apr 2017 23:15:38 +0200 Subject: [PATCH] manage the renaming of HK_List_View into HK_Viewer and HK_Edit_View into HK_Editor --- calexium_lib | 2 +- densaku_lib | 2 +- hayamiki_lib | 2 +- src/check.anubis | 14 +++++++------- src/generation/cxm_lib_menu.anubis | 2 +- src/generation/densaku.anubis | 7 ++++--- src/generation/edit_view_table_form.anubis | 36 +++++++++++++++++++++--------------- src/generation/hk_menu.anubis | 2 +- src/generation/html.anubis | 2 +- src/generation/vt_edit.anubis | 14 +++++++------- src/generation/vt_view.anubis | 12 ++++++------ src/model.3.0.0.anubis | 2 +- 12 files changed, 52 insertions(+), 45 deletions(-) diff --git a/calexium_lib b/calexium_lib index 891e24c..b3734f8 160000 --- a/calexium_lib +++ b/calexium_lib @@ -1 +1 @@ -Subproject commit 891e24cfc2eca3152e2cf33c5963979d963b7bae +Subproject commit b3734f8f0b4bf27ade1712f3c159380ddd828acb diff --git a/densaku_lib b/densaku_lib index aaa5024..e19a5e6 160000 --- a/densaku_lib +++ b/densaku_lib @@ -1 +1 @@ -Subproject commit aaa50241ac140b5441e8cfb34bd4e884a4828af7 +Subproject commit e19a5e659e24d4bf9c97e5a4f313f80a86414f5e diff --git a/hayamiki_lib b/hayamiki_lib index 7a53f1c..69ab626 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit 7a53f1c12572de03f815376ca5ee3b04590c962c +Subproject commit 69ab62634297a08d77f0be8147aaf1177ba61827 diff --git a/src/check.anubis b/src/check.anubis index a917156..c8ae46e 100644 --- a/src/check.anubis +++ b/src/check.anubis @@ -10,7 +10,7 @@ read hayamiki_lib/types/hayamiki.anubis read system/string.anubis read tools/list.anubis read tools/basis.anubis -transmit hayamiki_lib/view/types/hk_edit_view.anubis +transmit hayamiki_lib/view/types/hk_editor.anubis public define Maybe(List(String)) get_all_apps_name @@ -110,12 +110,12 @@ define Maybe(HK_FK_View) } . -define Maybe(HK_Edit_View) +define Maybe(HK_Editor) resolve_HK_Edit_View_foreign ( List(String) apps_name, //list of all knows app name String app_name, //current app name - HK_Edit_View _edit_view + HK_Editor _edit_view )= if _edit_view is { @@ -127,17 +127,17 @@ define Maybe(HK_Edit_View) failure then failure, success(n_fk_views) then success(edit_view_list_form(v, c, n_fk_views)) } - edit_view_table_form(v, t) then success(edit_view_table_form(v, t)) + form_table(v, t) then success(form_table(v, t)) } . -define Maybe(List(HK_Edit_View)) +define Maybe(List(HK_Editor)) resolve_foreign ( List(String) apps_name, //list of all knows app name String app_name, //current app name - List(HK_Edit_View) list_edits, //edit view to check - List(HK_Edit_View) so_far //already checked edit view + List(HK_Editor) list_edits, //edit view to check + List(HK_Editor) so_far //already checked edit view )= if list_edits is { diff --git a/src/generation/cxm_lib_menu.anubis b/src/generation/cxm_lib_menu.anubis index f8bebed..58e194e 100644 --- a/src/generation/cxm_lib_menu.anubis +++ b/src/generation/cxm_lib_menu.anubis @@ -46,7 +46,7 @@ define String map_append((HK_Table table) |-> since table is hk_table(table_name, short_name, model, display), since display is hk_display(list_views, _), - map((HK_List_View view ) |-> + map((HK_Viewer view ) |-> with view_name = if view is list_view(v_name, _, _) then v_name else "default", indent+" "+"menu_item("+ fill("\""+short_name+(if view_name="default" then "" else " "+view_name)+"\",",max_space)+ diff --git a/src/generation/densaku.anubis b/src/generation/densaku.anubis index 9d5366d..9472609 100644 --- a/src/generation/densaku.anubis +++ b/src/generation/densaku.anubis @@ -98,8 +98,8 @@ public define One read densaku_lib/types/densaku.anubis -public define List(DS_Type) hayamiki_types_list = - [\n")) +public define List(DS_Type_File) hayamiki_types_list = + [ ds_type_file(auto, auto, [\n")) } else unique @@ -119,7 +119,8 @@ public define One success(fd) then with strm = make_stream(fd), forget(write_string(strm, -" ] +" ]) + ] .\n")) } else diff --git a/src/generation/edit_view_table_form.anubis b/src/generation/edit_view_table_form.anubis index 2dd1c83..e0bd223 100644 --- a/src/generation/edit_view_table_form.anubis +++ b/src/generation/edit_view_table_form.anubis @@ -10,12 +10,22 @@ read hayamiki_lib/types/hayamiki.anubis read tools/streams.anubis read columns.anubis +define String + make_lines + ( + List(HK_Editor_Table_Line) lines, + List(HK_Model_Column) columns, + String table_name, + String indent + ). + public define String make_cell ( - HK_Edit_View_Table_Cell cell_description, // + HK_Editor_Table_Cell cell_description, // List(HK_Model_Column) columns, - String type_name + String type_name, + String indent )= if cell_description is { @@ -32,14 +42,10 @@ public define String } } label(label_str) then "label(\""+label_str+"\")" - cell(cells) then - "cell(\""+ - join(", ", - map((HK_Edit_View_Table_Cell _cell) - |-> - make_cell(_cell, columns, type_name), - cells))+ - ")" + table(lines) then + "cell(["+ + make_lines(lines, columns, type_name, indent)+ + "])" } . @@ -49,7 +55,7 @@ public define String public define String make_cells ( - List(HK_Edit_View_Table_Cell) cells, + List(HK_Editor_Table_Cell) cells, List(HK_Model_Column) columns, String table_name, String indent @@ -57,7 +63,7 @@ public define String if is_empty(cells) then "" else - "\n"+indent+ join(",\n"+indent, map((HK_Edit_View_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name) +")", cells)) + "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name, indent) +")", cells)) . @@ -75,7 +81,7 @@ public define String define String make_lines ( - List(HK_Edit_View_Table_Line) lines, + List(HK_Editor_Table_Line) lines, List(HK_Model_Column) columns, String table_name, String indent @@ -83,7 +89,7 @@ define String if is_empty(lines) then "" else - "\n"+indent+ join(",\n"+indent, map((HK_Edit_View_Table_Line line) |-> "hk_form_table_line(["+ make_cells(line.cells, columns, table_name, indent+" ") +"\n"+indent+"])", lines)) + "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Line line) |-> "hk_form_table_line(["+ make_cells(line.cells, columns, table_name, indent+" ") +"\n"+indent+"])", lines)) . @@ -96,7 +102,7 @@ public define Maybe(One) Stream stream, //stream file where to write HK_Table table, // String view_name, - HK_Edit_View_Table form_in_table //edit view to generate + HK_Editor_Table form_in_table //edit view to generate )= since table is hk_table(table_name, short_name, model, display), since model is hk_model( columns, _), diff --git a/src/generation/hk_menu.anubis b/src/generation/hk_menu.anubis index bcf7b49..828f1b4 100644 --- a/src/generation/hk_menu.anubis +++ b/src/generation/hk_menu.anubis @@ -41,7 +41,7 @@ define String map_append((HK_Table table) |-> since table is hk_table(table_name, short_name, model, display), since display is hk_display(list_views, _), - map((HK_List_View view ) |-> + map((HK_Viewer view ) |-> with view_name = if view is list_view(v_name, _, _) then v_name else "default", indent+" "+"hk_menu_item("+fill("\""+table_name+"\",",max_space)+ "\"view_table\", "+ fill("help_text(\""+short_name+(if view_name="default" then "" else " "+view_name)+"\"),",max_space)+ diff --git a/src/generation/html.anubis b/src/generation/html.anubis index 53fff34..415ea26 100644 --- a/src/generation/html.anubis +++ b/src/generation/html.anubis @@ -112,7 +112,7 @@ public define String HK_Table table, //table to format String data_name, //name of data String indent, //indentation string to use - HK_List_View list_view //list view to generate + HK_Viewer list_view //list view to generate )= since table is hk_table(table_name, short, model, _), //get name and model of the table since model is hk_model( columns, _), //get all columns of table diff --git a/src/generation/vt_edit.anubis b/src/generation/vt_edit.anubis index 1ecf22a..76e7da5 100644 --- a/src/generation/vt_edit.anubis +++ b/src/generation/vt_edit.anubis @@ -26,7 +26,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - HK_Edit_View edit_view //edit view to generate + HK_Editor edit_view //edit view to generate )= since table is hk_table(table_name, short_name, model, display), since model is hk_model( columns, _), @@ -49,7 +49,7 @@ public define Maybe(One) success(got_columns) then generate_edit_view_list_form(stream, table, v_name, got_columns, lfk) } - edit_view_table_form(v_name, table_description) then + form_table(v_name, table_description) then generate_edit_view_table_form(stream, table, v_name, table_description) //generate the table form @@ -67,7 +67,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - List(HK_Edit_View) edit_view, //edit view to generate + List(HK_Editor) edit_view, //edit view to generate Bool has_default //set to true if a default view was encountered. )= if edit_view is @@ -92,7 +92,7 @@ public define Maybe(One) edit_view_list_form(view_name, _, _) then //if not we search for view named 'default' if view_name = "default" then true else false - edit_view_table_form(view_name, _) then + form_table(view_name, _) then //if not we search for view named 'default' if view_name = "default" then true else false }, @@ -107,7 +107,7 @@ public define String _generate_get_editable_if_else ( String table_name, // - List(HK_Edit_View) edit_view, //edit view to generate + List(HK_Editor) edit_view, //edit view to generate String so_far )= if edit_view is @@ -121,7 +121,7 @@ public define String { edit_view_all then "default", edit_view_list_form(view_name, _, _) then view_name - edit_view_table_form(view_name, _) then view_name + form_table(view_name, _) then view_name }, _generate_get_editable_if_else( table_name, t, so_far + @@ -139,7 +139,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - List(HK_Edit_View) edit_view //list view to generate + List(HK_Editor) edit_view //list view to generate )= since table is hk_table(table_name, short_name, model, display), if write_string(stream, diff --git a/src/generation/vt_view.anubis b/src/generation/vt_view.anubis index b05587a..af1d696 100644 --- a/src/generation/vt_view.anubis +++ b/src/generation/vt_view.anubis @@ -106,7 +106,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - HK_List_View list_view //list view to generate + HK_Viewer list_view //list view to generate )= since table is hk_table(table_name, short_name, model, display), since model is hk_model( columns, _), @@ -182,7 +182,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - List(HK_List_View) list_view, //list view to generate + List(HK_Viewer) list_view, //list view to generate Bool has_default //set to true if a default view was encountered. )= if list_view is @@ -219,7 +219,7 @@ public define String _generate_get_viewable_if_else ( String table_name, // - List(HK_List_View) list_view, //list view to generate + List(HK_Viewer) list_view, //list view to generate String so_far )= if list_view is @@ -250,7 +250,7 @@ public define Maybe(One) ( Stream stream, //stream file where to write HK_Table table, // - List(HK_List_View) list_view //list view to generate + List(HK_Viewer) list_view //list view to generate )= since table is hk_table(table_name, short_name, model, display), if write_string(stream, @@ -273,7 +273,7 @@ public define List(String) */ _generate_list_view_name ( - List(HK_List_View) list_view, //list view to generate + List(HK_Viewer) list_view, //list view to generate List(String) so_far, Bool has_default //set to true if a default view was encountered. )= @@ -310,7 +310,7 @@ public define Maybe(One) ( Stream stream, HK_Table table, // - List(HK_List_View) list_view + List(HK_Viewer) list_view )= since table is hk_table(table_name, short_name, model, display), if write_string(stream, diff --git a/src/model.3.0.0.anubis b/src/model.3.0.0.anubis index 3f9ebbd..0677d33 100644 --- a/src/model.3.0.0.anubis +++ b/src/model.3.0.0.anubis @@ -577,7 +577,7 @@ public define HK_Table role_table = ], //list_edit [ edit_view_list_form("default", ["role_name", "description", "comments"]), - edit_view_table_form("table", + form_table("table", table([ line([label("role_name"), column("role_name")]), line([empty, column("description")]), -- libgit2 0.21.4