[SCM] Lisaac compiler branch, master, updated. lisaac-0.12-606-g4554e79

Mildred Ki'Lya silkensedai at online.fr
Mon Mar 1 01:31:04 UTC 2010


The following commit has been merged in the master branch:
commit 96a841133cee822a91049b4ca0e93b23d3eff5d3
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date:   Fri Oct 23 02:05:56 2009 +0200

    Updated tests

diff --git a/tests/compare_expanded_null/main.li b/tests/compare_expanded_null/main.li
deleted file mode 100644
index 675c96b..0000000
--- a/tests/compare_expanded_null/main.li
+++ /dev/null
@@ -1,16 +0,0 @@
-Section Header
-
-  + name := MAIN;
-
-Section Public
-
-  - main <-
-  ( + b :INTEGER;
-    (b = NULL).if {
-      "0 is NULL".println;
-    } else {
-      "0 is not NULL".println;
-    };
-    "If it compiles without an error, there is a bug".println;
-  );
-
diff --git a/tests/compare_expanded_null/make.lip b/tests/compare_expanded_null/make.lip
deleted file mode 100644
index f65a016..0000000
--- a/tests/compare_expanded_null/make.lip
+++ /dev/null
@@ -1,45 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//                            Lisaac Installer                               //
-//                                                                           //
-//                   LSIIT - ULP - CNRS - INRIA - FRANCE                     //
-//                                                                           //
-//   This program is free software: you can redistribute it and/or modify    //
-//   it under the terms of the GNU General Public License as published by    //
-//   the Free Software Foundation, either version 3 of the License, or       //
-//   (at your option) any later version.                                     //
-//                                                                           //
-//   This program is distributed in the hope that it will be useful,         //
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of          //
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           //
-//   GNU General Public License for more details.                            //
-//                                                                           //
-//   You should have received a copy of the GNU General Public License       //
-//   along with this program.  If not, see <http://www.gnu.org/licenses/>.   //
-//                                                                           //
-//                     http://isaacproject.u-strasbg.fr/                     //
-///////////////////////////////////////////////////////////////////////////////
-
-Section Inherit
-
-  + parent :STRING;
-
-  + parent_test :STRING := "../test.lip";
-
-Section Private
-
-  - front_end <-
-  (
-    general_front_end;
-    path "./*";
-    input_file := "main";
-  );
-
-  + m_test_description :STRING :=
-    "Test that (INTEGER = NULL) raise a compilation error\n\
-    \The generated C code compare a pointer with a non pointer variable\n";
-
-  + m_test_run :BOOLEAN := FALSE;
-
-  + m_test_compile :BOOLEAN := FALSE;
-
-  + m_test_compile_pattern :STRING := "--SEMANTIC---------";
diff --git a/tests/inherit_parents/child.li b/tests/inherit_parents/child.li
new file mode 100644
index 0000000..101b169
--- /dev/null
+++ b/tests/inherit_parents/child.li
@@ -0,0 +1,14 @@
+Section Header
+
+  + name := CHILD;
+
+Section Inherit
+
+  + parent :Expanded PARENT;
+
+Section Public
+
+  - main <-
+  (
+    test
+  );
diff --git a/tests/expanded_global2/make.lip b/tests/inherit_parents/make.lip
similarity index 92%
copy from tests/expanded_global2/make.lip
copy to tests/inherit_parents/make.lip
index 2ac6ef7..19e84f8 100644
--- a/tests/expanded_global2/make.lip
+++ b/tests/inherit_parents/make.lip
@@ -31,10 +31,10 @@ Section Private
   (
     general_front_end;
     path "./*";
-    input_file := "main";
+    input_file := "child";
   );
 
   + m_test_description :STRING :=
-    "Test that Expanded globals are compiled correctly\n";
+    "Test that we can resend even if the child redefined the inherit slot\n";
 
-  + m_test_run_pattern :STRING := "0";
+  + m_test_run :BOOLEAN := TRUE;
diff --git a/tests/inherit_parents/parent.li b/tests/inherit_parents/parent.li
new file mode 100644
index 0000000..f685013
--- /dev/null
+++ b/tests/inherit_parents/parent.li
@@ -0,0 +1,15 @@
+Section Header
+
+  + name := PARENT;
+
+Section Inherit
+
+  + parent :Expanded OBJECT;
+
+Section Public
+
+  - test <-
+  (
+    parent.test;
+    "PARENT".println;
+  );
diff --git a/tests/inherit_parents/super_parent.li b/tests/inherit_parents/super_parent.li
new file mode 100644
index 0000000..193462f
--- /dev/null
+++ b/tests/inherit_parents/super_parent.li
@@ -0,0 +1,14 @@
+Section Header
+
+  + name := SUPER_PARENT;
+
+Section Inherit
+
+  + parent :Expanded OBJECT;
+
+Section Public
+
+  - test <-
+  (
+    "SUPER_PARENT".println;
+  );
diff --git a/tests/test.lip b/tests/test.lip
index a0dc670..ff8d4b4 100644
--- a/tests/test.lip
+++ b/tests/test.lip
@@ -23,12 +23,12 @@ Section Private
 
   - exit_true <-
   (
-    exit 0;
+    die_with_code 0;
   );
 
   - exit_false <-
   (
-    exit 1;
+    die_with_code 1;
   );
 
   + m_test_description :STRING := "<NO DESCRIPTION>\n";

-- 
Lisaac compiler



More information about the Lisaac-commits mailing list