rev 729 - in trunk: . modules/Re src

Author: mark
Date: 2004-07-12 23:58:18 -0400 (Mon, 12 Jul 2004)
New Revision: 729

Modified:
   trunk/STATUS.txt
   trunk/modules/Re/Re.c
   trunk/src/builtins-file.c
   trunk/src/symbol.c
   trunk/src/sys.c
Log:
fixed camelcase errors: execPath, argV, fParams_, bufSize, re.endPos, re.lastIndex

Modified: trunk/STATUS.txt
===================================================================
--- trunk/STATUS.txt	2004-07-13 03:49:41 UTC (rev 728)
+++ trunk/STATUS.txt	2004-07-13 03:58:18 UTC (rev 729)
@@ -9,10 +9,8 @@
 
 --- bug: prints ... after 15 items in a list
 
---- Make Dir.size() recursive
+--- camelcase errors: execPath, argV, fParams_, bufSize, re.endPos, re.lastIndex
 
---- camelcase errors: execpath, fparams, bufsize, re.endpos, re.lastindex
-
 --- File & Dir properties?
 
 --- use special stdout for each Main

Modified: trunk/modules/Re/Re.c
===================================================================
--- trunk/modules/Re/Re.c	2004-07-13 03:49:41 UTC (rev 728)
+++ trunk/modules/Re/Re.c	2004-07-13 03:58:18 UTC (rev 729)
@@ -237,8 +237,8 @@
 	set_attr(ist, match_obj, sym(ist, "re"),			self);
 	set_attr(ist, match_obj, sym(ist, "string"),		parms[1]);
 	set_attr(ist, match_obj, sym(ist, "pos"),			parms[3]);
-	set_attr(ist, match_obj, sym(ist, "endpos"),		parms[5]);
-	set_attr(ist, match_obj, sym(ist, "lastindex"),	lastindex_obj);
+	set_attr(ist, match_obj, sym(ist, "endPos"),		parms[5]);
+	set_attr(ist, match_obj, sym(ist, "lastIndex"),	lastindex_obj);
 	return match_obj;
 }
 
@@ -405,7 +405,7 @@
 	set_attr(ist, match_obj, sym(ist, "re"),			self);
 	set_attr(ist, match_obj, sym(ist, "string"),		parms[3]);
 	lastindex_obj = NEW_INT(last_index);
-	set_attr(ist, match_obj, sym(ist, "lastindex"),	lastindex_obj);
+	set_attr(ist, match_obj, sym(ist, "lastIndex"),	lastindex_obj);
 	arr[0] = OBJ(NOKEY); arr[1] = match_obj;
 	if (!repl_is_func) 
 		repl  = pr2c_strptr(ist, parms[1]);

Modified: trunk/src/builtins-file.c
===================================================================
--- trunk/src/builtins-file.c	2004-07-13 03:49:41 UTC (rev 728)
+++ trunk/src/builtins-file.c	2004-07-13 03:58:18 UTC (rev 729)
@@ -633,7 +633,7 @@
 
 DEF(File, init_, FPARM3( path,    OBJ(NODEF), 
 	                     mode,    NEW_STRING(""),
-                         bufsize, NEW_INT(-1)   ) ) {
+                         bufSize, NEW_INT(-1)   ) ) {
 	apr_file_t *f;
 	apr_status_t aprerr;
 	apr_pool_t *subpool;
@@ -888,7 +888,7 @@
 }
 
 DEF(File, open, FPARM2( mode,    NEW_STRING(""),
-                        bufsize, NEW_INT(-1)   ) ) {
+                        bufSize, NEW_INT(-1)   ) ) {
 	apr_file_t *f;
 	apr_status_t aprerr;
 	apr_int32_t flags = 0;
@@ -1204,7 +1204,7 @@
 	TempFile_OBJ->unclonable = TRUE;
 }
 
-DEF(TempFile, init_, FPARM2( bufsize, NEW_INT(-1), delOnClose, OBJ(PR_FALSE))) {
+DEF(TempFile, init_, FPARM2( bufSize, NEW_INT(-1), delOnClose, OBJ(PR_FALSE))) {
 	apr_status_t aprerr;
 	apr_file_t *fp;
 	apr_pool_t *subpool;
@@ -1261,7 +1261,7 @@
 	                         mode,		NEW_STRING(""),
 							 encoding,	NEW_STRING("ASCII"),
 							 magic,		OBJ(PR_FALSE),
-                             bufsize,	NEW_INT(-1)   ) ) {
+                             bufSize,	NEW_INT(-1)   ) ) {
 	apr_file_t *f;
 	apr_status_t aprerr;
 	apr_pool_t *subpool;
@@ -1332,7 +1332,7 @@
 DEF(TextFile, open, FPARM4( mode,		NEW_STRING("r"),
 							encoding,	NEW_STRING("ASCII"),
 							magic,		OBJ(PR_FALSE),
-                            bufsize,	NEW_INT(-1)   ) ) {
+                            bufSize,	NEW_INT(-1)   ) ) {
 	apr_file_t *f;
 	apr_status_t aprerr;
 	apr_int32_t flags = 0;
@@ -1715,7 +1715,7 @@
 
 DEF( TempTextFile, init_, FPARM4( encoding,		NEW_STRING("ASCII"),
 							      magic,		OBJ(PR_FALSE),
-								  bufsize,		NEW_INT(-1), 
+								  bufSize,		NEW_INT(-1), 
 								  delOnClose,	OBJ(PR_FALSE) ) ) {
 	apr_status_t aprerr;
 	apr_file_t *fp;
Modified: trunk/src/symbol.c
===================================================================
--- trunk/src/symbol.c	2004-07-13 03:49:41 UTC (rev 728)
+++ trunk/src/symbol.c	2004-07-13 03:58:18 UTC (rev 729)
@@ -123,7 +123,7 @@
 	{ "id_",			0 },
 	{ "doc_",			0 }, 
 	{ "hash_",			0 },
-	{ "fparams_",		0 },
+	{ "fParams_",		0 },
 	{ "globals_",		0 },
 	{ "syn_func_",		0 },
 	{ "syn_locals_",	0 },

Modified: trunk/src/sys.c
===================================================================
--- trunk/src/sys.c	2004-07-13 03:49:41 UTC (rev 728)
+++ trunk/src/sys.c	2004-07-13 03:58:18 UTC (rev 729)
@@ -220,8 +220,8 @@
 	set_attr(ist, sys_module, sym(ist, "cons"), cons_obj);
 	set_attr(ist, cons_obj, sym(ist, "ps1"), NEW_STRING("O>> "));
 	set_attr(ist, cons_obj, sym(ist, "ps2"), NEW_STRING("... "));
-	set_attr(ist, sys_module, sym(ist, "execpath"), NEW_STRING(prog_path));
-	set_attr(ist, sys_module, sym(ist, "argv"),     argv_obj);
+	set_attr(ist, sys_module, sym(ist, "execPath"), NEW_STRING(prog_path));
+	set_attr(ist, sys_module, sym(ist, "argV"),     argv_obj);
 
 	if (!APR_STATUS_IS_SUCCESS(apr_pool_create(&mod_pool, NULL)))
 		; // XXX Set exception?