rev 331 - in trunk: . modules/File modules/Re src

SVN User <[email protected]>
Newsgroups gmane.comp.lang.prothon.cvs
Message-ID <[email protected]> 
Author: mark
Date: 2004-04-11 15:10:50 -0400 (Sun, 11 Apr 2004)
New Revision: 331

Modified:
   trunk/
   trunk/modules/File/File.c
   trunk/modules/Re/Re.c
   trunk/src/builtins-core.c
   trunk/src/builtins-dict.c
   trunk/src/builtins-float.c
   trunk/src/builtins-int.c
   trunk/src/builtins-string.c
   trunk/src/builtins-thread.c
   trunk/src/builtins-tuple.c
Log:
cleaned up init order of module functions to match docs,
changed Thread.running() to thread.running?()


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - config.log
config.cache
config.status
Makefile
prothon.ncb
prothon.sln
prothon.suo
bison_prothon.bat.lnk
apr
Rules.mk
libtool
Shortcut to rel.bat.lnk
Shortcut to prothon.exe.lnk
mro.py

   + config.log
config.cache
config.status
Makefile
prothon.ncb
prothon.sln
prothon.suo
bison_prothon.bat.lnk
apr
Rules.mk
libtool
Shortcut to rel.bat.lnk
Shortcut to prothon.exe.lnk
mro.py
release-checklist.txt


Modified: trunk/modules/File/File.c
===================================================================
--- trunk/modules/File/File.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/modules/File/File.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -750,21 +750,21 @@
 
 	MODULE_SUB_INIT(File);
 	MODULE_ADD_SYM(File, __init__);
-	MODULE_ADD_SYM(File, __objlist__);
-	MODULE_ADD_SYM(File, close);
-	MODULE_ADD_SYM(File, closed_QUES);
-	MODULE_ADD_SYM(File, flush);
-	//MODULE_ADD_SYM(File, fileno);
-	//MODULE_ADD_SYM(File, isatty_QUES);
 	MODULE_ADD_SYM(File, read);
 	MODULE_ADD_SYM(File, readline);
 	MODULE_ADD_SYM(File, readlines);
+	MODULE_ADD_SYM(File, write);
+	MODULE_ADD_SYM(File, writelines);
+	MODULE_ADD_SYM(File, flush);
 	MODULE_ADD_SYM(File, seek);
-	//MODULE_ADD_SYM(File, tell);
 	MODULE_ADD_SYM(File, truncate);
-	MODULE_ADD_SYM(File, write);
-	MODULE_ADD_SYM(File, writelines);
+	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, tell);
+	MODULE_ADD_SYM(File, __objlist__);
 
 	MODULE_SUB_INIT(Dir);
 	MODULE_ADD_SYM(Dir, __objlist__);

Modified: trunk/modules/Re/Re.c
===================================================================
--- trunk/modules/Re/Re.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/modules/Re/Re.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -666,18 +666,18 @@
 
 	MODULE_SUB_INIT(ReCompiled);
 	MODULE_ADD_SYM(ReCompiled, findall);
-	MODULE_ADD_SYM(ReCompiled, __objlist__);
-	MODULE_ADD_SYM(ReCompiled, __del__);
 	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_SUB_INIT(ReMatch);
-	MODULE_ADD_SYM(ReMatch, __objlist__);
 	MODULE_ADD_SYM(ReMatch, start);
 	MODULE_ADD_SYM(ReMatch, end);
 	MODULE_ADD_SYM(ReMatch, span);
 	MODULE_ADD_SYM(ReMatch, expand);
 	MODULE_ADD_SYM(ReMatch, group);
 	MODULE_ADD_SYM(ReMatch, groups);
+	MODULE_ADD_SYM(ReMatch, __objlist__);
 }

Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-core.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -638,14 +638,14 @@
 	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, Cmp);
 	MODULE_ADD_SYM(Object, Len);
-	MODULE_ADD_SYM(Object, Cmp);
 	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, proto_list);
 	MODULE_ADD_SYM(Object, __bool__QUES);
 	MODULE_ADD_SYM(Object, __not__QUES);
 	MODULE_ADD_SYM(Object, __is__QUES);

Modified: trunk/src/builtins-dict.c
===================================================================
--- trunk/src/builtins-dict.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-dict.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -269,11 +269,11 @@
 	MODULE_ADD_SYM(Dict, __init__);
 	MODULE_ADD_SYM(Dict, __str__);
 	MODULE_ADD_SYM(Dict, clone);
-	MODULE_ADD_SYM(Dict, __objlist__);
 	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_SUB_INIT(DictGen);
 	MODULE_ADD_SYM(DictGen, next);

Modified: trunk/src/builtins-float.c
===================================================================
--- trunk/src/builtins-float.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-float.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -357,22 +357,22 @@
 	MODULE_SUB_INIT(Float);
 	MODULE_ADD_SYM(Float, __init__);
 	MODULE_ADD_SYM(Float, __bool__QUES);
+	MODULE_ADD_SYM(Float, __str__);
 	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, __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, __mul__);
 	MODULE_ADD_SYM(Float, __div__);
 	MODULE_ADD_SYM(Float, __rdiv__);
-	MODULE_ADD_SYM(Float, __mul__);
-	MODULE_ADD_SYM(Float, __sub__);
-	MODULE_ADD_SYM(Float, __rsub__);
 	MODULE_ADD_SYM(Float, __pow__);
 	MODULE_ADD_SYM(Float, __rpow__);
-	MODULE_ADD_SYM(Float, cmp);
-	MODULE_ADD_SYM(Float, __rcmp__);
-	MODULE_ADD_SYM(Float, __eq__QUES);
-	MODULE_ADD_SYM(Float, __str__);
 	MODULE_ADD_SYM(Float, __covers__QUES);
 	MODULE_ADD_SYM(Float, __coerce__);
 }

Modified: trunk/src/builtins-int.c
===================================================================
--- trunk/src/builtins-int.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-int.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -344,28 +344,28 @@
 	MODULE_SUB_INIT(Int);
 	MODULE_ADD_SYM(Int, __init__);
 	MODULE_ADD_SYM(Int, __bool__QUES);
+	MODULE_ADD_SYM(Int, __str__);
 	MODULE_ADD_SYM(Int, __hash__);
+	MODULE_ADD_SYM(Int, __eq__QUES);
+	MODULE_ADD_SYM(Int, cmp);
+	MODULE_ADD_SYM(Int, chr);
 	MODULE_ADD_SYM(Int, __abs__);
 	MODULE_ADD_SYM(Int, __neg__);
 	MODULE_ADD_SYM(Int, __pos__);
 	MODULE_ADD_SYM(Int, __add__);
+	MODULE_ADD_SYM(Int, __sub__);
+	MODULE_ADD_SYM(Int, __mul__);
 	MODULE_ADD_SYM(Int, __div__);
 	MODULE_ADD_SYM(Int, __floordiv__);
 	MODULE_ADD_SYM(Int, __mod__);
-	MODULE_ADD_SYM(Int, __mul__);
-	MODULE_ADD_SYM(Int, __sub__);
 	MODULE_ADD_SYM(Int, __pow__);
-	MODULE_ADD_SYM(Int, cmp);
-	MODULE_ADD_SYM(Int, __eq__QUES);
 	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, __str__);
 	MODULE_ADD_SYM(Int, __gen__);
-	MODULE_ADD_SYM(Int, chr);
 
 	MODULE_SUB_INIT(IntGen);
 	MODULE_ADD_SYM(IntGen, next);

Modified: trunk/src/builtins-string.c
===================================================================
--- trunk/src/builtins-string.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-string.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -281,6 +281,10 @@
 	return new_int_obj(ist, pr_strlen(self));
 }
 
+DEF(String, __bool__QUES, NULL) {
+	if (pr_strlen(self)) return OBJ(PR_TRUE);
+	else                 return OBJ(PR_FALSE);
+}
 
 MODULE_START(StringGen)
 {
@@ -310,22 +314,23 @@
 {
 	MODULE_SUB_INIT(String);
 	MODULE_ADD_SYM(String, __init__);
+	MODULE_ADD_SYM(String, __bool__QUES);
 	MODULE_ADD_SYM(String, __str__);
 	MODULE_ADD_SYM(String, __hash__);
 	MODULE_ADD_SYM(String, clone);
-	MODULE_ADD_SYM(String, __objlist__);
+	MODULE_ADD_SYM(String, cmp);
+	MODULE_ADD_SYM(String, ord);
+	MODULE_ADD_SYM(String, len);
 	MODULE_ADD_SYM(String, __getitem__);
-	MODULE_ADD_SYM(String, __setitem__);
-	MODULE_ADD_SYM(String, __delitem__);
-	MODULE_ADD_SYM(String, cmp);
 	MODULE_ADD_SYM(String, __add__);
 	MODULE_ADD_SYM(String, __mul__);
 	MODULE_ADD_SYM(String, __gen__);
-	MODULE_ADD_SYM(String, ord);
 	MODULE_ADD_SYM(String, join);
 	MODULE_ADD_SYM(String, __in__QUES);
 	MODULE_ADD_SYM(String, __notin__QUES);
-	MODULE_ADD_SYM(String, len);
+	MODULE_ADD_SYM(String, __setitem__);
+	MODULE_ADD_SYM(String, __delitem__);
+	MODULE_ADD_SYM(String, __objlist__);
 
 	MODULE_SUB_INIT(StringGen);
 	MODULE_ADD_SYM(StringGen, next);

Modified: trunk/src/builtins-thread.c
===================================================================
--- trunk/src/builtins-thread.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-thread.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -277,7 +277,7 @@
 	}
 }
 
-DEF(Thread, running, NULL) {
+DEF(Thread, running_QUES, NULL) {
 	if (thread_running(self)) return OBJ(PR_TRUE);
 	else                      return OBJ(PR_FALSE);
 }
@@ -371,7 +371,7 @@
 	MODULE_ADD_SYM(Thread, access);
 	MODULE_ADD_SYM(Thread, access_str);
 	MODULE_ADD_SYM(Thread, set_access);
-	MODULE_ADD_SYM(Thread, running);
+	MODULE_ADD_SYM(Thread, running_QUES);
 	MODULE_ADD_SYM(Thread, sleep);
 	MODULE_ADD_SYM(Thread, join);
 	MODULE_ADD_SYM(Thread, __objlist__);

Modified: trunk/src/builtins-tuple.c
===================================================================
--- trunk/src/builtins-tuple.c	2004-04-11 14:11:25 UTC (rev 330)
+++ trunk/src/builtins-tuple.c	2004-04-11 19:10:50 UTC (rev 331)
@@ -316,24 +316,24 @@
 {
 	MODULE_SUB_INIT(Tuple);
 	MODULE_ADD_SYM(Tuple, __init__);	
-	MODULE_ADD_SYM(Tuple, clone);	
 	MODULE_ADD_SYM(Tuple, __str__);	
-	MODULE_ADD_SYM(Tuple, __getitem__);
-	MODULE_ADD_SYM(Tuple, __setitem__);
-	MODULE_ADD_SYM(Tuple, __delitem__);
-	MODULE_ADD_SYM(Tuple, __objlist__);
-	MODULE_ADD_SYM(Tuple, cmp);
-	MODULE_ADD_SYM(Tuple, __eq__QUES);
-	MODULE_ADD_SYM(Tuple, __rin__QUES);
-	MODULE_ADD_SYM(Tuple, __rnotin__QUES);
-	MODULE_ADD_SYM(Tuple, __add__);
-	MODULE_ADD_SYM(Tuple, __mul__);
 	MODULE_ADD_SYM(Tuple, len);
 	MODULE_ADD_SYM(Tuple, min);
 	MODULE_ADD_SYM(Tuple, max);
+	MODULE_ADD_SYM(Tuple, cmp);
+	MODULE_ADD_SYM(Tuple, __eq__QUES);
+	MODULE_ADD_SYM(Tuple, clone);	
 	MODULE_ADD_SYM(Tuple, count);
 	MODULE_ADD_SYM(Tuple, index);
+	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, __gen__);
+	MODULE_ADD_SYM(Tuple, __setitem__);
+	MODULE_ADD_SYM(Tuple, __delitem__);
+	MODULE_ADD_SYM(Tuple, __objlist__);
 
 	MODULE_SUB_INIT(Tgen);
 	MODULE_ADD_SYM(Tgen, next);
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.