Fossil SCM

moved th1 argv funcs into their own registration unit. Renamed argv_getat to argv_at.

stephan 2012-07-14 13:51 th1-query-api
Commit 3b25f80edd84de7c16494d3572aac5a49b925724
Parent e923b4a64dd2d0b…
3 files changed +1 +19 -9 +1 -1
~ src/th.h ~ src/th_main.c ~ test/th1-query-api-1.th1
M src/th.h
+1
--- src/th.h
+++ src/th.h
@@ -183,10 +183,11 @@
183183
 /*
184184
 ** Interfaces to register the language extensions.
185185
 */
186186
 int th_register_language(Th_Interp *interp); /* th_lang.c */
187187
 int th_register_sqlite(Th_Interp *interp); /* th_main.c */
188
+int th_register_argv(Th_Interp *interp); /* th_main.c */
188189
 int th_register_vfs(Th_Interp *interp); /* th_vfs.c */
189190
 int th_register_testvfs(Th_Interp *interp); /* th_testvfs.c */
190191
 int th_register_tcl(Th_Interp *interp, void *pContext); /* th_tcl.c */
191192
192193
 /*
193194
--- src/th.h
+++ src/th.h
@@ -183,10 +183,11 @@
183 /*
184 ** Interfaces to register the language extensions.
185 */
186 int th_register_language(Th_Interp *interp); /* th_lang.c */
187 int th_register_sqlite(Th_Interp *interp); /* th_main.c */
 
188 int th_register_vfs(Th_Interp *interp); /* th_vfs.c */
189 int th_register_testvfs(Th_Interp *interp); /* th_testvfs.c */
190 int th_register_tcl(Th_Interp *interp, void *pContext); /* th_tcl.c */
191
192 /*
193
--- src/th.h
+++ src/th.h
@@ -183,10 +183,11 @@
183 /*
184 ** Interfaces to register the language extensions.
185 */
186 int th_register_language(Th_Interp *interp); /* th_lang.c */
187 int th_register_sqlite(Th_Interp *interp); /* th_main.c */
188 int th_register_argv(Th_Interp *interp); /* th_main.c */
189 int th_register_vfs(Th_Interp *interp); /* th_vfs.c */
190 int th_register_testvfs(Th_Interp *interp); /* th_testvfs.c */
191 int th_register_tcl(Th_Interp *interp, void *pContext); /* th_tcl.c */
192
193 /*
194
M src/th_main.c
+19 -9
--- src/th_main.c
+++ src/th_main.c
@@ -710,10 +710,23 @@
710710
 }
711711
 Th_ToInt(interp, zVal, strlen(zVal), &val);
712712
 Th_SetResultInt( interp, val );
713713
 return TH_OK;
714714
 }
715
+
716
+int th_register_argv(Th_Interp *interp){
717
+ static Th_Command_Reg aCommand[] = {
718
+ {"argv_len", argvArgcCmd, 0},
719
+ {"argv_at", argvGetAtCmd, 0},
720
+ {"argv_getstr", argvFindOptionStringCmd, 0},
721
+ {"argv_getbool", argvFindOptionBoolCmd, 0},
722
+ {"argv_getint", argvFindOptionIntCmd, 0},
723
+ {0, 0, 0}
724
+ };
725
+ Th_register_commands( interp, aCommand );
726
+}
727
+
715728
 #endif
716729
 /* end TH_USE_ARGV */
717730
718731
 #ifdef TH_USE_SQLITE
719732
 /*
@@ -1374,18 +1387,10 @@
13741387
 {"html", putsCmd, &puts_Html},
13751388
 {"puts", putsCmd, &puts_Normal},
13761389
 {"wiki", wikiCmd, 0},
13771390
 {"repository", repositoryCmd, 0},
13781391
1379
-#ifdef TH_USE_ARGV
1380
- {"argv_len", argvArgcCmd, 0},
1381
- {"argv_getat", argvGetAtCmd, 0},
1382
- {"argv_getstr", argvFindOptionStringCmd, 0},
1383
- {"argv_getbool", argvFindOptionBoolCmd, 0},
1384
- {"argv_getint", argvFindOptionIntCmd, 0},
1385
-#endif
1386
-
13871392
 {0, 0, 0}
13881393
 };
13891394
 if( g.interp==0 ){
13901395
 int i;
13911396
 if(g.cgiOutput){
@@ -1403,10 +1408,13 @@
14031408
 }
14041409
 #endif
14051410
 #ifdef TH_USE_SQLITE
14061411
 th_register_sqlite(g.interp);
14071412
 #endif
1413
+#ifdef TH_USE_ARGV
1414
+ th_register_argv(g.interp);
1415
+#endif
14081416
 Th_register_commands( g.interp, aCommand );
14091417
 }
14101418
 }
14111419
14121420
 /*
@@ -1580,9 +1588,11 @@
15801588
 usage("FILE");
15811589
 assert(0 && "usage() does not return");
15821590
 }
15831591
 blob_zero(&in);
15841592
 db_open_config(0); /* Needed for global "tcl" setting. */
1585
- db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx tests. */;
1593
+#ifdef TH_USE_SQLITE
1594
+ db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx API. */;
1595
+#endif
15861596
 blob_read_from_file(&in, g.argv[2]);
15871597
 Th_Render(blob_str(&in));
15881598
 }
15891599
--- src/th_main.c
+++ src/th_main.c
@@ -710,10 +710,23 @@
710 }
711 Th_ToInt(interp, zVal, strlen(zVal), &val);
712 Th_SetResultInt( interp, val );
713 return TH_OK;
714 }
 
 
 
 
 
 
 
 
 
 
 
 
 
715 #endif
716 /* end TH_USE_ARGV */
717
718 #ifdef TH_USE_SQLITE
719 /*
@@ -1374,18 +1387,10 @@
1374 {"html", putsCmd, &puts_Html},
1375 {"puts", putsCmd, &puts_Normal},
1376 {"wiki", wikiCmd, 0},
1377 {"repository", repositoryCmd, 0},
1378
1379 #ifdef TH_USE_ARGV
1380 {"argv_len", argvArgcCmd, 0},
1381 {"argv_getat", argvGetAtCmd, 0},
1382 {"argv_getstr", argvFindOptionStringCmd, 0},
1383 {"argv_getbool", argvFindOptionBoolCmd, 0},
1384 {"argv_getint", argvFindOptionIntCmd, 0},
1385 #endif
1386
1387 {0, 0, 0}
1388 };
1389 if( g.interp==0 ){
1390 int i;
1391 if(g.cgiOutput){
@@ -1403,10 +1408,13 @@
1403 }
1404 #endif
1405 #ifdef TH_USE_SQLITE
1406 th_register_sqlite(g.interp);
1407 #endif
 
 
 
1408 Th_register_commands( g.interp, aCommand );
1409 }
1410 }
1411
1412 /*
@@ -1580,9 +1588,11 @@
1580 usage("FILE");
1581 assert(0 && "usage() does not return");
1582 }
1583 blob_zero(&in);
1584 db_open_config(0); /* Needed for global "tcl" setting. */
1585 db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx tests. */;
 
 
1586 blob_read_from_file(&in, g.argv[2]);
1587 Th_Render(blob_str(&in));
1588 }
1589
--- src/th_main.c
+++ src/th_main.c
@@ -710,10 +710,23 @@
710 }
711 Th_ToInt(interp, zVal, strlen(zVal), &val);
712 Th_SetResultInt( interp, val );
713 return TH_OK;
714 }
715
716 int th_register_argv(Th_Interp *interp){
717 static Th_Command_Reg aCommand[] = {
718 {"argv_len", argvArgcCmd, 0},
719 {"argv_at", argvGetAtCmd, 0},
720 {"argv_getstr", argvFindOptionStringCmd, 0},
721 {"argv_getbool", argvFindOptionBoolCmd, 0},
722 {"argv_getint", argvFindOptionIntCmd, 0},
723 {0, 0, 0}
724 };
725 Th_register_commands( interp, aCommand );
726 }
727
728 #endif
729 /* end TH_USE_ARGV */
730
731 #ifdef TH_USE_SQLITE
732 /*
@@ -1374,18 +1387,10 @@
1387 {"html", putsCmd, &puts_Html},
1388 {"puts", putsCmd, &puts_Normal},
1389 {"wiki", wikiCmd, 0},
1390 {"repository", repositoryCmd, 0},
1391
 
 
 
 
 
 
 
 
1392 {0, 0, 0}
1393 };
1394 if( g.interp==0 ){
1395 int i;
1396 if(g.cgiOutput){
@@ -1403,10 +1408,13 @@
1408 }
1409 #endif
1410 #ifdef TH_USE_SQLITE
1411 th_register_sqlite(g.interp);
1412 #endif
1413 #ifdef TH_USE_ARGV
1414 th_register_argv(g.interp);
1415 #endif
1416 Th_register_commands( g.interp, aCommand );
1417 }
1418 }
1419
1420 /*
@@ -1580,9 +1588,11 @@
1588 usage("FILE");
1589 assert(0 && "usage() does not return");
1590 }
1591 blob_zero(&in);
1592 db_open_config(0); /* Needed for global "tcl" setting. */
1593 #ifdef TH_USE_SQLITE
1594 db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx API. */;
1595 #endif
1596 blob_read_from_file(&in, g.argv[2]);
1597 Th_Render(blob_str(&in));
1598 }
1599
M test/th1-query-api-1.th1
+1 -1
--- test/th1-query-api-1.th1
+++ test/th1-query-api-1.th1
@@ -116,11 +116,11 @@
116116
 }
117117
118118
 set ARGC [argv_len]
119119
 puts ARGC = $ARGC "\n"
120120
 for {set i 0} {$i < $ARGC} {incr i} {
121
- puts "argv_getat $i = " [argv_getat $i] \n
121
+ puts "argv_at $i = " [argv_at $i] \n
122122
 }
123123
124124
 set magicDefault hi
125125
 set optA [argv_getstr AA a $magicDefault]
126126
 puts "argv_getstr AA = " $optA \n
127127
--- test/th1-query-api-1.th1
+++ test/th1-query-api-1.th1
@@ -116,11 +116,11 @@
116 }
117
118 set ARGC [argv_len]
119 puts ARGC = $ARGC "\n"
120 for {set i 0} {$i < $ARGC} {incr i} {
121 puts "argv_getat $i = " [argv_getat $i] \n
122 }
123
124 set magicDefault hi
125 set optA [argv_getstr AA a $magicDefault]
126 puts "argv_getstr AA = " $optA \n
127
--- test/th1-query-api-1.th1
+++ test/th1-query-api-1.th1
@@ -116,11 +116,11 @@
116 }
117
118 set ARGC [argv_len]
119 puts ARGC = $ARGC "\n"
120 for {set i 0} {$i < $ARGC} {incr i} {
121 puts "argv_at $i = " [argv_at $i] \n
122 }
123
124 set magicDefault hi
125 set optA [argv_getstr AA a $magicDefault]
126 puts "argv_getstr AA = " $optA \n
127

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button