ncd: Change the @-syntax to now add __ around the name.

Also rename change the basic_functions function names accordingly.

generated/NCDConfigParser_parse.c

@@ -1755,14 +1755,7 @@ doneU:
         goto failUA0;
     }
     
-    char *at_string = concat_strings(3, "__", yymsp[0].minor.yy13, "__");
-    if (!at_string) {
-        goto failUA0;
-    }
-    
-    int res = NCDValue_InitString(&yygotominor.yy61.v, at_string);
-    free(at_string);
-    if (!res) {
+    if (!NCDValue_InitString(&yygotominor.yy61.v, yymsp[0].minor.yy13)) {
         goto failUA0;
     }
     
@@ -1776,18 +1769,18 @@ doneUA0:
     free(yymsp[0].minor.yy13);
   yy_destructor(yypParser,22,&yymsp[-1].minor);
 }
-#line 1780 "NCDConfigParser_parse.c"
+#line 1773 "NCDConfigParser_parse.c"
         break;
       case 36: /* value ::= CARET name_list */
-#line 806 "NCDConfigParser_parse.y"
+#line 799 "NCDConfigParser_parse.y"
 {
     yygotominor.yy61 = yymsp[0].minor.yy61;
   yy_destructor(yypParser,23,&yymsp[-1].minor);
 }
-#line 1788 "NCDConfigParser_parse.c"
+#line 1781 "NCDConfigParser_parse.c"
         break;
       case 37: /* value ::= dotted_name */
-#line 810 "NCDConfigParser_parse.y"
+#line 803 "NCDConfigParser_parse.y"
 {
     if (!yymsp[0].minor.yy13) {
         goto failV0;
@@ -1806,39 +1799,39 @@ failV0:
 doneV:
     free(yymsp[0].minor.yy13);
 }
-#line 1810 "NCDConfigParser_parse.c"
+#line 1803 "NCDConfigParser_parse.c"
         break;
       case 40: /* value ::= ROUND_OPEN value ROUND_CLOSE */
-#line 837 "NCDConfigParser_parse.y"
+#line 830 "NCDConfigParser_parse.y"
 {
     yygotominor.yy61 = yymsp[-1].minor.yy61;
   yy_destructor(yypParser,7,&yymsp[-2].minor);
   yy_destructor(yypParser,8,&yymsp[0].minor);
 }
-#line 1819 "NCDConfigParser_parse.c"
+#line 1812 "NCDConfigParser_parse.c"
         break;
       case 42: /* name_maybe ::= */
-#line 845 "NCDConfigParser_parse.y"
+#line 838 "NCDConfigParser_parse.y"
 {
     yygotominor.yy13 = NULL;
 }
-#line 1826 "NCDConfigParser_parse.c"
+#line 1819 "NCDConfigParser_parse.c"
         break;
       case 44: /* process_or_template ::= PROCESS */
-#line 855 "NCDConfigParser_parse.y"
+#line 848 "NCDConfigParser_parse.y"
 {
     yygotominor.yy22 = 0;
   yy_destructor(yypParser,24,&yymsp[0].minor);
 }
-#line 1834 "NCDConfigParser_parse.c"
+#line 1827 "NCDConfigParser_parse.c"
         break;
       case 45: /* process_or_template ::= TEMPLATE */
-#line 859 "NCDConfigParser_parse.y"
+#line 852 "NCDConfigParser_parse.y"
 {
     yygotominor.yy22 = 1;
   yy_destructor(yypParser,25,&yymsp[0].minor);
 }
-#line 1842 "NCDConfigParser_parse.c"
+#line 1835 "NCDConfigParser_parse.c"
         break;
       default:
         break;
@@ -1903,7 +1896,7 @@ static void yy_syntax_error(
 #line 129 "NCDConfigParser_parse.y"
 
     parser_out->syntax_error = 1;
-#line 1907 "NCDConfigParser_parse.c"
+#line 1900 "NCDConfigParser_parse.c"
   ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
 }
 

generated/NCDConfigParser_parse.y

@@ -782,14 +782,7 @@ value(R) ::= AT_SIGN dotted_name(A). {
         goto failUA0;
     }
     
-    char *at_string = concat_strings(3, "__", A, "__");
-    if (!at_string) {
-        goto failUA0;
-    }
-    
-    int res = NCDValue_InitString(&R.v, at_string);
-    free(at_string);
-    if (!res) {
+    if (!NCDValue_InitString(&R.v, A)) {
         goto failUA0;
     }
     

ncd/NCDConfigParser_parse.y

@@ -782,14 +782,7 @@ value(R) ::= AT_SIGN dotted_name(A). {
         goto failUA0;
     }
     
-    char *at_string = concat_strings(3, "__", A, "__");
-    if (!at_string) {
-        goto failUA0;
-    }
-    
-    int res = NCDValue_InitString(&R.v, at_string);
-    free(at_string);
-    if (!res) {
+    if (!NCDValue_InitString(&R.v, A)) {
         goto failUA0;
     }
     

ncd/modules/basic_functions.c

@@ -427,97 +427,97 @@ DEFINE_PERCHAR(toupper, b_ascii_toupper(ch))
 
 static struct NCDModuleFunction const functions[] = {
     {
-        .func_name = "__error__",
+        .func_name = "error",
         .func_eval = error_eval
     }, {
-        .func_name = "__identity__",
+        .func_name = "identity",
         .func_eval = identity_eval
     }, {
-        .func_name = "__if__",
+        .func_name = "if",
         .func_eval = if_eval
     }, {
-        .func_name = "__bool__",
+        .func_name = "bool",
         .func_eval = bool_eval
     }, {
-        .func_name = "__not__",
+        .func_name = "not",
         .func_eval = not_eval
     }, {
-        .func_name = "__and__",
+        .func_name = "and",
         .func_eval = and_eval
     }, {
-        .func_name = "__or__",
+        .func_name = "or",
         .func_eval = or_eval
     }, {
-        .func_name = "__imp__",
+        .func_name = "imp",
         .func_eval = imp_eval
     }, {
-        .func_name = "__val_lesser__",
+        .func_name = "val_lesser",
         .func_eval = value_compare_lesser_eval
     }, {
-        .func_name = "__val_greater__",
+        .func_name = "val_greater",
         .func_eval = value_compare_greater_eval
     }, {
-        .func_name = "__val_lesser_equal__",
+        .func_name = "val_lesser_equal",
         .func_eval = value_compare_lesser_equal_eval
     }, {
-        .func_name = "__val_greater_equal__",
+        .func_name = "val_greater_equal",
         .func_eval = value_compare_greater_equal_eval
     }, {
-        .func_name = "__val_equal__",
+        .func_name = "val_equal",
         .func_eval = value_compare_equal_eval
     }, {
-        .func_name = "__val_different__",
+        .func_name = "val_different",
         .func_eval = value_compare_different_eval
     }, {
-        .func_name = "__concat__",
+        .func_name = "concat",
         .func_eval = concat_eval
     }, {
-        .func_name = "__concatlist__",
+        .func_name = "concatlist",
         .func_eval = concatlist_eval
     }, {
-        .func_name = "__num_lesser__",
+        .func_name = "num_lesser",
         .func_eval = integer_compare_lesser_eval
     }, {
-        .func_name = "__num_greater__",
+        .func_name = "num_greater",
         .func_eval = integer_compare_greater_eval
     }, {
-        .func_name = "__num_lesser_equal__",
+        .func_name = "num_lesser_equal",
         .func_eval = integer_compare_lesser_equal_eval
     }, {
-        .func_name = "__num_greater_equal__",
+        .func_name = "num_greater_equal",
         .func_eval = integer_compare_greater_equal_eval
     }, {
-        .func_name = "__num_equal__",
+        .func_name = "num_equal",
         .func_eval = integer_compare_equal_eval
     }, {
-        .func_name = "__num_different__",
+        .func_name = "num_different",
         .func_eval = integer_compare_different_eval
     }, {
-        .func_name = "__num_add__",
+        .func_name = "num_add",
         .func_eval = integer_operator_add_eval
     }, {
-        .func_name = "__num_subtract__",
+        .func_name = "num_subtract",
         .func_eval = integer_operator_subtract_eval
     }, {
-        .func_name = "__num_multiply__",
+        .func_name = "num_multiply",
         .func_eval = integer_operator_multiply_eval
     }, {
-        .func_name = "__num_divide__",
+        .func_name = "num_divide",
         .func_eval = integer_operator_divide_eval
     }, {
-        .func_name = "__num_modulo__",
+        .func_name = "num_modulo",
         .func_eval = integer_operator_modulo_eval
     }, {
-        .func_name = "__encode_value__",
+        .func_name = "encode_value",
         .func_eval = encode_value_eval
     }, {
-        .func_name = "__decode_value__",
+        .func_name = "decode_value",
         .func_eval = decode_value_eval
     }, {
-        .func_name = "__tolower__",
+        .func_name = "tolower",
         .func_eval = perchar_tolower_eval
     }, {
-        .func_name = "__toupper__",
+        .func_name = "toupper",
         .func_eval = perchar_toupper_eval
     }, {
         .func_name = NULL