[SCM] applications.git branch, master, updated. 0bf6058400e84287a1af9037808f13a4547f2965

[ontologiae]

The following commit has been merged in the master branch:
commit 0bf6058400e84287a1af9037808f13a4547f2965
Author: ontologiae <ontologiae at gmail.com>
Date:   Thu Feb 10 23:59:02 2011 +0100

    Java2Lisaac works again

diff --git a/examples/standard/http/mini_server.li b/examples/standard/http/mini_server.li
index fe9adf8..b62279b 100755
--- a/examples/standard/http/mini_server.li
+++ b/examples/standard/http/mini_server.li
@@ -61,7 +61,7 @@ Section Public
       \    <h1>Welcome in Mini-Server !!</h1>\n\
       \  </body>\n\
       \</html>\n" type_mime "text/html";
-      HTTP_SERVER.receive my_buf;
+ /*    HTTP_SERVER.receive my_buf;
       HTTP_SERVER.convert my_buf to_dictionary my_dico;
       "Receive : \n".print;
       (my_dico.lower).to (my_dico.upper) do { i:INTEGER;
@@ -72,7 +72,7 @@ Section Public
         ']'.print;
         '\n'.print;
       };
-      HTTP_SERVER.close;
+      HTTP_SERVER.close;*/
     };
   );
 
diff --git a/isaacos/startup.li b/isaacos/startup.li
index 752ff0f..4784fd7 100755
--- a/isaacos/startup.li
+++ b/isaacos/startup.li
@@ -60,19 +60,61 @@ Section Public
   ( + dir:DIRECTORY;   
     
     "Activation GDT\n".print;
-    GDT.add 0h limit 0h type 0h;  
-    GDT.add 0h limit 0FFFFFh type 9Bh; 
+   // GDT.add 0h limit 0h type 0h;  
+
+  /*  GDT.add 0h limit 0FFFFFh type 9Bh; 
     GDT.add 0h limit 0FFFFFh type 93h; 
     GDT.add 0h limit 0h type 97h; 
     GDT.add 0h limit 0FFFFFh type 0FFh; 
     GDT.add 0h limit 0FFFFFh type 0F3h; 
-    GDT.add 0h limit 0 type 0F7h; 
+    GDT.add 0h limit 0 type 0F7h; */
+
+  //  GDT.active_gdt;
+//    "System initialization..\n".print;
+
+ // SYSTEM.make;
+   // "Opening FileSystem...\n".print;
+ 
+  //FILE_SYSTEM.open;
+/*
+  
+  (FILE_SYSTEM.is_open).if {     
+    FILE_SYSTEM.print;
+  } else {
+    "FILE SYSTEM close\n".print;
+  };
+ 
+     
+  dir ?= FILE_SYSTEM.get_entry "icons";
+  (dir = NULL).if{
+    "\ndirectory is NULL\n".print;
+  } else {
+    dir.open;
+    dir.print;
+  };
+  */
+  
+
+     
+     // cas de plantage compilo : réactiver ça :
+   //  VIDEO.auto_make;        
+   //  CLOCK.make; 
+    /* 
+     DESK.make VIDEO scale (2,1) with (
+       DESK_BOARD.create "freedos/icons/".fix_height / G_RAW.create (G_IMG.create "freedos/icons/isaac.ai")
+     );*/
+     
+    //VIDEO.close;
+ //   die_with_code exit_success_code;  
+  );
+  
+ /* 
+
+
+
+
 
-    GDT.active_gdt;
-    "System initialization..\n".print;
 
-    SYSTEM.make;
-    "Opening FileSystem...\n".print;
     /*
    mov eax,0
           mov ebx,0FFFFFh    ; desc 08h : CODE segment.
@@ -126,25 +168,6 @@ Section Public
   THREAD.wake_up THREAD2;
   THREAD.zombie THREAD2;
   */
-  FILE_SYSTEM.open;
-
-  
-  (FILE_SYSTEM.is_open).if {     
-    FILE_SYSTEM.print;
-  } else {
-    "FILE SYSTEM close\n".print;
-  };
- 
-     
-  dir ?= FILE_SYSTEM.get_entry "icons";
-  (dir = NULL).if{
-    "\ndirectory is NULL\n".print;
-  } else {
-    dir.open;
-    dir.print;
-  };
-  
-  
 /*
   dir ?= FILE_SYSTEM.get_entry "ext2";
   
@@ -194,20 +217,7 @@ Section Public
 
      );
      */
-     
-     // cas de plantage compilo : réactiver ça :
-   //  VIDEO.auto_make;        
-   //  CLOCK.make; 
-    /* 
-     DESK.make VIDEO scale (2,1) with (
-       DESK_BOARD.create "freedos/icons/".fix_height / G_RAW.create (G_IMG.create "freedos/icons/isaac.ai")
-     );*/
-     
-    //VIDEO.close;
-    die_with_code exit_success_code;  
-  );
-  
-  
+ */
 
 
 
diff --git a/isaacos/x86/system/desc_seg.li b/isaacos/x86/system/desc_seg.li
index a2073d9..3a8a21f 100755
--- a/isaacos/x86/system/desc_seg.li
+++ b/isaacos/x86/system/desc_seg.li
@@ -81,7 +81,7 @@ Section Public
   );
   
   - limit:UINTEGER_32<-
-  ( + result:UINTEGER_32
+  ( + result:UINTEGER_32;
     
     result:=((g_d_0_avl_limt_16_19.to_uinteger_32& 0Fh) << 16) | limit_0_15;
     is_granular.if {
diff --git a/isaacos/x86/system/gdt.li b/isaacos/x86/system/gdt.li
index a035f4d..21f767d 100755
--- a/isaacos/x86/system/gdt.li
+++ b/isaacos/x86/system/gdt.li
@@ -24,7 +24,7 @@ Section Header
     
 Section Private
   
-  - table:NATIVE_ARRAY_VOLATILE(DESC_SEG) := CONVERT(NATIVE_ARRAY_VOLATILE(DESC_SEG),POINTER).on 2000h;
+  - table:NATIVE_ARRAY_VOLATILE(DESC_SEG) := NATIVE_ARRAY_VOLATILE(DESC_SEG).create 4;
     
   - new_descriptor:UINTEGER_16 <-
   ( + free_desc:UINTEGER_16;
diff --git a/java2lisaac/Java2Lisaac.ml/ParserJava.ml b/java2lisaac/Java2Lisaac.ml/ParserJava.ml
index f38155d..7a447b7 100755
--- a/java2lisaac/Java2Lisaac.ml/ParserJava.ml
+++ b/java2lisaac/Java2Lisaac.ml/ParserJava.ml
@@ -1,7 +1,7 @@
 #use "topfind";;
 #require "xml-light";;
 #require "extlib";;
-
+ 
 open Xml
 open ExtLib
 
@@ -225,7 +225,7 @@ let get_typ_info = function cpl -> Hashtbl.find hash_variables cpl;;
 (* DEF VARIABLES POUR TESTS *)
 
 (*let x = Xml.parse_file "2expre.xml";;*)
-let x = Xml.parse_file "ExempleCode.xml";;
+let x = Xml.parse_file "2expre.xml";;
 let x = to_xmls x;;
 let bin_expr = List.nth (children x) 0;;  
 let stm_expr = List.nth (children x) 0;; 
@@ -641,8 +641,8 @@ exception Stmt_exp of statement;;
 
 
 
-let stmt = match_block stm_expr;;
-block_to_lisaac stmt;; 
+let stmt = match_expression stm_expr;;
+expression_to_lisaac stmt;; 
 (*let expre = match_expression bin_expr;; 
 expression_to_lisaac expre;; *)
 
diff --git a/java2lisaac/Java2Lisaac.ml/xml-light-2.2+findlib.tar.gz b/java2lisaac/Java2Lisaac.ml/xml-light-2.2+findlib.tar.gz
deleted file mode 100755
index c573c22..0000000
Binary files a/java2lisaac/Java2Lisaac.ml/xml-light-2.2+findlib.tar.gz and /dev/null differ

-- 
applications.git