ncd: rename NCDValue{Generator,Parser} to NCDVal{Generator,Parser}

blog_channels.txt

@@ -82,7 +82,7 @@ BTap 4
 lwip 4
 NCDConfigTokenizer 4
 NCDConfigParser 4
-NCDValueParser 4
+NCDValParser 4
 nsskey 4
 addr 4
 PasswordListener 4
@@ -99,7 +99,7 @@ PeerChat 4
 BArpProbe 4
 NCDModuleIndex 4
 NCDModuleProcess 4
-NCDValueGenerator 4
+NCDValGenerator 4
 ncd_from_string 4
 ncd_to_string 4
 ncd_value 4

examples/CMakeLists.txt

@@ -30,10 +30,10 @@ if (BUILD_NCD)
     target_link_libraries(ncd_tokenizer_test ncdtokenizer)
 
     add_executable(ncd_parser_test ncd_parser_test.c)
-    target_link_libraries(ncd_parser_test ncdconfigparser ncdvaluegenerator ncdsugar)
+    target_link_libraries(ncd_parser_test ncdconfigparser ncdvalgenerator ncdsugar)
 
     add_executable(ncd_value_parser_test ncd_value_parser_test.c)
-    target_link_libraries(ncd_value_parser_test ncdvalueparser ncdvaluegenerator)
+    target_link_libraries(ncd_value_parser_test ncdvalparser ncdvalgenerator)
 
     add_executable(ncdinterfacemonitor_test ncdinterfacemonitor_test.c)
     target_link_libraries(ncdinterfacemonitor_test ncdinterfacemonitor)
@@ -42,7 +42,7 @@ if (BUILD_NCD)
     target_link_libraries(ncdval_test ncdval)
     
     add_executable(ncdvalcons_test ncdvalcons_test.c)
-    target_link_libraries(ncdvalcons_test ncdvalcons ncdvaluegenerator)
+    target_link_libraries(ncdvalcons_test ncdvalcons ncdvalgenerator)
 endif ()
 
 if (BUILDING_UDEVMONITOR)

examples/ncd_parser_test.c

@@ -37,7 +37,7 @@
 #include <misc/expstring.h>
 #include <base/BLog.h>
 #include <ncd/NCDConfigParser.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValGenerator.h>
 #include <ncd/NCDSugar.h>
 
 static int generate_val (NCDValue *value, ExpString *out_str)

examples/ncd_value_parser_test.c

@@ -33,8 +33,8 @@
 
 #include <misc/debug.h>
 #include <base/BLog.h>
-#include <ncd/NCDValueParser.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValParser.h>
+#include <ncd/NCDValGenerator.h>
 
 int main (int argc, char *argv[])
 {

examples/ncdvalcons_test.c

@@ -32,7 +32,7 @@
 
 #include <misc/debug.h>
 #include <ncd/NCDValCons.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValGenerator.h>
 
 static NCDValMem mem;
 static NCDValCons cons;

generate_files

@@ -48,4 +48,4 @@ do_flex predicate/BPredicate.l BPredicate
 do_bison predicate/BPredicate.y BPredicate
 "${PHP_CMD[@]}" blog_generator/blog.php --input-file blog_channels.txt --output-dir "${OUT_DIR}"
 do_lemon ncd/NCDConfigParser_parse.y
-do_lemon ncd/NCDValueParser_parse.y
+do_lemon ncd/NCDValParser_parse.y

generated/NCDValueParser_parse.c → generated/NCDValParser_parse.c

@@ -371,16 +371,16 @@ static void yy_destructor(
     case 6: /* BRACKET_CLOSE */
     case 7: /* STRING */
 {
-#line 37 "NCDValueParser_parse.y"
+#line 37 "NCDValParser_parse.y"
  free_token((yypminor->yy0)); 
-#line 377 "NCDValueParser_parse.c"
+#line 377 "NCDValParser_parse.c"
 }
       break;
     case 9: /* list_contents */
 {
-#line 47 "NCDValueParser_parse.y"
+#line 47 "NCDValParser_parse.y"
  (void)parser_out; 
-#line 384 "NCDValueParser_parse.c"
+#line 384 "NCDValParser_parse.c"
 }
       break;
     default:  break;   /* If no destructor action specified: do nothing */
@@ -553,12 +553,12 @@ static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){
    while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
    /* Here code is inserted which will execute if the parser
    ** stack every overflows */
-#line 58 "NCDValueParser_parse.y"
+#line 58 "NCDValParser_parse.y"
 
     if (yypMinor) {
         free_token(yypMinor->yy0);
     }
-#line 562 "NCDValueParser_parse.c"
+#line 562 "NCDValParser_parse.c"
    ParseARG_STORE; /* Suppress warning about unused %extra_argument var */
 }
 
@@ -682,7 +682,7 @@ static void yy_reduce(
   **     break;
   */
       case 0: /* input ::= value */
-#line 64 "NCDValueParser_parse.y"
+#line 64 "NCDValParser_parse.y"
 {
     if (!yymsp[0].minor.yy1.have) {
         goto failZ0;
@@ -701,10 +701,10 @@ static void yy_reduce(
     
 failZ0:;
 }
-#line 705 "NCDValueParser_parse.c"
+#line 705 "NCDValParser_parse.c"
         break;
       case 1: /* list_contents ::= value */
-#line 83 "NCDValueParser_parse.y"
+#line 83 "NCDValParser_parse.y"
 {
     if (!yymsp[0].minor.yy1.have) {
         goto failL0;
@@ -724,10 +724,10 @@ failL0:
     yygotominor.yy1.have = 0;
 doneL:;
 }
-#line 728 "NCDValueParser_parse.c"
+#line 728 "NCDValParser_parse.c"
         break;
       case 2: /* list_contents ::= value COMMA list_contents */
-#line 103 "NCDValueParser_parse.y"
+#line 103 "NCDValParser_parse.y"
 {
     if (!yymsp[-2].minor.yy1.have || !yymsp[0].minor.yy1.have) {
         goto failM0;
@@ -747,29 +747,29 @@ failM0:
 doneM:;
   yy_destructor(yypParser,1,&yymsp[-1].minor);
 }
-#line 751 "NCDValueParser_parse.c"
+#line 751 "NCDValParser_parse.c"
         break;
       case 3: /* list ::= CURLY_OPEN CURLY_CLOSE */
-#line 122 "NCDValueParser_parse.y"
+#line 122 "NCDValParser_parse.y"
 {
     NCDValCons_NewList(&parser_out->cons, &yygotominor.yy1.v);
     yygotominor.yy1.have = 1;
   yy_destructor(yypParser,2,&yymsp[-1].minor);
   yy_destructor(yypParser,3,&yymsp[0].minor);
 }
-#line 761 "NCDValueParser_parse.c"
+#line 761 "NCDValParser_parse.c"
         break;
       case 4: /* list ::= CURLY_OPEN list_contents CURLY_CLOSE */
-#line 127 "NCDValueParser_parse.y"
+#line 127 "NCDValParser_parse.y"
 {
     yygotominor.yy1 = yymsp[-1].minor.yy1;
   yy_destructor(yypParser,2,&yymsp[-2].minor);
   yy_destructor(yypParser,3,&yymsp[0].minor);
 }
-#line 770 "NCDValueParser_parse.c"
+#line 770 "NCDValParser_parse.c"
         break;
       case 5: /* map_contents ::= value COLON value */
-#line 131 "NCDValueParser_parse.y"
+#line 131 "NCDValParser_parse.y"
 {
     if (!yymsp[-2].minor.yy1.have || !yymsp[0].minor.yy1.have) {
         goto failS0;
@@ -790,10 +790,10 @@ failS0:
 doneS:;
   yy_destructor(yypParser,4,&yymsp[-1].minor);
 }
-#line 794 "NCDValueParser_parse.c"
+#line 794 "NCDValParser_parse.c"
         break;
       case 6: /* map_contents ::= value COLON value COMMA map_contents */
-#line 151 "NCDValueParser_parse.y"
+#line 151 "NCDValParser_parse.y"
 {
     if (!yymsp[-4].minor.yy1.have || !yymsp[-2].minor.yy1.have || !yymsp[0].minor.yy1.have) {
         goto failT0;
@@ -814,29 +814,29 @@ doneT:;
   yy_destructor(yypParser,4,&yymsp[-3].minor);
   yy_destructor(yypParser,1,&yymsp[-1].minor);
 }
-#line 818 "NCDValueParser_parse.c"
+#line 818 "NCDValParser_parse.c"
         break;
       case 7: /* map ::= BRACKET_OPEN BRACKET_CLOSE */
-#line 170 "NCDValueParser_parse.y"
+#line 170 "NCDValParser_parse.y"
 {
     NCDValCons_NewMap(&parser_out->cons, &yygotominor.yy1.v);
     yygotominor.yy1.have = 1;
   yy_destructor(yypParser,5,&yymsp[-1].minor);
   yy_destructor(yypParser,6,&yymsp[0].minor);
 }
-#line 828 "NCDValueParser_parse.c"
+#line 828 "NCDValParser_parse.c"
         break;
       case 8: /* map ::= BRACKET_OPEN map_contents BRACKET_CLOSE */
-#line 175 "NCDValueParser_parse.y"
+#line 175 "NCDValParser_parse.y"
 {
     yygotominor.yy1 = yymsp[-1].minor.yy1;
   yy_destructor(yypParser,5,&yymsp[-2].minor);
   yy_destructor(yypParser,6,&yymsp[0].minor);
 }
-#line 837 "NCDValueParser_parse.c"
+#line 837 "NCDValParser_parse.c"
         break;
       case 9: /* value ::= STRING */
-#line 179 "NCDValueParser_parse.y"
+#line 179 "NCDValParser_parse.y"
 {
     ASSERT(yymsp[0].minor.yy0.str)
 
@@ -853,15 +853,15 @@ failU0:
 doneU:;
     free_token(yymsp[0].minor.yy0);
 }
-#line 857 "NCDValueParser_parse.c"
+#line 857 "NCDValParser_parse.c"
         break;
       case 10: /* value ::= list */
       case 11: /* value ::= map */ yytestcase(yyruleno==11);
-#line 196 "NCDValueParser_parse.y"
+#line 196 "NCDValParser_parse.y"
 {
     yygotominor.yy1 = yymsp[0].minor.yy1;
 }
-#line 865 "NCDValueParser_parse.c"
+#line 865 "NCDValParser_parse.c"
         break;
       default:
         break;
@@ -923,10 +923,10 @@ static void yy_syntax_error(
 ){
   ParseARG_FETCH;
 #define TOKEN (yyminor.yy0)
-#line 53 "NCDValueParser_parse.y"
+#line 53 "NCDValParser_parse.y"
 
     parser_out->error_flags |= ERROR_FLAG_SYNTAX;
-#line 930 "NCDValueParser_parse.c"
+#line 930 "NCDValParser_parse.c"
   ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
 }
 

generated/blog_channel_NCDValueGenerator.h → generated/blog_channel_NCDValGenerator.h

@@ -1,4 +1,4 @@
 #ifdef BLOG_CURRENT_CHANNEL
 #undef BLOG_CURRENT_CHANNEL
 #endif
-#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_NCDValueGenerator
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_NCDValGenerator

generated/blog_channel_NCDValueParser.h → generated/blog_channel_NCDValParser.h

@@ -1,4 +1,4 @@
 #ifdef BLOG_CURRENT_CHANNEL
 #undef BLOG_CURRENT_CHANNEL
 #endif
-#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_NCDValueParser
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_NCDValParser

generated/blog_channels_defines.h

@@ -82,7 +82,7 @@
 #define BLOG_CHANNEL_lwip 81
 #define BLOG_CHANNEL_NCDConfigTokenizer 82
 #define BLOG_CHANNEL_NCDConfigParser 83
-#define BLOG_CHANNEL_NCDValueParser 84
+#define BLOG_CHANNEL_NCDValParser 84
 #define BLOG_CHANNEL_nsskey 85
 #define BLOG_CHANNEL_addr 86
 #define BLOG_CHANNEL_PasswordListener 87
@@ -99,7 +99,7 @@
 #define BLOG_CHANNEL_BArpProbe 98
 #define BLOG_CHANNEL_NCDModuleIndex 99
 #define BLOG_CHANNEL_NCDModuleProcess 100
-#define BLOG_CHANNEL_NCDValueGenerator 101
+#define BLOG_CHANNEL_NCDValGenerator 101
 #define BLOG_CHANNEL_ncd_from_string 102
 #define BLOG_CHANNEL_ncd_to_string 103
 #define BLOG_CHANNEL_ncd_value 104

generated/blog_channels_list.h

@@ -82,7 +82,7 @@
 {"lwip", 4},
 {"NCDConfigTokenizer", 4},
 {"NCDConfigParser", 4},
-{"NCDValueParser", 4},
+{"NCDValParser", 4},
 {"nsskey", 4},
 {"addr", 4},
 {"PasswordListener", 4},
@@ -99,7 +99,7 @@
 {"BArpProbe", 4},
 {"NCDModuleIndex", 4},
 {"NCDModuleProcess", 4},
-{"NCDValueGenerator", 4},
+{"NCDValGenerator", 4},
 {"ncd_from_string", 4},
 {"ncd_to_string", 4},
 {"ncd_value", 4},

ncd-request/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_executable(badvpn-ncd-request
     ncd-request.c
 )
-target_link_libraries(badvpn-ncd-request ncdrequest ncdvaluegenerator ncdvalueparser)
+target_link_libraries(badvpn-ncd-request ncdrequest ncdvalgenerator ncdvalparser)
 
 install(
     TARGETS badvpn-ncd-request

ncd-request/ncd-request.c

@@ -38,8 +38,8 @@
 #include <system/BNetwork.h>
 #include <system/BReactor.h>
 #include <system/BAddr.h>
-#include <ncd/NCDValueParser.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValParser.h>
+#include <ncd/NCDValGenerator.h>
 #include <ncd/NCDRequestClient.h>
 
 #include <generated/blog_channel_ncd_request.h>

ncd/CMakeLists.txt

@@ -31,15 +31,15 @@ add_library(ncdval
 )
 target_link_libraries(ncdval base)
 
-add_library(ncdvaluegenerator
-    NCDValueGenerator.c
+add_library(ncdvalgenerator
+    NCDValGenerator.c
 )
-target_link_libraries(ncdvaluegenerator base ncdval)
+target_link_libraries(ncdvalgenerator base ncdval)
 
-add_library(ncdvalueparser
-    NCDValueParser.c
+add_library(ncdvalparser
+    NCDValParser.c
 )
-target_link_libraries(ncdvalueparser base ncdval ncdtokenizer ncdvalcons)
+target_link_libraries(ncdvalparser base ncdval ncdtokenizer ncdvalcons)
 
 add_library(ncdast
     NCDAst.c
@@ -58,7 +58,7 @@ target_link_libraries(ncdsugar ncdast)
 add_library(ncdrequest
     NCDRequestClient.c
 )
-target_link_libraries(ncdrequest base system ncdvaluegenerator ncdvalueparser)
+target_link_libraries(ncdrequest base system ncdvalgenerator ncdvalparser)
 
 add_library(ncdinterfacemonitor
     NCDInterfaceMonitor.c
@@ -150,8 +150,8 @@ add_executable(badvpn-ncd
     ${NCD_ADDITIONAL_SOURCES}
 )
 target_link_libraries(badvpn-ncd
-    system flow flowextra dhcpclient arpprobe ncdval ncdvaluegenerator
-    ncdvalueparser ncdconfigparser ncdsugar udevmonitor ncdinterfacemonitor ncdrequest
+    system flow flowextra dhcpclient arpprobe ncdval ncdvalgenerator
+    ncdvalparser ncdconfigparser ncdsugar udevmonitor ncdinterfacemonitor ncdrequest
     badvpn_random
 )
 

ncd/NCDRequestClient.h

@@ -41,8 +41,8 @@
 #include <flow/PacketProtoDecoder.h>
 #include <flow/PacketStreamSender.h>
 #include <flow/PacketPassFifoQueue.h>
-#include <ncd/NCDValueGenerator.h>
-#include <ncd/NCDValueParser.h>
+#include <ncd/NCDValGenerator.h>
+#include <ncd/NCDValParser.h>
 
 struct NCDRequestClient_req;
 

ncd/NCDValueGenerator.c → ncd/NCDValGenerator.c

@@ -1,5 +1,5 @@
 /**
- * @file NCDValueGenerator.c
+ * @file NCDValGenerator.c
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE
@@ -35,9 +35,9 @@
 #include <misc/expstring.h>
 #include <base/BLog.h>
 
-#include <ncd/NCDValueGenerator.h>
+#include "NCDValGenerator.h"
 
-#include <generated/blog_channel_NCDValueGenerator.h>
+#include <generated/blog_channel_NCDValGenerator.h>
 
 static int generate_val (NCDValRef value, ExpString *out_str)
 {

ncd/NCDValueGenerator.h → ncd/NCDValGenerator.h

@@ -1,5 +1,5 @@
 /**
- * @file NCDValueGenerator.h
+ * @file NCDValGenerator.h
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE

ncd/NCDValueParser.c → ncd/NCDValParser.c

@@ -1,5 +1,5 @@
 /**
- * @file NCDValueParser.c
+ * @file NCDValParser.c
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE
@@ -35,9 +35,9 @@
 #include <ncd/NCDConfigTokenizer.h>
 #include <ncd/NCDValCons.h>
 
-#include "NCDValueParser.h"
+#include "NCDValParser.h"
 
-#include <generated/blog_channel_NCDValueParser.h>
+#include <generated/blog_channel_NCDValParser.h>
 
 struct token {
     char *str;
@@ -85,14 +85,14 @@ static void handle_cons_error (struct parser_state *state)
 
 // rename non-static functions defined by our Lemon parser
 // to avoid clashes with other Lemon parsers
-#define ParseTrace ParseTrace_NCDValueParser
-#define ParseAlloc ParseAlloc_NCDValueParser
-#define ParseFree ParseFree_NCDValueParser
-#define Parse Parse_NCDValueParser
+#define ParseTrace ParseTrace_NCDValParser
+#define ParseAlloc ParseAlloc_NCDValParser
+#define ParseFree ParseFree_NCDValParser
+#define Parse Parse_NCDValParser
 
 // include the generated Lemon parser
-#include "../generated/NCDValueParser_parse.c"
-#include "../generated/NCDValueParser_parse.h"
+#include "../generated/NCDValParser_parse.c"
+#include "../generated/NCDValParser_parse.h"
 
 static int tokenizer_output (void *user, int token, char *value, size_t value_len, size_t line, size_t line_char)
 {

ncd/NCDValueParser.h → ncd/NCDValParser.h

@@ -1,5 +1,5 @@
 /**
- * @file NCDValueParser.h
+ * @file NCDValParser.h
  * @author Ambroz Bizjak <ambrop7@gmail.com>
  * 
  * @section LICENSE

ncd/modules/from_string.c

@@ -38,7 +38,7 @@
 #include <string.h>
 
 #include <ncd/NCDModule.h>
-#include <ncd/NCDValueParser.h>
+#include <ncd/NCDValParser.h>
 
 #include <generated/blog_channel_ncd_from_string.h>
 

ncd/modules/parse.c

@@ -54,7 +54,7 @@
 
 #include <misc/parse_number.h>
 #include <misc/ipaddr.h>
-#include <ncd/NCDValueParser.h>
+#include <ncd/NCDValParser.h>
 #include <ncd/NCDModule.h>
 
 #include <generated/blog_channel_ncd_parse.h>

ncd/modules/sys_request_server.c

@@ -87,8 +87,8 @@
 #include <flow/PacketProtoDecoder.h>
 #include <flow/PacketStreamSender.h>
 #include <flow/PacketPassFifoQueue.h>
-#include <ncd/NCDValueParser.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValParser.h>
+#include <ncd/NCDValGenerator.h>
 #include <ncd/NCDModule.h>
 
 #include <generated/blog_channel_ncd_sys_request_server.h>

ncd/modules/to_string.c

@@ -38,7 +38,7 @@
 #include <string.h>
 
 #include <ncd/NCDModule.h>
-#include <ncd/NCDValueGenerator.h>
+#include <ncd/NCDValGenerator.h>
 
 #include <generated/blog_channel_ncd_to_string.h>