From 6edd71c52b3216d7339106b2cb0015d921ad8895 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 21 Feb 2016 02:16:34 +0100 Subject: [PATCH] remove all warning during compilation --- database/db_types.anubis | 2 +- web/CXM_dojo.anubis | 9 ++++----- web/CXM_form.anubis | 8 ++++---- web/CXM_jquery.anubis | 4 ++-- web/CXM_making_a_web_site.anubis | 4 ++-- web/CXM_multihost_http_server.anubis | 8 ++++---- web/CXM_web_arg_utils.anubis | 2 +- web/jQuery/CXM_jquery_button.anubis | 10 +++++----- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/database/db_types.anubis b/database/db_types.anubis index 408aeb5..857ea4e 100644 --- a/database/db_types.anubis +++ b/database/db_types.anubis @@ -33,7 +33,7 @@ public define String if idx is { none then "none", - db_id(idx) then abs_to_decimal(idx) + db_id(_idx) then abs_to_decimal(_idx) }. public define String diff --git a/web/CXM_dojo.anubis b/web/CXM_dojo.anubis index 768a8ca..eca45cf 100644 --- a/web/CXM_dojo.anubis +++ b/web/CXM_dojo.anubis @@ -824,9 +824,8 @@ public define List(HTML_Head_Tag) String theme_name ) = - with theme_name = - if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro", - [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")) . - [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+"_rtl.css")) . dojo_defaults ] - ] + with _theme_name = if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro", + [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+".css")) . + [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+"_rtl.css")) . dojo_defaults ] + ] . diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis index 6ebd292..4499f7e 100644 --- a/web/CXM_form.anubis +++ b/web/CXM_form.anubis @@ -434,8 +434,8 @@ public define HTML_In_Form map( ((WebArgValue, String) item) |-> i <- *i + 1; if item is (wav, item_label) then - with id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i), - div([class(itemclass)], radio_button_r(options, item_label, id, wan, wav, + with _id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i), + div([class(itemclass)], radio_button_r(options, item_label, _id, wan, wav, if new_selected is success(v) then wav.value = v.value else false)), items)) ), @@ -452,8 +452,8 @@ public define HTML_In_Form // div([class("in")], html), raw_in_form(label, id, input) then sequence([ - if id is htmlId(id) then - literal(""), + if id is htmlId(_id) then + literal(""), input]), div(options, e) then div(options, e), partial(p_content) then partial(p_content), diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index 607e971..e0cd12d 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -39,8 +39,8 @@ define String if options is { [ ] then formated_options, - [ h . t ] then - if h is + [ c . t ] then + if c is { resizable then jquery_button_get_onclick_action_window_options( t, formated_options+ comma+ "resizable=yes" ), diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 28974e1..fcbef37 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -4441,7 +4441,7 @@ define Printable_tree div_empty(options) then format(cinfo, sn, ic_v, any_div_empty(options), format_element, is_https, action_count, head_tags), iframe(options, css_styles, css_files, js_files, body) then - if body is body(body_options,element) then + if body is body(body_options,elem) then [ "\n", "\n", "\n", @@ -4450,7 +4450,7 @@ define Printable_tree add_js_files(js_files), "\n", "\n", // format body options - format(cinfo,sn,ic_v,element,is_https, action_count, head_tags), + format(cinfo,sn,ic_v,elem,is_https, action_count, head_tags), "\n", "\n", "\n", diff --git a/web/CXM_multihost_http_server.anubis b/web/CXM_multihost_http_server.anubis index f57cc0f..1972712 100644 --- a/web/CXM_multihost_http_server.anubis +++ b/web/CXM_multihost_http_server.anubis @@ -2872,14 +2872,14 @@ public define List(Web_arg) if find_the_first(body_temp_file, __boundary, file_offset) is { failure then println("first boundary NOT found");[ ], - success(first) then - with first = first + file_offset, //adjust the offset to real offset in file + success(_first) then + with first = _first + file_offset, //adjust the offset to real offset in file //get the second boundary position if find_the_first(body_temp_file, __boundary, first + boundary_length) is { failure then println("last boundary NOT found");[ ], - success(last) then - with last = last + first + boundary_length, //adjust the offset to real offset in file + success(_last)then + with last = _last + first + boundary_length, //adjust the offset to real offset in file //Extract the file content here if get_multipart_entity(web_site_dir, body_temp_file, first+boundary_length, last, s) is { diff --git a/web/CXM_web_arg_utils.anubis b/web/CXM_web_arg_utils.anubis index b6e7f25..39caa70 100644 --- a/web/CXM_web_arg_utils.anubis +++ b/web/CXM_web_arg_utils.anubis @@ -27,7 +27,7 @@ public define DB_id if decimal_scan(value) is { failure then none, - success(value) then db_id(value) + success(_value) then db_id(_value) } }. public define Maybe(DB_date) diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis index 437eea1..7f4c4ac 100644 --- a/web/jQuery/CXM_jquery_button.anubis +++ b/web/jQuery/CXM_jquery_button.anubis @@ -281,10 +281,10 @@ public define HTML_Partial_Content cancel: " + to_JS_String(dlg_cancel) + "};", button_name = uid, - actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");"), + _actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");"), partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ - partial(jquery_button(jQuery_button(button, uid, button_name, button_label, actioner, jq_icon_none, jq_icon_none))) + partial(jquery_button(jQuery_button(button, uid, button_name, button_label, _actioner, jq_icon_none, jq_icon_none))) ])). public define HTML_Partial_Content @@ -309,11 +309,11 @@ public define HTML_Partial_Content ok : " + to_JS_String(dlg_ok) + ", cancel: " + to_JS_String(dlg_cancel) + "};", - button_name = uid, - actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");"), + _button_name = uid, + _actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");"), partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ - partial(jquery_button(jquery_img_button(img_url, button_label, button_name, actioner, orientation))) + partial(jquery_button(jquery_img_button(img_url, button_label, _button_name, _actioner, orientation))) ])). public define HTML_Partial_Content -- libgit2 0.21.4