[SCM] Lisaac compiler branch, mildred-projects, updated. lisaac-0.12-526-g9b84f61
Mildred Ki'Lya
silkensedai at online.fr
Sat Sep 5 14:24:03 UTC 2009
The following commit has been merged in the mildred-projects branch:
commit fac959fe864a84ff54cba770c6d1a54a6c82cd22
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date: Tue Sep 1 17:05:38 2009 +0200
fix make.lip
diff --git a/make.lip b/make.lip
index 549d3df..274ed9e 100644
--- a/make.lip
+++ b/make.lip
@@ -70,19 +70,18 @@ Section Private
prj.if { " from ".print; prj.print; };
"\n".print;
- parent_project := prj;
- parent_project.if {
- lisaac := parent_project.lisaac;
- target := parent_project.target;
- debug_level := parent_project.debug_level;
- debug_with_code := parent_project.debug_with_code;
- is_all_warning := parent_project.is_all_warning;
- is_optimization := parent_project.is_optimization;
- inline_level := parent_project.inline_level;
- is_java := parent_project.is_java;
- is_cop := parent_project.is_cop;
- is_statistic := parent_project.is_statistic;
- is_quiet := parent_project.is_quiet;
+ prj.if {
+ lisaac := prj.lisaac;
+ target := prj.target;
+ debug_level := prj.debug_level;
+ debug_with_code := prj.debug_with_code;
+ is_all_warning := prj.is_all_warning;
+ is_optimization := prj.is_optimization;
+ inline_level := prj.inline_level;
+ is_java := prj.is_java;
+ is_cop := prj.is_cop;
+ is_statistic := prj.is_statistic;
+ is_quiet := prj.is_quiet;
};
);
@@ -99,7 +98,7 @@ Section Private
- standard_path <-
// Standard library.
(
- lip.load "lib.lip".init;
+ lip.load "lib.lip".lib;
);
//
diff --git a/src/make.lip b/src/make.lip
index 9ba9cfd..ffe3d2a 100755
--- a/src/make.lip
+++ b/src/make.lip
@@ -30,33 +30,33 @@ Section Private
- src_path <-
(
- path (lisaac + "src/");
- path (lisaac + "src/tools/");
- path (lisaac + "src/type/");
- path (lisaac + "src/item/");
- path (lisaac + "src/constant/");
- path (lisaac + "src/variable/");
- path (lisaac + "src/external/");
- path (lisaac + "src/external/logic/");
- path (lisaac + "src/external/arithmetic/");
- path (lisaac + "src/external/comparison/");
- path (lisaac + "src/dispatcher/");
- path (lisaac + "src/code_life/");
- path (lisaac + "src/lip/");
+ path (".");
+ path ("tools/");
+ path ("type/");
+ path ("item/");
+ path ("constant/");
+ path ("variable/");
+ path ("external/");
+ path ("external/logic/");
+ path ("external/arithmetic/");
+ path ("external/comparison/");
+ path ("dispatcher/");
+ path ("code_life/");
+ path ("lip/");
);
- compiler_path <-
(
src_path;
input_file := "lisaac";
- path (lisaac + "src/compiler_any/");
+ path ("compiler_any/");
);
- shorter_path <-
(
src_path;
input_file := "shorter";
- path (lisaac + "src/shorter_any/");
+ path ("shorter_any/");
);
//
--
Lisaac compiler
More information about the Lisaac-commits
mailing list