Anubis / Xlib

Commit 62179ae0663f9cf3416ebc188fd39acbf7d218f5

Authored by totoro
1 parent 6bc08448

change the component name "action_name" into "ac_name" because it was same name … 

…as his alternative which makes compilation error
Showing 2 changed files with 19 additions and 19 deletions   Show diff stats
Inline Side-by-side
ds_files/ds_types.anubis
  Show/Hide comments   View file @62179ae
... ... @@ -69,10 +69,10 @@ public define List(DS_Type) calexium_lib_types_description =
69 69 ds_type("WEB_Action_Name", [
70 70 alternative("controller_action", [
71 71 component(string, "controller"),
72   - component(string, "action_name")
  72 + component(string, "ac_name")
73 73 ]),
74 74 alternative("action_name", [
75   - component(string, "action_name")
  75 + component(string, "ac_name")
76 76 ]),
77 77  
78 78 //url is raw action, hence we will only copy that url in final link
... ...
web/types/web_action_name.anubis
  Show/Hide comments   View file @62179ae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-03-14
5   - * Time: 05:53:28
  4 + * Date: 2017-03-15
  5 + * Time: 02:17:19
6 6 *
7 7 */
8 8  
... ... @@ -14,15 +14,15 @@ transmit tools/basis.anubis
14 14 public type WEB_Action_Name:
15 15 controller_action(
16 16 String controller,
17   - String action_name
  17 + String ac_name
18 18 ),
19 19 action_name(
20   - String action_name
  20 + String ac_name
21 21 ),
22 22 //url is raw action, hence we will only copy that url in final link
23 23  
24 24 url(
25   - String url_name
  25 + String url_name
26 26 )
27 27 .
28 28  
... ... @@ -40,18 +40,18 @@ public define Message
40 40 if _web_action_name is
41 41 {
42 42 //Alternative controller_action
43   - controller_action(_controller, _action_name) then
  43 + controller_action(_controller, _ac_name) then
44 44 forget(add_string(_web_action_name_message, "__TYPE_ALT__", "controller_action"));
45 45 // [type = String] controller_action.controller
46 46 forget(add_string(_web_action_name_message, "controller", _controller));
47   - // [type = String] controller_action.action_name
48   - forget(add_string(_web_action_name_message, "action_name", _action_name)),
  47 + // [type = String] controller_action.ac_name
  48 + forget(add_string(_web_action_name_message, "ac_name", _ac_name)),
49 49  
50 50 //Alternative action_name
51   - action_name(_action_name) then
  51 + action_name(_ac_name) then
52 52 forget(add_string(_web_action_name_message, "__TYPE_ALT__", "action_name"));
53   - // [type = String] action_name.action_name
54   - forget(add_string(_web_action_name_message, "action_name", _action_name)),
  53 + // [type = String] action_name.ac_name
  54 + forget(add_string(_web_action_name_message, "ac_name", _ac_name)),
55 55  
56 56 //Alternative url
57 57 //url is raw action, hence we will only copy that url in final link
... ... @@ -76,17 +76,17 @@ public define Maybe(WEB_Action_Name)
76 76 if __type_alt__ = "controller_action" then //Alternative controller_action
77 77 // [type = String] controller_action.controller
78 78 if find_string(_web_action_name_message, "controller") is {failure then failure, success(controller) then
79   - // [type = String] controller_action.action_name
80   - if find_string(_web_action_name_message, "action_name") is {failure then failure, success(action_name) then
  79 + // [type = String] controller_action.ac_name
  80 + if find_string(_web_action_name_message, "ac_name") is {failure then failure, success(ac_name) then
81 81  
82   - success(controller_action(controller, action_name))
  82 + success(controller_action(controller, ac_name))
83 83 }}
84 84 else //Alternative action_name
85 85 if __type_alt__ = "action_name" then //Alternative action_name
86   - // [type = String] action_name.action_name
87   - if find_string(_web_action_name_message, "action_name") is {failure then failure, success(action_name) then
  86 + // [type = String] action_name.ac_name
  87 + if find_string(_web_action_name_message, "ac_name") is {failure then failure, success(ac_name) then
88 88  
89   - success(action_name(action_name))
  89 + success(action_name(ac_name))
90 90 }
91 91 else //Alternative url
92 92 //url is raw action, hence we will only copy that url in final link
... ...