From 62179ae0663f9cf3416ebc188fd39acbf7d218f5 Mon Sep 17 00:00:00 2001 From: totoro Date: Wed, 15 Mar 2017 02:20:21 +0100 Subject: [PATCH] change the component name "action_name" into "ac_name" because it was same name as his alternative which makes compilation error --- ds_files/ds_types.anubis | 4 ++-- web/types/web_action_name.anubis | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ds_files/ds_types.anubis b/ds_files/ds_types.anubis index bfe07fb..26dbe8b 100644 --- a/ds_files/ds_types.anubis +++ b/ds_files/ds_types.anubis @@ -69,10 +69,10 @@ public define List(DS_Type) calexium_lib_types_description = ds_type("WEB_Action_Name", [ alternative("controller_action", [ component(string, "controller"), - component(string, "action_name") + component(string, "ac_name") ]), alternative("action_name", [ - component(string, "action_name") + component(string, "ac_name") ]), //url is raw action, hence we will only copy that url in final link diff --git a/web/types/web_action_name.anubis b/web/types/web_action_name.anubis index d3d44a6..2deda8f 100644 --- a/web/types/web_action_name.anubis +++ b/web/types/web_action_name.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-03-14 - * Time: 05:53:28 + * Date: 2017-03-15 + * Time: 02:17:19 * */ @@ -14,15 +14,15 @@ transmit tools/basis.anubis public type WEB_Action_Name: controller_action( String controller, - String action_name + String ac_name ), action_name( - String action_name + String ac_name ), //url is raw action, hence we will only copy that url in final link url( - String url_name + String url_name ) . @@ -40,18 +40,18 @@ public define Message if _web_action_name is { //Alternative controller_action - controller_action(_controller, _action_name) then + controller_action(_controller, _ac_name) then forget(add_string(_web_action_name_message, "__TYPE_ALT__", "controller_action")); // [type = String] controller_action.controller forget(add_string(_web_action_name_message, "controller", _controller)); - // [type = String] controller_action.action_name - forget(add_string(_web_action_name_message, "action_name", _action_name)), + // [type = String] controller_action.ac_name + forget(add_string(_web_action_name_message, "ac_name", _ac_name)), //Alternative action_name - action_name(_action_name) then + action_name(_ac_name) then forget(add_string(_web_action_name_message, "__TYPE_ALT__", "action_name")); - // [type = String] action_name.action_name - forget(add_string(_web_action_name_message, "action_name", _action_name)), + // [type = String] action_name.ac_name + forget(add_string(_web_action_name_message, "ac_name", _ac_name)), //Alternative url //url is raw action, hence we will only copy that url in final link @@ -76,17 +76,17 @@ public define Maybe(WEB_Action_Name) if __type_alt__ = "controller_action" then //Alternative controller_action // [type = String] controller_action.controller if find_string(_web_action_name_message, "controller") is {failure then failure, success(controller) then - // [type = String] controller_action.action_name - if find_string(_web_action_name_message, "action_name") is {failure then failure, success(action_name) then + // [type = String] controller_action.ac_name + if find_string(_web_action_name_message, "ac_name") is {failure then failure, success(ac_name) then - success(controller_action(controller, action_name)) + success(controller_action(controller, ac_name)) }} else //Alternative action_name if __type_alt__ = "action_name" then //Alternative action_name - // [type = String] action_name.action_name - if find_string(_web_action_name_message, "action_name") is {failure then failure, success(action_name) then + // [type = String] action_name.ac_name + if find_string(_web_action_name_message, "ac_name") is {failure then failure, success(ac_name) then - success(action_name(action_name)) + success(action_name(ac_name)) } else //Alternative url //url is raw action, hence we will only copy that url in final link -- libgit2 0.21.4