rev 361 - in trunk: modules/File modules/Prosist modules/Re modules/SQLite pr src
SVN User <[email protected]>
| Newsgroups | gmane.comp.lang.prothon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mark
Date: 2004-04-15 16:45:53 -0400 (Thu, 15 Apr 2004)
New Revision: 361
Modified:
trunk/modules/File/File.c
trunk/modules/Prosist/Prosist.vcproj
trunk/modules/Re/Re.c
trunk/modules/SQLite/SQLite.c
trunk/modules/SQLite/SQLite.vcproj
trunk/pr/dict.pr
trunk/pr/file_test.pr
trunk/pr/re_test.pr
trunk/pr/sqlite.pr
trunk/pr/stdio_test.pr
trunk/pr/threads.pr
trunk/src/builtins-core.c
trunk/src/builtins-dict.c
trunk/src/builtins-float.c
trunk/src/builtins-int.c
trunk/src/builtins-list.c
trunk/src/builtins-string.c
trunk/src/builtins-thread.c
trunk/src/builtins-tuple.c
trunk/src/bytecodes.h
trunk/src/symbol.c
Log:
changed all method and var names to camelCase
Modified: trunk/modules/File/File.c
===================================================================
--- trunk/modules/File/File.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/modules/File/File.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -199,7 +199,7 @@
return NULL;
}
-DEF(File, __objlist__, FORM_RPARAM) {
+DEF(File, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -237,19 +237,19 @@
return OBJ(NONE);
}
#if 0
-DEF(File, fileno, NULL) {
+DEF(File, fileNo, NULL) {
if (!has_proto_QUES(ist, self, File_OBJ)) {
- raise_exception(ist, OBJ(TYPE_EXC), "fileno can only be called on a File object");
+ raise_exception(ist, OBJ(TYPE_EXC), "fileNo can only be called on a File object");
return NULL;
}
if (!OPEN(self)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "fileno called on closed file");
+ raise_exception(ist, OBJ(IOEXCEPTION), "fileNo called on closed file");
return NULL;
}
return new_int_obj(ist, _fileno(STREAM(self)));
}
-DEF(File, isatty_QUES, NULL) {
+DEF(File, isATty_QUES, NULL) {
if (!OPEN(self)) {
raise_exception(ist, OBJ(IOEXCEPTION), "isatty called on closed stream");
return NULL;
@@ -338,7 +338,7 @@
return str_obj;
}
-DEF(File, readline, list2(ist, sym(ist, "size"), new_int_obj(ist, -1))) {
+DEF(File, readLine, list2(ist, sym(ist, "size"), new_int_obj(ist, -1))) {
int readall = FALSE;
i64_t size_in;
size_t size, total_read;
@@ -353,15 +353,15 @@
return NULL;
}
if (!has_proto_QUES(ist, self, File_OBJ)) {
- raise_exception(ist, OBJ(TYPE_EXC), "readline can only be called on a File object");
+ raise_exception(ist, OBJ(TYPE_EXC), "readLine can only be called on a File object");
return NULL;
}
if (!OPEN(self)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "readline called on closed file");
+ raise_exception(ist, OBJ(IOEXCEPTION), "readLine called on closed file");
return NULL;
}
if (!(FLAGS(self) & APR_READ)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "readline called on file opened without read perms");
+ raise_exception(ist, OBJ(IOEXCEPTION), "readLine called on file opened without read perms");
return NULL;
}
size_in = parms[1]->data.i64;
@@ -416,7 +416,7 @@
return str_obj;
}
-DEF(File, readlines, list2(ist, sym(ist, "size"), new_int_obj(ist, -1))) {
+DEF(File, readLines, list2(ist, sym(ist, "size"), new_int_obj(ist, -1))) {
int readall = FALSE;
i64_t size_in;
size_t size, total_read=0, num_read;
@@ -431,15 +431,15 @@
return NULL;
}
if (!has_proto_QUES(ist, self, File_OBJ)) {
- raise_exception(ist, OBJ(TYPE_EXC), "readlines can only be called on a File object");
+ raise_exception(ist, OBJ(TYPE_EXC), "readLines can only be called on a File object");
return NULL;
}
if (!OPEN(self)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "readlines called on closed file");
+ raise_exception(ist, OBJ(IOEXCEPTION), "readLines called on closed file");
return NULL;
}
if (!(FLAGS(self) & APR_READ)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "readlines called on file opened without read perms");
+ raise_exception(ist, OBJ(IOEXCEPTION), "readLines called on file opened without read perms");
return NULL;
}
size_in = parms[1]->data.i64;
@@ -621,18 +621,18 @@
return parms[1];
}
-DEF(File, writelines, list2(ist, sym(ist, "lst"), NULL)) {
+DEF(File, writeLines, list2(ist, sym(ist, "lst"), NULL)) {
char* str;
apr_size_t size;
apr_status_t aprerr;
char err_buf[1024];
if (!has_proto_QUES(ist, parms[1], OBJ(SEQ_PROTO)) && !has_proto_QUES(ist, parms[1], OBJ(STRING_PROTO))) {
- raise_exception(ist, OBJ(TYPE_EXC), "file writelines parameter must be a sequence or a string");
+ raise_exception(ist, OBJ(TYPE_EXC), "file writeLines parameter must be a sequence or a string");
return NULL;
}
if (!has_proto_QUES(ist, self, File_OBJ)) {
- raise_exception(ist, OBJ(TYPE_EXC), "writelines can only be called on a File object");
+ raise_exception(ist, OBJ(TYPE_EXC), "writeLines can only be called on a File object");
return NULL;
}
if (!OPEN(self)) {
@@ -640,7 +640,7 @@
return NULL;
}
if (!(FLAGS(self) & APR_WRITE)) {
- raise_exception(ist, OBJ(IOEXCEPTION), "writelines called on file opened without write perms");
+ raise_exception(ist, OBJ(IOEXCEPTION), "writeLines called on file opened without write perms");
return NULL;
}
if (has_proto_QUES(ist, parms[1], OBJ(STRING_PROTO))) {
@@ -657,7 +657,7 @@
for(i = 0; i < llen; i++) {
obj_p item = list_item(ist, parms[1], i);
if (!has_proto_QUES(ist, item, OBJ(STRING_PROTO))) {
- raise_exception(ist, OBJ(TYPE_EXC), "file writelines lst item must be a string");
+ raise_exception(ist, OBJ(TYPE_EXC), "file writeLines lst item must be a string");
return NULL;
}
str = strch(item);
@@ -673,7 +673,7 @@
return parms[1];
}
-DEF(File, set_stdout, FORM_RPARAM) {
+DEF(File, setStdOut, FORM_RPARAM) {
int i;
if (!has_proto_QUES(ist, parms[1], File_OBJ)) {
raise_exception(ist, OBJ(TYPE_EXC), "stdout can only be assigned to a file object");
@@ -696,7 +696,7 @@
return file_obj;
}
-DEF(Dir, __objlist__, NULL) {
+DEF(Dir, __objList__, NULL) {
return parms[1];
}
@@ -752,23 +752,23 @@
MODULE_SUB_INIT(File);
MODULE_ADD_SYM(File, __init__);
MODULE_ADD_SYM(File, read);
- MODULE_ADD_SYM(File, readline);
- MODULE_ADD_SYM(File, readlines);
+ MODULE_ADD_SYM(File, readLine);
+ MODULE_ADD_SYM(File, readLines);
MODULE_ADD_SYM(File, write);
- MODULE_ADD_SYM(File, writelines);
+ MODULE_ADD_SYM(File, writeLines);
MODULE_ADD_SYM(File, flush);
MODULE_ADD_SYM(File, seek);
MODULE_ADD_SYM(File, truncate);
MODULE_ADD_SYM(File, close);
MODULE_ADD_SYM(File, closed_QUES);
- MODULE_ADD_SYM(File, set_stdout);
- //MODULE_ADD_SYM(File, fileno);
- //MODULE_ADD_SYM(File, isatty_QUES);
+ MODULE_ADD_SYM(File, setStdOut);
+ //MODULE_ADD_SYM(File, fileNo);
+ //MODULE_ADD_SYM(File, isATty_QUES);
//MODULE_ADD_SYM(File, tell);
- MODULE_ADD_SYM(File, __objlist__);
+ MODULE_ADD_SYM(File, __objList__);
MODULE_SUB_INIT(Dir);
- MODULE_ADD_SYM(Dir, __objlist__);
+ MODULE_ADD_SYM(Dir, __objList__);
MODULE_ADD_SYM(Dir, __init__);
/* Create base file objects for std{in,out,err} */
Modified: trunk/modules/Prosist/Prosist.vcproj
===================================================================
--- trunk/modules/Prosist/Prosist.vcproj 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/modules/Prosist/Prosist.vcproj 2004-04-15 20:45:53 UTC (rev 361)
@@ -73,7 +73,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="c:\prothon\include;c:\prothon\apr\apr\include;c:\prothon\include\regex"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROSIST_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROSIST_EXPORTS;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -84,8 +84,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="apr.lib wsock32.lib"
OutputFile="$(OutDir)/Prosist.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\prothon\apr\apr\LibR"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/modules/Re/Re.c
===================================================================
--- trunk/modules/Re/Re.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/modules/Re/Re.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -138,7 +138,7 @@
MODULE_SET_DOC(ReCompiled, "prototype for compiled regular expressions");
}
-DEF(ReCompiled, findall, FORM_RPARAM) {
+DEF(ReCompiled, findAll, FORM_RPARAM) {
char* s;
regmatch_t* m;
obj_p res, tuple_obj;
@@ -146,7 +146,7 @@
int i, err, ngrps = numgrps(self);
regex_t* e = self->data.ptr;
if (!has_proto_QUES(ist, parms[1], OBJ(STRING_PROTO))) {
- raise_exception(ist, OBJ(TYPE_EXC), "findall s parameter must be a string");
+ raise_exception(ist, OBJ(TYPE_EXC), "findAll s parameter must be a string");
return NULL;
}
res = new_list_obj(ist, 10);
@@ -501,7 +501,7 @@
return res_obj;
}
-DEF(ReCompiled, __objlist__, FORM_RPARAM) {
+DEF(ReCompiled, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -518,7 +518,7 @@
MODULE_ADD_TO_OBJ(ReMatch, Re_OBJ, "Match");
}
-DEF(ReMatch, __objlist__, FORM_RPARAM) {
+DEF(ReMatch, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -665,12 +665,12 @@
MODULE_ADD_SYM(Re, compile);
MODULE_SUB_INIT(ReCompiled);
- MODULE_ADD_SYM(ReCompiled, findall);
+ MODULE_ADD_SYM(ReCompiled, findAll);
MODULE_ADD_SYM(ReCompiled, search);
MODULE_ADD_SYM(ReCompiled, split);
MODULE_ADD_SYM(ReCompiled, sub);
MODULE_ADD_SYM(ReCompiled, __del__);
- MODULE_ADD_SYM(ReCompiled, __objlist__);
+ MODULE_ADD_SYM(ReCompiled, __objList__);
MODULE_SUB_INIT(ReMatch);
MODULE_ADD_SYM(ReMatch, start);
@@ -679,5 +679,5 @@
MODULE_ADD_SYM(ReMatch, expand);
MODULE_ADD_SYM(ReMatch, group);
MODULE_ADD_SYM(ReMatch, groups);
- MODULE_ADD_SYM(ReMatch, __objlist__);
+ MODULE_ADD_SYM(ReMatch, __objList__);
}
Modified: trunk/modules/SQLite/SQLite.c
===================================================================
--- trunk/modules/SQLite/SQLite.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/modules/SQLite/SQLite.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -137,9 +137,9 @@
}
}
-DEF(Connection, rollback, NULL) {
+DEF(Connection, rollBack, NULL) {
if (self->data.ptr) {
- raise_exception(ist, Error_OBJ, "rollback not implemented yet, use query");
+ raise_exception(ist, Error_OBJ, "rollBack not implemented yet, use query");
return NULL;
} else {
raise_exception(ist, Error_OBJ, "connection closed");
@@ -165,7 +165,7 @@
return OBJ(NONE);
}
-DEF(Connection, __objlist__, FORM_RPARAM) {
+DEF(Connection, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -209,7 +209,7 @@
return self;
}
-DEF(Cursor, fetchone, NULL) {
+DEF(Cursor, fetchOne, NULL) {
int llen, p;
obj_p res;
cursor_p cursorp = (cursor_p)(self->data.ptr);
@@ -224,7 +224,7 @@
return res;
}
-DEF(Cursor, fetchmany, list2(ist, sym(ist, "n"), NULL)) {
+DEF(Cursor, fetchMany, list2(ist, sym(ist, "n"), NULL)) {
int i, n, llen, p, e;
obj_p res;
cursor_p cursorp = (cursor_p)(self->data.ptr);
@@ -244,7 +244,7 @@
return res;
}
-DEF(Cursor, fetchall, NULL) {
+DEF(Cursor, fetchAll, NULL) {
int i, llen, p;
obj_p res;
cursor_p cursorp = (cursor_p)(self->data.ptr);
@@ -260,14 +260,14 @@
return res;
}
-DEF(Cursor, rowcount, NULL) {
+DEF(Cursor, rowCount, NULL) {
cursor_p cursorp = (cursor_p)(self->data.ptr);
if (cursorp->row_list)
return new_int_obj(ist, list_len(ist, cursorp->row_list));
return new_int_obj(ist, -1);
}
-DEF(Cursor, __objlist__, FORM_RPARAM) {
+DEF(Cursor, __objList__, FORM_RPARAM) {
cursor_p cursorp = (cursor_p)(self->data.ptr);
if (cursorp->row_list)
return cursorp->row_list;
@@ -280,15 +280,15 @@
MODULE_ADD_SYM(SQLite, connect);
MODULE_ADD_SYM(Connection, cursor);
- MODULE_ADD_SYM(Connection, rollback);
+ MODULE_ADD_SYM(Connection, rollBack);
MODULE_ADD_SYM(Connection, commit);
MODULE_ADD_SYM(Connection, close);
- MODULE_ADD_SYM(Connection, __objlist__);
+ MODULE_ADD_SYM(Connection, __objList__);
MODULE_ADD_SYM(Cursor, execute_BANG);
- MODULE_ADD_SYM(Cursor, fetchone);
- MODULE_ADD_SYM(Cursor, fetchmany);
- MODULE_ADD_SYM(Cursor, fetchall);
- MODULE_ADD_SYM(Cursor, rowcount);
- MODULE_ADD_SYM(Cursor, __objlist__);
+ MODULE_ADD_SYM(Cursor, fetchOne);
+ MODULE_ADD_SYM(Cursor, fetchMany);
+ MODULE_ADD_SYM(Cursor, fetchAll);
+ MODULE_ADD_SYM(Cursor, rowCount);
+ MODULE_ADD_SYM(Cursor, __objList__);
}
Modified: trunk/modules/SQLite/SQLite.vcproj
===================================================================
--- trunk/modules/SQLite/SQLite.vcproj 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/modules/SQLite/SQLite.vcproj 2004-04-15 20:45:53 UTC (rev 361)
@@ -71,10 +71,12 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="c:\prothon\include;c:\prothon\apr\apr\include;c:\prothon\SQLiteC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
@@ -84,7 +86,7 @@
AdditionalDependencies="SQLiteC.lib"
OutputFile="$(OutDir)/SQLite.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Prothon\SQLiteC\Release"
+ AdditionalLibraryDirectories="C:\Prothon\SQLiteC\Debug"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/pr/dict.pr
===================================================================
--- trunk/pr/dict.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/dict.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -9,7 +9,7 @@
if d.get(2) != None : print 'error2 in get'
if d.get(3,4) != 4 : print 'error3 in get'
if d.get(3,5) != 5 : print 'error4 in get'
-if d.setdefault!(3,4) != 4 : print 'error5 in setdefault'
+if d.setDefault!(3,4) != 4 : print 'error5 in setdefault'
if d.get(3,5) != 4 : print 'error6 in get'
if 3 not in d: print 'error 7 in notin'
@@ -29,12 +29,12 @@
if d.items() != e.items():
print d.items(), e.items(), 'error3'
-if not e.has_key?(1) or e.has_key?(2): print 'error4'
+if not e.hasKey?(1) or e.hasKey?(2): print 'error4'
print 'all tests passed'
print '\nfollowing should be: 1 (1,2) 3 (3,4)\n'
-for i in e: print i, d.popitem!(),
+for i in e: print i, d.popItem!(),
print '\n'
\ No newline at end of file
Modified: trunk/pr/file_test.pr
===================================================================
--- trunk/pr/file_test.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/file_test.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -5,7 +5,7 @@
f = File("test.txt", 'w+')
for i in 5:
f.write("line "+i+'\n')
-f.writelines( ['line 5\n','line 6\n','line 7\n','line 8\n','line 9\n',])
+f.writeLines( ['line 5\n','line 6\n','line 7\n','line 8\n','line 9\n',])
f.close()
ref = ['line 0\n','line 1\n','line 2\n','line 3\n','line 4\n',]
@@ -32,7 +32,7 @@
print "test failed: x != 'line 3line 4'"
Sys.exit(1)
-x = f.readlines()
+x = f.readLines()
ref = ['line 5\n','line 6\n','line 7\n','line 8\n','line 9\n',]
print x
if (''.join(x) != ''.join(ref)):
Modified: trunk/pr/re_test.pr
===================================================================
--- trunk/pr/re_test.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/re_test.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -2,21 +2,21 @@
import Re
-def findall(r,s):
+def findAll(r,s):
result=[]
- def foundone(mo):
+ def foundOne(mo):
&result.append!(mo.group())
return ''
- r.sub(foundone, s)
+ r.sub(foundOne, s)
return result
re = Re.compile("m..k")
s = 'this mark likes to muck around in minks'
-print findall(re, s)
+print findAll(re, s)
-print re.findall(s)
+print re.findAll(s)
print re.split(s, 2)
Modified: trunk/pr/sqlite.pr
===================================================================
--- trunk/pr/sqlite.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/sqlite.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -44,26 +44,26 @@
curs1.execute!("select * from tbl1")
-if curs1.rowcount() != 2:
- print 'curs1.rowcount() error'
+if curs1.rowCount() != 2:
+ print 'curs1.rowCount() error'
Sys.exit(1)
-rows1 = curs1.fetchall()
+rows1 = curs1.fetchAll()
for row in rows1:
curs2.execute!('select * from tbl2 where a='+row[0])
- if curs2.rowcount() != 9:
- print 'curs2.rowcount() error, rows1:', rows1, 'rowcount:',curs2.rowcount()
+ if curs2.rowCount() != 9:
+ print 'curs2.rowCount() error, rows1:', rows1, 'rowCount:',curs2.rowCount()
Sys.exit(1)
for i in 4:
- row2 = curs2.fetchone()
+ row2 = curs2.fetchOne()
if row2[2] != ''+(101+i) and row2[2] != ''+(201+i):
print 'row2[2] error'
Sys.exit(1)
- rows2 = curs2.fetchmany(3)
+ rows2 = curs2.fetchMany(3)
if Len(rows2) != 3:
print 'Len(rows2) error1, rows2:', rows2
Sys.exit(1)
- rows2 = curs2.fetchmany(3)
+ rows2 = curs2.fetchMany(3)
if Len(rows2) != 2:
print 'Len(rows2) error2'
Sys.exit(1)
Modified: trunk/pr/stdio_test.pr
===================================================================
--- trunk/pr/stdio_test.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/stdio_test.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -8,7 +8,7 @@
stdout.write("Enter your name: ")
-name = stdin.readline()
+name = stdin.readLine()
stdout.write("Hello " + name)
@@ -16,6 +16,6 @@
print "Opening test file for stdout"
-File.set_stdout(File("stdout.txt", "w+"))
+File.setStdOut(File("stdout.txt", "w+"))
stdout.write("Should still go to stdout\n")
File.stdout.write("Should go to stdout.txt file\n")
Modified: trunk/pr/threads.pr
===================================================================
--- trunk/pr/threads.pr 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/pr/threads.pr 2004-04-15 20:45:53 UTC (rev 361)
@@ -5,7 +5,7 @@
Finished_thread_count = 0
def func(n, d):
- my_thread = Current_thread()
+ my_thread = CurrentThread()
print my_thread, "started"
for i in n:
Sleep(d)
Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-core.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -107,7 +107,7 @@
if (self->data_type == DATA_TYPE_DATAPTR) {
obj_p cdata_len = call_func0(ist, self, SYM(__CDATALEN__));
if (!cdata_len) {
- raise_exception(ist, OBJ(INTERNAL_EXC), "fatal error: __cdatalen__() call failed");
+ raise_exception(ist, OBJ(INTERNAL_EXC), "fatal error: __cDataLen__() call failed");
return NULL;
}
cdata_size = (size_t) cdata_len->data.i64;
@@ -121,21 +121,21 @@
return copy;
}
-DEF(Object, has_proto_QUES, FORM_RPARAM) {
+DEF(Object, hasProto_QUES, FORM_RPARAM) {
if (has_proto_QUES(ist, self, parms[1]))
return OBJ(PR_TRUE);
else
return OBJ(PR_FALSE);
}
-DEF(Object, set_proto, FORM_RPARAM) {
+DEF(Object, setProto, FORM_RPARAM) {
read_unlock(ist, self);
switch_proto(ist, self, parms[1]);
read_lock(ist, self);
return NULL;
}
-DEF(Object, add_proto, FORM_RPARAM) {
+DEF(Object, addProto, FORM_RPARAM) {
read_unlock(ist, self);
ins_proto(ist, self, parms[1], 1000);
read_lock(ist, self);
@@ -158,7 +158,7 @@
return call_func0(ist, parms[1], SYM(MIN));
}
-DEF(Object, set_read_access, FORM_RPARAM) {
+DEF(Object, setReadAccess, FORM_RPARAM) {
CHECK_TYPE_EXC(parms[1], OBJ(INT_PROTO), "integer");
if (ist->access < get_obj_wracc(self)) {
raise_exception(ist, OBJ(PERMISSION_EXC), "write access permission error");
@@ -168,11 +168,11 @@
return parms[1];
}
-DEF(Object, read_access, NULL) {
+DEF(Object, readAccess, NULL) {
return new_int_obj(ist, get_obj_rdacc(self));
}
-DEF(Object, read_access_str, NULL) {
+DEF(Object, readAccessStr, NULL) {
switch (get_obj_rdacc(self)) {
case 0: return new_string_obj(ist, "guest");
case 1: return new_string_obj(ist, "user1");
@@ -182,7 +182,7 @@
}
}
-DEF(Object, set_write_access, FORM_RPARAM) {
+DEF(Object, setWriteAccess, FORM_RPARAM) {
CHECK_TYPE_EXC(parms[1], OBJ(INT_PROTO), "integer");
if (ist->access < get_obj_wracc(self)) {
raise_exception(ist, OBJ(PERMISSION_EXC), "write access permission error");
@@ -192,11 +192,11 @@
return parms[1];
}
-DEF(Object, write_access, NULL) {
+DEF(Object, writeAccess, NULL) {
return new_int_obj(ist, get_obj_wracc(self));
}
-DEF(Object, write_access_str, NULL) {
+DEF(Object, writeAccessStr, NULL) {
switch (get_obj_wracc(self)) {
case 0: return new_string_obj(ist, "guest");
case 1: return new_string_obj(ist, "user1");
@@ -206,20 +206,20 @@
}
}
-DEF(Object, __getitem__, FORM_RPARAM) {
+DEF(Object, __getItem__, FORM_RPARAM) {
raise_exception(ist, OBJ(TYPE_EXC), "indexing not supported on this object");
return NULL;
}
-DEF(Object, __setitem__, FORM_PARAM2) {
+DEF(Object, __setItem__, FORM_PARAM2) {
raise_exception(ist, OBJ(TYPE_EXC), "indexing not supported on this object");
return NULL;
}
-DEF(Object, __delitem__, FORM_RPARAM) {
+DEF(Object, __delItem__, FORM_RPARAM) {
raise_exception(ist, OBJ(TYPE_EXC), "indexing not supported on this object");
return NULL;
}
-DEF(Object, proto_list, NULL) {
+DEF(Object, protoList, NULL) {
return proto_list(ist, self);
}
@@ -237,7 +237,7 @@
else return OBJ(PR_FALSE);
}
-DEF(Object, __isnot__QUES, FORM_RPARAM) {
+DEF(Object, __isNot__QUES, FORM_RPARAM) {
if (self != parms[1]) return OBJ(PR_TRUE);
else return OBJ(PR_FALSE);
}
@@ -301,7 +301,7 @@
return call_func1(ist, parms[1], SYM(__RIN__QUES), self);
}
-DEF(Object, __notin__QUES, FORM_RPARAM) {
+DEF(Object, __notIn__QUES, FORM_RPARAM) {
return call_func1(ist, parms[1], SYM(__RNOTIN__QUES), self);
}
@@ -324,7 +324,7 @@
return dict_obj;
}
-DEF(Object, Current_thread, NULL) {
+DEF(Object, CurrentThread, NULL) {
return os_thread_2_obj(apr_os_thread_current());
}
@@ -374,7 +374,7 @@
else
return new_int_obj(ist, -1);
}
-DEF(True, __getcmp__, NULL) {
+DEF(True, __getCmp__, NULL) {
return get_attr(ist, self, SYM(__CMPVALOBJ__));
}
@@ -637,11 +637,11 @@
MODULE_SET_DOC(Func, "function object prototype");
}
-DEF(Func, __cdatalen__, NULL) {
+DEF(Func, __cDataLen__, NULL) {
return new_int_obj(ist, sizeof(code) + ((code_p)(self->data.ptr))->len * sizeof(code_t));
}
-DEF(Func, __objlist__, FORM_RPARAM) {
+DEF(Func, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -651,27 +651,27 @@
MODULE_SUB_INIT(Object);
MODULE_ADD_SYM(Object, __init__);
MODULE_ADD_SYM(Object, copy);
- MODULE_ADD_SYM(Object, set_read_access);
- MODULE_ADD_SYM(Object, read_access);
- MODULE_ADD_SYM(Object, read_access_str);
- MODULE_ADD_SYM(Object, set_write_access);
- MODULE_ADD_SYM(Object, write_access);
- MODULE_ADD_SYM(Object, write_access_str);
- MODULE_ADD_SYM(Object, has_proto_QUES);
- MODULE_ADD_SYM(Object, set_proto);
- MODULE_ADD_SYM(Object, add_proto);
- MODULE_ADD_SYM(Object, proto_list);
+ MODULE_ADD_SYM(Object, setReadAccess);
+ MODULE_ADD_SYM(Object, readAccess);
+ MODULE_ADD_SYM(Object, readAccessStr);
+ MODULE_ADD_SYM(Object, setWriteAccess);
+ MODULE_ADD_SYM(Object, writeAccess);
+ MODULE_ADD_SYM(Object, writeAccessStr);
+ MODULE_ADD_SYM(Object, hasProto_QUES);
+ MODULE_ADD_SYM(Object, setProto);
+ MODULE_ADD_SYM(Object, addProto);
+ MODULE_ADD_SYM(Object, protoList);
MODULE_ADD_SYM(Object, Cmp);
MODULE_ADD_SYM(Object, Len);
MODULE_ADD_SYM(Object, Max);
MODULE_ADD_SYM(Object, Min);
- MODULE_ADD_SYM(Object, __getitem__);
- MODULE_ADD_SYM(Object, __setitem__);
- MODULE_ADD_SYM(Object, __delitem__);
+ MODULE_ADD_SYM(Object, __getItem__);
+ MODULE_ADD_SYM(Object, __setItem__);
+ MODULE_ADD_SYM(Object, __delItem__);
MODULE_ADD_SYM(Object, __bool__QUES);
MODULE_ADD_SYM(Object, __not__QUES);
MODULE_ADD_SYM(Object, __is__QUES);
- MODULE_ADD_SYM(Object, __isnot__QUES);
+ MODULE_ADD_SYM(Object, __isNot__QUES);
MODULE_ADD_SYM(Object, __str__);
MODULE_ADD_SYM(Object, __hash__);
MODULE_ADD_SYM(Object, __eq__QUES);
@@ -681,9 +681,9 @@
MODULE_ADD_SYM(Object, __gt__QUES);
MODULE_ADD_SYM(Object, __ge__QUES);
MODULE_ADD_SYM(Object, __in__QUES);
- MODULE_ADD_SYM(Object, __notin__QUES);
+ MODULE_ADD_SYM(Object, __notIn__QUES);
MODULE_ADD_SYM(Object, attrs);
- MODULE_ADD_SYM(Object, Current_thread);
+ MODULE_ADD_SYM(Object, CurrentThread);
MODULE_ADD_SYM(Object, Sleep);
MODULE_SUB_INIT(Seq);
@@ -697,7 +697,7 @@
MODULE_ADD_SYM(True, __str__);
MODULE_ADD_SYM(True, __bool__QUES);
MODULE_ADD_SYM(True, cmp);
- MODULE_ADD_SYM(True, __getcmp__);
+ MODULE_ADD_SYM(True, __getCmp__);
MODULE_SUB_INIT(None);
MODULE_ADD_SYM(None, __str__);
@@ -711,6 +711,6 @@
MODULE_ADD_SYM(Gen, __gen__);
MODULE_SUB_INIT(Func);
- MODULE_ADD_SYM(Func, __cdatalen__);
- MODULE_ADD_SYM(Func, __objlist__);
+ MODULE_ADD_SYM(Func, __cDataLen__);
+ MODULE_ADD_SYM(Func, __objList__);
}
Modified: trunk/src/builtins-dict.c
===================================================================
--- trunk/src/builtins-dict.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-dict.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -278,7 +278,7 @@
return res_obj;
}
-DEF(Dict, has_key_QUES, FPARM1(k, NULL)) {
+DEF(Dict, hasKey_QUES, FPARM1(k, NULL)) {
obj_p res;
if ((res = dict_item(ist, self, parms[1]))) {
del_unlock(res);
@@ -295,7 +295,7 @@
return parms[3];
}
-DEF(Dict, __rin__QUES, FORM_RPARAM) {
+DEF(Dict, __rIn__QUES, FORM_RPARAM) {
obj_p res;
if ((res = dict_item(ist, self, parms[1]))) {
del_unlock(res);
@@ -304,7 +304,7 @@
return OBJ(PR_FALSE);
}
-DEF(Dict, __rnotin__QUES, FORM_RPARAM) {
+DEF(Dict, __rNotIn__QUES, FORM_RPARAM) {
obj_p res;
if ((res = dict_item(ist, self, parms[1]))) {
del_unlock(res);
@@ -313,16 +313,16 @@
return OBJ(PR_TRUE);
}
-DEF(Dict, __cdatalen__, NULL) {
+DEF(Dict, __cDataLen__, NULL) {
return new_int_obj(ist, dict_size_bytes(self->data.ptr));
}
-DEF(Dict, __objlist__, FORM_RPARAM) {
+DEF(Dict, __objList__, FORM_RPARAM) {
return parms[1];
}
-DEF(Dict, __getitem__, FORM_RPARAM) {
+DEF(Dict, __getItem__, FORM_RPARAM) {
obj_p res;
CHECK_TYPE_EXC(self, OBJ(DICT_PROTO), "dict");
@@ -339,7 +339,7 @@
return res;
}
-DEF(Dict, __setitem__, FORM_PARAM2) {
+DEF(Dict, __setItem__, FORM_PARAM2) {
if (list_len(ist, parms[1]) > 1) {
raise_exception(ist, OBJ(INTERPRETER_EXC), "slice not allowed in dictionary indexing");
return NULL;
@@ -350,7 +350,7 @@
return NULL;
}
-DEF(Dict, __delitem__, FORM_RPARAM) {
+DEF(Dict, __delItem__, FORM_RPARAM) {
i32_t i, hash_in;
obj_p key, key_in, rp[2];
dict_p dict, dp;
@@ -420,7 +420,7 @@
return self;
}
-DEF(Dict, setdefault_BANG, FPARM2(k, NULL, x, OBJ(NONE))) {
+DEF(Dict, setDefault_BANG, FPARM2(k, NULL, x, OBJ(NONE))) {
obj_p res;
if ((res = dict_item(ist, self, parms[1]))) {
return res;
@@ -431,7 +431,7 @@
return parms[3];
}
-DEF(Dict, popitem_BANG, NULL) {
+DEF(Dict, popItem_BANG, NULL) {
return dict_keys_values(ist, self, 4 /*tuple*/);
}
@@ -473,23 +473,23 @@
MODULE_SUB_INIT(Dict);
MODULE_ADD_SYM(Dict, __init__);
MODULE_ADD_SYM(Dict, __str__);
- MODULE_ADD_SYM(Dict, has_key_QUES);
+ MODULE_ADD_SYM(Dict, hasKey_QUES);
MODULE_ADD_SYM(Dict, items);
MODULE_ADD_SYM(Dict, keys);
MODULE_ADD_SYM(Dict, values);
MODULE_ADD_SYM(Dict, get);
MODULE_ADD_SYM(Dict, clear_BANG);
MODULE_ADD_SYM(Dict, update_BANG);
- MODULE_ADD_SYM(Dict, setdefault_BANG);
- MODULE_ADD_SYM(Dict, popitem_BANG);
- MODULE_ADD_SYM(Dict, __rin__QUES);
- MODULE_ADD_SYM(Dict, __rnotin__QUES);
- MODULE_ADD_SYM(Dict, __getitem__);
- MODULE_ADD_SYM(Dict, __setitem__);
- MODULE_ADD_SYM(Dict, __delitem__);
+ MODULE_ADD_SYM(Dict, setDefault_BANG);
+ MODULE_ADD_SYM(Dict, popItem_BANG);
+ MODULE_ADD_SYM(Dict, __rIn__QUES);
+ MODULE_ADD_SYM(Dict, __rNotIn__QUES);
+ MODULE_ADD_SYM(Dict, __getItem__);
+ MODULE_ADD_SYM(Dict, __setItem__);
+ MODULE_ADD_SYM(Dict, __delItem__);
MODULE_ADD_SYM(Dict, __gen__);
- MODULE_ADD_SYM(Dict, __objlist__);
- MODULE_ADD_SYM(Dict, __cdatalen__);
+ MODULE_ADD_SYM(Dict, __objList__);
+ MODULE_ADD_SYM(Dict, __cDataLen__);
MODULE_SUB_INIT(DictGen);
MODULE_ADD_SYM(DictGen, next);
Modified: trunk/src/builtins-float.c
===================================================================
--- trunk/src/builtins-float.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-float.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -180,7 +180,7 @@
return new_float_obj(ist, Float_value(self) / float_other);
}
-DEF(Float, __rdiv__, FORM_RPARAM){
+DEF(Float, __rDiv__, FORM_RPARAM){
double float_other;
obj_p other = parms[1];
if (is_Float(other)) float_other = Float_value(other);
@@ -233,7 +233,7 @@
return new_float_obj(ist, Float_value(self) - float_other);
}
-DEF(Float, __rsub__, FORM_RPARAM){
+DEF(Float, __rSub__, FORM_RPARAM){
double float_other;
obj_p other = parms[1];
if (is_Float(other)) float_other = Float_value(other);
@@ -265,7 +265,7 @@
return new_float_obj(ist, pow(Float_value(self), float_other));
}
-DEF(Float, __rpow__, FORM_RPARAM){
+DEF(Float, __rPow__, FORM_RPARAM){
double float_other;
obj_p other = parms[1];
if (is_Float(other)) float_other = Float_value(other);
@@ -303,7 +303,7 @@
return new_int_obj(ist, -1);
}
-DEF(Float, __rcmp__, FORM_RPARAM){
+DEF(Float, __rCmp__, FORM_RPARAM){
double float_other;
obj_p other = parms[1];
if (is_Float(other)) float_other = Float_value(other);
@@ -372,18 +372,18 @@
MODULE_ADD_SYM(Float, __hash__);
MODULE_ADD_SYM(Float, __eq__QUES);
MODULE_ADD_SYM(Float, cmp);
- MODULE_ADD_SYM(Float, __rcmp__);
+ MODULE_ADD_SYM(Float, __rCmp__);
MODULE_ADD_SYM(Float, __abs__);
MODULE_ADD_SYM(Float, __neg__);
MODULE_ADD_SYM(Float, __pos__);
MODULE_ADD_SYM(Float, __add__);
MODULE_ADD_SYM(Float, __sub__);
- MODULE_ADD_SYM(Float, __rsub__);
+ MODULE_ADD_SYM(Float, __rSub__);
MODULE_ADD_SYM(Float, __mul__);
MODULE_ADD_SYM(Float, __div__);
- MODULE_ADD_SYM(Float, __rdiv__);
+ MODULE_ADD_SYM(Float, __rDiv__);
MODULE_ADD_SYM(Float, __pow__);
- MODULE_ADD_SYM(Float, __rpow__);
+ MODULE_ADD_SYM(Float, __rPow__);
MODULE_ADD_SYM(Float, __covers__QUES);
MODULE_ADD_SYM(Float, __coerce__);
}
Modified: trunk/src/builtins-int.c
===================================================================
--- trunk/src/builtins-int.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-int.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -163,7 +163,7 @@
return res;
}
-DEF(Int, __floordiv__, FORM_RPARAM){
+DEF(Int, __floorDiv__, FORM_RPARAM){
obj_p other = parms[1];
if (!is_Int(other)) {
if (covers(other, self))
@@ -282,7 +282,7 @@
return new_int_obj(ist, Int_value(self) | Int_value(other));
}
-DEF(Int, __rshift__, FORM_RPARAM) {
+DEF(Int, __rShift__, FORM_RPARAM) {
obj_p other = parms[1];
if (!is_Int(other)) {
raise_exception(ist, OBJ(TYPE_EXC), "object cannot be shifted with an Integer");
@@ -291,7 +291,7 @@
return new_int_obj(ist, Int_value(self) >> Int_value(other));
}
-DEF(Int, __lshift__, FORM_RPARAM) {
+DEF(Int, __lShift__, FORM_RPARAM) {
obj_p other = parms[1];
if (!is_Int(other)) {
raise_exception(ist, OBJ(TYPE_EXC), "object cannot be shifted with an Integer");
@@ -366,15 +366,15 @@
MODULE_ADD_SYM(Int, __sub__);
MODULE_ADD_SYM(Int, __mul__);
MODULE_ADD_SYM(Int, __div__);
- MODULE_ADD_SYM(Int, __floordiv__);
+ MODULE_ADD_SYM(Int, __floorDiv__);
MODULE_ADD_SYM(Int, __mod__);
MODULE_ADD_SYM(Int, __pow__);
MODULE_ADD_SYM(Int, __invert__);
MODULE_ADD_SYM(Int, __xor__);
MODULE_ADD_SYM(Int, __and__);
MODULE_ADD_SYM(Int, __or__);
- MODULE_ADD_SYM(Int, __rshift__);
- MODULE_ADD_SYM(Int, __lshift__);
+ MODULE_ADD_SYM(Int, __rShift__);
+ MODULE_ADD_SYM(Int, __lShift__);
MODULE_ADD_SYM(Int, __gen__);
MODULE_SUB_INIT(IntGen);
Modified: trunk/src/builtins-list.c
===================================================================
--- trunk/src/builtins-list.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-list.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -305,11 +305,11 @@
return str_tuple_list(ist, self, "[", "]");
}
-DEF(List, __getitem__, FORM_RPARAM) {
+DEF(List, __getItem__, FORM_RPARAM) {
return get_sequence_item(ist, self, parms[1], SEQ_TYPE_LIST);
}
-DEF(List, __setitem__, FORM_PARAM2) {
+DEF(List, __setItem__, FORM_PARAM2) {
int j;
obj_p slice_item1, slice_item2, slice_item3;
obj_p slice = parms[1], value = parms[3];
@@ -423,7 +423,7 @@
return NULL;
}
-DEF(List, __delitem__, FORM_RPARAM) {
+DEF(List, __delItem__, FORM_RPARAM) {
int j;
obj_p slice_item1, slice_item2, slice_item3;
obj_p slice = parms[1];
@@ -728,9 +728,9 @@
MODULE_SUB_INIT(List);
MODULE_ADD_SYM(List, __init__);
MODULE_ADD_SYM(List, __str__);
- MODULE_ADD_SYM(List, __getitem__);
- MODULE_ADD_SYM(List, __setitem__);
- MODULE_ADD_SYM(List, __delitem__);
+ MODULE_ADD_SYM(List, __getItem__);
+ MODULE_ADD_SYM(List, __setItem__);
+ MODULE_ADD_SYM(List, __delItem__);
MODULE_ADD_SYM(List, __add__);
MODULE_ADD_SYM(List, __mul__);
MODULE_ADD_SYM(List, append_BANG);
Modified: trunk/src/builtins-string.c
===================================================================
--- trunk/src/builtins-string.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-string.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -146,20 +146,20 @@
return new_hash_obj(ist, res);
}
-DEF(String, __objlist__, FORM_RPARAM) {
+DEF(String, __objList__, FORM_RPARAM) {
return parms[1];
}
-DEF(String, __getitem__, FORM_RPARAM) {
+DEF(String, __getItem__, FORM_RPARAM) {
return get_sequence_item(ist, self, parms[1], SEQ_TYPE_STRING);
}
-DEF(String, __setitem__, FORM_RPARAM) {
+DEF(String, __setItem__, FORM_RPARAM) {
raise_exception(ist, OBJ(MUTABLE_EXC), "strings may not be modifed");
return NULL;
}
-DEF(String, __delitem__, NULL) {
+DEF(String, __delItem__, NULL) {
raise_exception(ist, OBJ(MUTABLE_EXC), "strings may not be modifed");
return NULL;
}
@@ -349,7 +349,7 @@
else return OBJ(PR_FALSE);
}
-DEF(String, __notin__QUES, FORM_RPARAM) {
+DEF(String, __notIn__QUES, FORM_RPARAM) {
if (!has_proto_QUES(ist, parms[1], String_OBJ))
return call_func1(ist, parms[1], SYM(__RNOTIN__QUES), self);
if (strstr(strch(parms[1]), strch(self))) return OBJ(PR_FALSE);
@@ -365,7 +365,7 @@
else return OBJ(PR_FALSE);
}
-DEF(String, __cdatalen__, NULL) {
+DEF(String, __cDataLen__, NULL) {
return new_int_obj(ist, sizeof(pr_str_t) + pr_strlen(self) + 1);
}
@@ -408,18 +408,18 @@
MODULE_ADD_SYM(String, cmp);
MODULE_ADD_SYM(String, ord);
MODULE_ADD_SYM(String, len);
- MODULE_ADD_SYM(String, __getitem__);
+ MODULE_ADD_SYM(String, __getItem__);
MODULE_ADD_SYM(String, __add__);
MODULE_ADD_SYM(String, __mul__);
MODULE_ADD_SYM(String, __mod__);
MODULE_ADD_SYM(String, __gen__);
MODULE_ADD_SYM(String, join);
MODULE_ADD_SYM(String, __in__QUES);
- MODULE_ADD_SYM(String, __notin__QUES);
- MODULE_ADD_SYM(String, __setitem__);
- MODULE_ADD_SYM(String, __delitem__);
- MODULE_ADD_SYM(String, __objlist__);
- MODULE_ADD_SYM(String, __cdatalen__);
+ MODULE_ADD_SYM(String, __notIn__QUES);
+ MODULE_ADD_SYM(String, __setItem__);
+ MODULE_ADD_SYM(String, __delItem__);
+ MODULE_ADD_SYM(String, __objList__);
+ MODULE_ADD_SYM(String, __cDataLen__);
MODULE_SUB_INIT(StringGen);
MODULE_ADD_SYM(StringGen, next);
Modified: trunk/src/builtins-thread.c
===================================================================
--- trunk/src/builtins-thread.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-thread.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -256,7 +256,7 @@
return new_int_obj(ist, ist->access);
}
-DEF(Thread, set_access, FORM_RPARAM) {
+DEF(Thread, setAccess, FORM_RPARAM) {
int new_access;
CHECK_TYPE_EXC(parms[1], OBJ(INT_PROTO), "integer");
new_access = (int) parms[1]->data.i64;
@@ -269,7 +269,7 @@
return parms[1];
}
-DEF(Thread, access_str, NULL) {
+DEF(Thread, accessStr, NULL) {
switch (ist->access) {
case 0: return new_string_obj(ist, "guest");
case 1: return new_string_obj(ist, "user1");
@@ -302,7 +302,7 @@
return new_int_obj(ist, retval);
}
-DEF(Thread, __objlist__, FORM_RPARAM) {
+DEF(Thread, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -344,7 +344,7 @@
return self;
}
-DEF(Mutex, try_lock, NULL) {
+DEF(Mutex, tryLock, NULL) {
apr_status_t aprerr = apr_thread_mutex_trylock((apr_thread_mutex_t*)(self->data.ptr));
if (APR_STATUS_IS_EBUSY(aprerr)) return OBJ(PR_FALSE);
else if (aprerr == APR_SUCCESS) return OBJ(PR_TRUE);
@@ -363,7 +363,7 @@
return OBJ(NONE);
}
-DEF(Mutex, __objlist__, FORM_RPARAM) {
+DEF(Mutex, __objList__, FORM_RPARAM) {
return parms[1];
}
@@ -373,19 +373,19 @@
MODULE_ADD_SYM(Thread, __init__);
MODULE_ADD_SYM(Thread, __str__);
MODULE_ADD_SYM(Thread, access);
- MODULE_ADD_SYM(Thread, access_str);
- MODULE_ADD_SYM(Thread, set_access);
+ MODULE_ADD_SYM(Thread, accessStr);
+ MODULE_ADD_SYM(Thread, setAccess);
MODULE_ADD_SYM(Thread, running_QUES);
MODULE_ADD_SYM(Thread, sleep);
MODULE_ADD_SYM(Thread, join);
- MODULE_ADD_SYM(Thread, __objlist__);
+ MODULE_ADD_SYM(Thread, __objList__);
MODULE_SUB_INIT(Mutex);
MODULE_ADD_SYM(Mutex, __init__);
MODULE_ADD_SYM(Mutex, __str__);
MODULE_ADD_SYM(Mutex, lock);
- MODULE_ADD_SYM(Mutex, try_lock);
+ MODULE_ADD_SYM(Mutex, tryLock);
MODULE_ADD_SYM(Mutex, unlock);
MODULE_ADD_SYM(Mutex, __del__);
- MODULE_ADD_SYM(Mutex, __objlist__);
+ MODULE_ADD_SYM(Mutex, __objList__);
}
Modified: trunk/src/builtins-tuple.c
===================================================================
--- trunk/src/builtins-tuple.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/builtins-tuple.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -106,21 +106,21 @@
return str_tuple_list(ist, self, "(", ")");
}
-DEF(Tuple, __getitem__, FORM_RPARAM) {
+DEF(Tuple, __getItem__, FORM_RPARAM) {
return get_sequence_item(ist, self, parms[1], SEQ_TYPE_TUPLE);
}
-DEF(Tuple, __setitem__, FORM_RPARAM) {
+DEF(Tuple, __setItem__, FORM_RPARAM) {
raise_exception(ist, OBJ(MUTABLE_EXC), "tuples may not be modifed");
return NULL;
}
-DEF(Tuple, __delitem__, NULL) {
+DEF(Tuple, __delItem__, NULL) {
raise_exception(ist, OBJ(MUTABLE_EXC), "tuples may not be modifed");
return NULL;
}
-DEF(Tuple, __objlist__, FORM_RPARAM) {
+DEF(Tuple, __objList__, FORM_RPARAM) {
return self;
}
@@ -166,7 +166,7 @@
return OBJ(PR_TRUE);
}
-DEF(Tuple, __rin__QUES, FORM_RPARAM) {
+DEF(Tuple, __rIn__QUES, FORM_RPARAM) {
int i, llen = (int) list_len(ist, self);
obj_p item, tgt = parms[1];
for(i=0; i < llen; i++) {
@@ -178,7 +178,7 @@
return OBJ(PR_FALSE);
}
-DEF(Tuple, __rnotin__QUES, FORM_RPARAM) {
+DEF(Tuple, __rNotIn__QUES, FORM_RPARAM) {
int i, llen = (int) list_len(ist, self);
obj_p item, tgt = parms[1];
for(i=0; i < llen; i++) {
@@ -287,7 +287,7 @@
return NULL;
}
-DEF(Tuple, __cdatalen__, NULL) {
+DEF(Tuple, __cDataLen__, NULL) {
return new_int_obj(ist, list_sizeof(listsize(self)));
}
@@ -333,16 +333,16 @@
MODULE_ADD_SYM(Tuple, __eq__QUES);
MODULE_ADD_SYM(Tuple, count);
MODULE_ADD_SYM(Tuple, index);
- MODULE_ADD_SYM(Tuple, __getitem__);
+ MODULE_ADD_SYM(Tuple, __getItem__);
MODULE_ADD_SYM(Tuple, __add__);
MODULE_ADD_SYM(Tuple, __mul__);
- MODULE_ADD_SYM(Tuple, __rin__QUES);
- MODULE_ADD_SYM(Tuple, __rnotin__QUES);
+ MODULE_ADD_SYM(Tuple, __rIn__QUES);
+ MODULE_ADD_SYM(Tuple, __rNotIn__QUES);
MODULE_ADD_SYM(Tuple, __gen__);
- MODULE_ADD_SYM(Tuple, __setitem__);
- MODULE_ADD_SYM(Tuple, __delitem__);
- MODULE_ADD_SYM(Tuple, __objlist__);
- MODULE_ADD_SYM(Tuple, __cdatalen__);
+ MODULE_ADD_SYM(Tuple, __setItem__);
+ MODULE_ADD_SYM(Tuple, __delItem__);
+ MODULE_ADD_SYM(Tuple, __objList__);
+ MODULE_ADD_SYM(Tuple, __cDataLen__);
MODULE_SUB_INIT(Tgen);
MODULE_ADD_SYM(Tgen, next);
Modified: trunk/src/bytecodes.h
===================================================================
--- trunk/src/bytecodes.h 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/bytecodes.h 2004-04-15 20:45:53 UTC (rev 361)
@@ -264,7 +264,7 @@
// OP_CHAIN_CMP
// make chain compare object from items on stack
// stack: VALUE_OBJ, True/False -> cmp_object
-// if True: cmp_object = new_object with proto == True object, add __getcmp__(): return VALUE_OBJ
+// if True: cmp_object = new_object with proto == True object, add __getCmp__(): return VALUE_OBJ
// else: cmp_object = False object
// param: <unused>
// |opcode|
Modified: trunk/src/symbol.c
===================================================================
--- trunk/src/symbol.c 2004-04-15 03:57:38 UTC (rev 360)
+++ trunk/src/symbol.c 2004-04-15 20:45:53 UTC (rev 361)
@@ -67,9 +67,9 @@
{ "__neg__", 0 },
{ "__invert__", 0 },
{ "__in__QUES", 0 },
- { "__notin__QUES", 0 },
+ { "__notIn__QUES", 0 },
{ "__is__QUES", 0 },
- { "__isnot__QUES", 0 },
+ { "__isNot__QUES", 0 },
{ "__lt__QUES", 0 },
{ "__le__QUES", 0 },
{ "__gt__QUES", 0 },
@@ -80,13 +80,13 @@
{ "__or__", 0 },
{ "__xor__", 0 },
{ "__and__", 0 },
- { "__rshift__", 0 },
- { "__lshift__", 0 },
+ { "__rShift__", 0 },
+ { "__lShift__", 0 },
{ "__add__", 0 },
{ "__sub__", 0 },
{ "__mul__", 0 },
{ "__div__", 0 },
- { "__floordiv__", 0 },
+ { "__floorDiv__", 0 },
{ "__mod__", 0 },
{ "__pow__", 0 },
{ "__ior__", 0 },
@@ -101,23 +101,23 @@
{ "__ifloordiv__", 0 },
{ "__imod__", 0 },
{ "__ipow__", 0 },
- { "__rin__QUES", 0 },
- { "__rnotin__QUES", 0 },
+ { "__rIn__QUES", 0 },
+ { "__rNotIn__QUES", 0 },
{ "__rlt__", 0 },
{ "__rle__", 0 },
{ "__rgt__", 0 },
{ "__rge__", 0 },
{ "__rrshift__", 0 },
{ "__rlshift__", 0 },
- { "__rsub__", 0 },
- { "__rdiv__", 0 },
+ { "__rSub__", 0 },
+ { "__rDiv__", 0 },
{ "__rfloordiv__", 0 },
{ "__rmod__", 0 },
- { "__rpow__", 0 },
- { "__rcmp__", 0 },
+ { "__rPow__", 0 },
+ { "__rCmp__", 0 },
{ "__init__", 0 },
{ "__bool__QUES", 0 },
- { "__getcmp__", 0 },
+ { "__getCmp__", 0 },
{ "__cmpvalobj__", 0 },
{ "__gen__", 0 },
{ "__doc__", 0 },
@@ -137,11 +137,11 @@
{ "__coerce__", 0 },
{ "__str__", 0 }, // cf
{ "next", 0 },
- { "__getitem__", 0 },
- { "__setitem__", 0 },
- { "__delitem__", 0 },
- { "__objlist__", 0 },
- { "__cdatalen__", 0 },
+ { "__getItem__", 0 },
+ { "__setItem__", 0 },
+ { "__delItem__", 0 },
+ { "__objList__", 0 },
+ { "__cDataLen__", 0 },
{ "__del__", 0 },
{ "len", 0 },
{ "max", 0 },