Changeset 428

Timestamp:

11/02/08 18:59:46 (2 months ago)

Author:

mooneer

Message:

* System.directory module added (ticket #63).
* Added support for using libc functions in interface.language.c.
* Added tell() function to System.file.
* Added System.exceptions.SystemCallFailure? exception, which

pulls perror() to pull exception string.

Location:

interpreter/trunk

Files:

• ChangeLog (modified) (1 diff)
• modules/Makefile.am (modified) (2 diffs)
• modules/System/directory.c (added)
• modules/System/exceptions.kt (modified) (1 diff)
• modules/System/file.c (modified) (2 diffs)
• modules/__internal/_cinvoke_function.c (modified) (1 diff)
• modules/__internal/_cinvoke_library.c (modified) (1 diff)
• modules/__internal/_exception.c (modified) (2 diffs)
• modules/all_modules.kt (modified) (1 diff)
• modules/interface/language/c.kt (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/objs/dir (added)
• tests/objs/dir/tmp_dir.kt (added)
• tests/objs/dir/tmp_dir.kt.out (added)

interpreter/trunk/ChangeLog

@@ +1 @@
+11/2/2008:
+    * System.directory module added (ticket #63)
+    * Added support for using libc functions in interface.language.c.
+        * Added tell() function to System.file.
+    * Added System.exceptions.SystemCallFailure exception, which pulls
+          perror() to pull exception string.
+
 10/26/2008:
     * Performance improvements.

interpreter/trunk/modules/Makefile.am

@@ -8 +8 @@
         System/vm/compiler.c System/vm/loader.c System/vm.c \
         System/math/range.c System/vm/thread.c System/network/socket.c \
-        __internal.c __internal/_regex.c \
+        System/directory.c __internal.c __internal/_regex.c \
         __internal/_regex_match.c __internal/_exception.c \
         __internal/_cinvoke_context.c __internal/_cinvoke_library.c \
@@ -14 +14 @@
         __internal/_cinvoke_callback.c
 
-nobase_dist_pkglib_SCRIPTS = System.kt System/network/wrapper.kt System/collections.kt \
-        System/doc.kt System/doc/outputters.kt System/regex.kt System/vm/debugger.kt \
-        System/exceptions.kt System/network.kt interface.kt interface/http.kt interface/http/cgi.kt \
-        interface/language.kt interface/language/c.kt interface/text.kt interface/text/readline.kt \
-        interface/text/base64.kt interface/text/binary.kt all_modules.kt
+nobase_dist_pkglib_SCRIPTS = System.kt System/network/wrapper.kt \
+    System/collections.kt System/doc.kt System/doc/outputters.kt System/regex.kt \
+        System/vm/debugger.kt System/exceptions.kt System/network.kt interface.kt \
+        interface/http.kt interface/http/cgi.kt interface/language.kt interface/language/c.kt \
+        interface/text.kt interface/text/readline.kt interface/text/base64.kt \
+        interface/text/binary.kt all_modules.kt
 
 AM_CFLAGS = -I../objs -fPIC -W -Wall -DCINVOKE_BUILD

interpreter/trunk/modules/System/exceptions.kt

@@ -233 +233 @@
 ];
 
+class SystemCallFailure
+    /[Failure while calling system call.]/
+[
+    construct()
+        /[Class constructor.]/
+    [
+        base|__construct__(this|get_perror());
+    ]
+];

interpreter/trunk/modules/System/file.c

@@ -133 +133 @@
     fclose(this->builtin_data.filevalue);
     this->builtin_data.filevalue = NULL;
+}
+
+/*****************************************************************************
+ * Emit current position in file.
+ ****************************************************************************/
+KITE_CLASS_METHOD(File_tell) {
+    KITE_NO_ARGS;
+
+    CHECK_FILE_OPEN;
+    kite_vm_return(thd, kite_new_integer(thd, ftell(this->builtin_data.filevalue)));
 }
 
@@ -196 +206 @@
                                   "Move current position in file.", 1,
                                   "pos", "Position in file to move to."));
+    kite_add_method(thread, newclass, "tell", 
+        kite_new_method_with_docs(thread, FUNC_COMPILED, File_tell, 
+                                  "Return current position in file.", 0));
     kite_add_method(thread, newclass, "close", 
         kite_new_method_with_docs(thread, FUNC_COMPILED, File_close, 

interpreter/trunk/modules/__internal/_cinvoke_function.c

@@ -54 +54 @@
     ret = KITE_GET_STRING_VALUE(retString);
     params = KITE_GET_STRING_VALUE(paramString);
-    
+
     func = cinv_function_create(ctx, CINV_CC_CDECL, ret, params);
     typeList = kite_new_list(thd);

interpreter/trunk/modules/__internal/_cinvoke_library.c

@@ -51 +51 @@
     
     ctx = (CInvContext*)ctxObj->builtin_data.filevalue;
-    lib = KITE_GET_STRING_VALUE(libString);
+    if (libString->type == OBJ_NULL)
+        lib = NULL;
+    else lib = KITE_GET_STRING_VALUE(libString);
     
     this->builtin_data.listvalue.car = 

interpreter/trunk/modules/__internal/_exception.c

@@ -44 +44 @@
     KITE_NO_ARGS;
     kite_vm_return(thd, kite_object_name(thd, this));
+}
+/*****************************************************************************
+ * Perror of errno
+ ****************************************************************************/
+KITE_CLASS_METHOD(Exception_perror) {
+    KITE_NO_ARGS;
+
+    char str[256];
+    perror(str);
+
+    kite_vm_return(thd, kite_new_string(thd, str));
 }
 
@@ -103 +114 @@
         kite_new_method_with_docs(thread, FUNC_COMPILED, Exception_str, 
                                   "Returns string representation of exception.", 0));
+    kite_add_method(thread, newclass, "get_perror", 
+        kite_new_method_with_docs(thread, FUNC_COMPILED, Exception_perror, 
+                                  "Internal use only.", 0));
     kite_add_method(thread, newclass, "throw", 
         kite_new_method_with_docs(thread, FUNC_COMPILED, Exception_throw, 

interpreter/trunk/modules/all_modules.kt

@@ -31 +31 @@
 import "System.collections";
 import "System.date";
+import "System.directory";
 import "System.doc";
 import "System.exceptions";

interpreter/trunk/modules/interface/language/c.kt

@@ -384 +384 @@
     property fx;
     property i;
-    
+
     fx = make interface.language.c.function_prototype();
     fx.ret_type = interface.language.c.param_types.type_characters[ret_type];

interpreter/trunk/tests/Makefile.am

@@ -246 +246 @@
 ./objs/binary/binary_test.kt \
 ./objs/binary/binary_test.kt.out \
+./objs/dir/tmp_dir.kt \
+./objs/dir/tmp_dir.kt.out \
 ./exception/exception_backtrace.kt.out \
 ./exception/nested_exceptions.kt \